fbdev: sh_mobile_meram: Use genalloc to manage MERAM allocation

Instead of requiring the users to hardcode MERAM allocation in platform
data, allocate blocks at runtime using genalloc.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

2 files changed, 0 insertions, 8 deletions

diff --git a/arch/arm/mach-shmobile/board-ap4evb.c b/arch/arm/mach-shmobile/board-ap4evb.c
index 63498fbdfd12..7b902277f145 100644
--- a/arch/arm/mach-shmobile/board-ap4evb.c
+++ b/arch/arm/mach-shmobile/board-ap4evb.c
@@ -583,13 +583,11 @@ static struct sh_mobile_meram_cfg lcd_meram_cfg = {
         .icb[0] = {
                 .marker_icb     = 28,
                 .cache_icb      = 24,
-                .meram_offset   = 0x0,
                 .meram_size     = 0x40,
         },
         .icb[1] = {
                 .marker_icb     = 29,
                 .cache_icb      = 25,
-                .meram_offset   = 0x40,
                 .meram_size     = 0x40,
         },
 };
@@ -866,13 +864,11 @@ static struct sh_mobile_meram_cfg hdmi_meram_cfg = {
         .icb[0] = {
                 .marker_icb     = 30,
                 .cache_icb      = 26,
-                .meram_offset   = 0x80,
                 .meram_size     = 0x100,
         },
         .icb[1] = {
                 .marker_icb     = 31,
                 .cache_icb      = 27,
-                .meram_offset   = 0x180,
                 .meram_size     = 0x100,
         },
 };
diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c
index 17ba6bccf97b..0c0fd4f0c308 100644
--- a/arch/arm/mach-shmobile/board-mackerel.c
+++ b/arch/arm/mach-shmobile/board-mackerel.c
@@ -373,13 +373,11 @@ static struct sh_mobile_meram_cfg lcd_meram_cfg = {
         .icb[0] = {
                 .marker_icb     = 28,
                 .cache_icb      = 24,
-                .meram_offset   = 0x0,
                 .meram_size     = 0x40,
         },
         .icb[1] = {
                 .marker_icb     = 29,
                 .cache_icb      = 25,
-                .meram_offset   = 0x40,
                 .meram_size     = 0x40,
         },
 };
@@ -465,13 +463,11 @@ static struct sh_mobile_meram_cfg hdmi_meram_cfg = {
         .icb[0] = {
                 .marker_icb     = 30,
                 .cache_icb      = 26,
-                .meram_offset   = 0x80,
                 .meram_size     = 0x100,
         },
         .icb[1] = {
                 .marker_icb     = 31,
                 .cache_icb      = 27,
-                .meram_offset   = 0x180,
                 .meram_size     = 0x100,
         },
 };