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

Commit 88289c80 authored by Shawn Guo's avatar Shawn Guo
Browse files

dma: ipu: remove the use of ipu_platform_data 



The struct ipu_platform_data is used by platform code to pass
MXC_IPU_IRQ_START to ipu-core driver.  We can save it by having
ipu-core driver call irq_alloc_descs to get the irq_base.

Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
Acked-by: default avatarVinod Koul <vinod.koul@intel.com>
Acked-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Acked-by: default avatarDong Aisheng <dong.aisheng@linaro.org>
parent 544496ab

arch/arm/mach-imx/devices-imx31.h

+2 −2
Original line number Diff line number Diff line
@@ -42,8 +42,8 @@ extern const struct imx_imx_uart_1irq_data imx31_imx_uart_data[]; 
#define imx31_add_imx_uart4(pdata)	imx31_add_imx_uart(4, pdata)



extern const struct imx_ipu_core_data imx31_ipu_core_data;

#define imx31_add_ipu_core(pdata)	\

	imx_add_ipu_core(&imx31_ipu_core_data, pdata)

#define imx31_add_ipu_core()		\

	imx_add_ipu_core(&imx31_ipu_core_data)

#define imx31_alloc_mx3_camera(pdata)	\

	imx_alloc_mx3_camera(&imx31_ipu_core_data, pdata)

#define imx31_add_mx3_sdc_fb(pdata)	\

arch/arm/mach-imx/devices-imx35.h

+2 −2
Original line number Diff line number Diff line
@@ -50,8 +50,8 @@ extern const struct imx_imx_uart_1irq_data imx35_imx_uart_data[]; 
#define imx35_add_imx_uart2(pdata)	imx35_add_imx_uart(2, pdata)



extern const struct imx_ipu_core_data imx35_ipu_core_data;

#define imx35_add_ipu_core(pdata)	\

	imx_add_ipu_core(&imx35_ipu_core_data, pdata)

#define imx35_add_ipu_core()		\

	imx_add_ipu_core(&imx35_ipu_core_data)

#define imx35_alloc_mx3_camera(pdata)	\

	imx_alloc_mx3_camera(&imx35_ipu_core_data, pdata)

#define imx35_add_mx3_sdc_fb(pdata)	\

arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c

+1 −5
Original line number Diff line number Diff line
@@ -95,10 +95,6 @@ static const struct fb_videomode fb_modedb[] = { 
	},

};



static const struct ipu_platform_data mx3_ipu_data __initconst = {

	.irq_base = MXC_IPU_IRQ_START,

};



static struct mx3fb_platform_data mx3fb_pdata __initdata = {

	.name		= "CMO-QVGA",

	.mode		= fb_modedb,
@@ -287,7 +283,7 @@ void __init eukrea_mbimxsd35_baseboard_init(void) 
		printk(KERN_ERR "error setting mbimxsd pads !\n");



	imx35_add_imx_uart1(&uart_pdata);

	imx35_add_ipu_core(&mx3_ipu_data);

	imx35_add_ipu_core();

	imx35_add_mx3_sdc_fb(&mx3fb_pdata);



	imx35_add_imx_ssi(0, &eukrea_mbimxsd_ssi_pdata);

arch/arm/mach-imx/mach-armadillo5x0.c

+1 −5
Original line number Diff line number Diff line
@@ -367,10 +367,6 @@ static const struct fb_videomode fb_modedb[] = { 
	},

};



static const struct ipu_platform_data mx3_ipu_data __initconst = {

	.irq_base = MXC_IPU_IRQ_START,

};



static struct mx3fb_platform_data mx3fb_pdata __initdata = {

	.name		= "CRT-VGA",

	.mode		= fb_modedb,
@@ -517,7 +513,7 @@ static void __init armadillo5x0_init(void) 
	imx31_add_mxc_mmc(0, &sdhc_pdata);



	/* Register FB */

	imx31_add_ipu_core(&mx3_ipu_data);

	imx31_add_ipu_core();

	imx31_add_mx3_sdc_fb(&mx3fb_pdata);



	/* Register NOR Flash */

arch/arm/mach-imx/mach-mx31_3ds.c

+1 −5
Original line number Diff line number Diff line
@@ -274,10 +274,6 @@ static const struct fb_videomode fb_modedb[] = { 
	},

};



static struct ipu_platform_data mx3_ipu_data = {

	.irq_base = MXC_IPU_IRQ_START,

};



static struct mx3fb_platform_data mx3fb_pdata __initdata = {

	.name		= "Epson-VGA",

	.mode		= fb_modedb,
@@ -743,7 +739,7 @@ static void __init mx31_3ds_init(void) 
	imx31_add_mxc_mmc(0, &sdhc1_pdata);



	imx31_add_spi_imx0(&spi0_pdata);

	imx31_add_ipu_core(&mx3_ipu_data);

	imx31_add_ipu_core();

	imx31_add_mx3_sdc_fb(&mx3fb_pdata);



	/* CSI */