summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2011-09-12 01:30:45 +0400
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2012-03-13 01:41:11 +0400
commitb0a49d98fa4315c17a098cb60ccc626645ed9756 (patch)
tree0c220e9f8ed3cd6e98f2333035f1d18fee858453 /arch/arm
parent481100506b34d666243832c3f2aee905c03cb8e7 (diff)
downloadlinux-b0a49d98fa4315c17a098cb60ccc626645ed9756.tar.xz
arm: mach-shmobile: Don't set MERAM ICB numbers in platform data
The marker and cache ICBs are now allocated automatically, there's no need to specify them manually anymore. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-shmobile/board-ap4evb.c8
-rw-r--r--arch/arm/mach-shmobile/board-mackerel.c8
2 files changed, 0 insertions, 16 deletions
diff --git a/arch/arm/mach-shmobile/board-ap4evb.c b/arch/arm/mach-shmobile/board-ap4evb.c
index 7b902277f145..714955e8b313 100644
--- a/arch/arm/mach-shmobile/board-ap4evb.c
+++ b/arch/arm/mach-shmobile/board-ap4evb.c
@@ -581,13 +581,9 @@ static const struct fb_videomode ap4evb_lcdc_modes[] = {
};
static struct sh_mobile_meram_cfg lcd_meram_cfg = {
.icb[0] = {
- .marker_icb = 28,
- .cache_icb = 24,
.meram_size = 0x40,
},
.icb[1] = {
- .marker_icb = 29,
- .cache_icb = 25,
.meram_size = 0x40,
},
};
@@ -862,13 +858,9 @@ static long ap4evb_clk_optimize(unsigned long target, unsigned long *best_freq,
static struct sh_mobile_meram_cfg hdmi_meram_cfg = {
.icb[0] = {
- .marker_icb = 30,
- .cache_icb = 26,
.meram_size = 0x100,
},
.icb[1] = {
- .marker_icb = 31,
- .cache_icb = 27,
.meram_size = 0x100,
},
};
diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c
index 0c0fd4f0c308..a6ad4a4bd6f7 100644
--- a/arch/arm/mach-shmobile/board-mackerel.c
+++ b/arch/arm/mach-shmobile/board-mackerel.c
@@ -371,13 +371,9 @@ static int mackerel_get_brightness(void)
static struct sh_mobile_meram_cfg lcd_meram_cfg = {
.icb[0] = {
- .marker_icb = 28,
- .cache_icb = 24,
.meram_size = 0x40,
},
.icb[1] = {
- .marker_icb = 29,
- .cache_icb = 25,
.meram_size = 0x40,
},
};
@@ -461,13 +457,9 @@ static struct platform_device hdmi_device = {
static struct sh_mobile_meram_cfg hdmi_meram_cfg = {
.icb[0] = {
- .marker_icb = 30,
- .cache_icb = 26,
.meram_size = 0x100,
},
.icb[1] = {
- .marker_icb = 31,
- .cache_icb = 27,
.meram_size = 0x100,
},
};