Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b0a49d98 authored by Laurent Pinchart's avatar Laurent Pinchart
Browse files

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: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
parent 48110050

arch/arm/mach-shmobile/board-ap4evb.c

+0 −8
Original line number Diff line number Diff line
@@ -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,

	},

};

arch/arm/mach-shmobile/board-mackerel.c

+0 −8
Original line number Diff line number Diff line
@@ -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,

	},

};