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>

diff --git a/arch/arm/mach-shmobile/board-ap4evb.c b/arch/arm/mach-shmobile/board-ap4evb.c
index 7b902277f1456ced64838fd9bb8cbc27734516f8..714955e8b313df9c49e2633267847d4f3cf26568 100644 (file)
--- 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 0c0fd4f0c30858389ce41efd9d04bc864a489ab3..a6ad4a4bd6f756baeed6f88fa4e47b07f71cf152 100644 (file)
--- 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,
        },
 };