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

Commit b99545cb authored by Fabio Estevam's avatar Fabio Estevam Committed by Sascha Hauer
Browse files

ARM: mx5: dynamically allocate imx2-wdt devices 



Signed-off-by: default avatarFabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parent d94ed128

arch/arm/mach-mx5/devices-imx51.h

+4 −0
Original line number Diff line number Diff line
@@ -43,3 +43,7 @@ extern const struct imx_spi_imx_data imx51_cspi_data __initconst; 
extern const struct imx_spi_imx_data imx51_ecspi_data[] __initconst;

#define imx51_add_ecspi(id, pdata)	\

	imx_add_spi_imx(&imx51_ecspi_data[id], pdata)



extern const struct imx_imx2_wdt_data imx51_imx2_wdt_data __initconst;

#define imx51_imx2_wdt_data(pdata)	\

	imx_add_imx2_wdt_data(&imx51_imx2_wdt_data, pdata)

arch/arm/mach-mx5/devices.c

+0 −15
Original line number Diff line number Diff line
@@ -97,21 +97,6 @@ struct platform_device mxc_usbh1_device = { 
	},

};



static struct resource mxc_wdt_resources[] = {

	{

		.start = MX51_WDOG_BASE_ADDR,

		.end = MX51_WDOG_BASE_ADDR + SZ_16K - 1,

		.flags = IORESOURCE_MEM,

	},

};



struct platform_device mxc_wdt = {

	.name = "imx2-wdt",

	.id = 0,

	.num_resources = ARRAY_SIZE(mxc_wdt_resources),

	.resource = mxc_wdt_resources,

};



static struct resource mxc_kpp_resources[] = {

	{

		.start = MX51_MXC_INT_KPP,

arch/arm/mach-mx5/devices.h

+0 −1
Original line number Diff line number Diff line 
extern struct platform_device mxc_usbdr_host_device;

extern struct platform_device mxc_usbh1_device;

extern struct platform_device mxc_usbdr_udc_device;

extern struct platform_device mxc_wdt;

extern struct platform_device mxc_hsi2c_device;

extern struct platform_device mxc_keypad_device;

arch/arm/plat-mxc/devices/platform-imx2-wdt.c

+5 −0
Original line number Diff line number Diff line
@@ -41,6 +41,11 @@ const struct imx_imx2_wdt_data imx35_imx2_wdt_data __initconst = 
	imx_imx2_wdt_data_entry_single(MX35, SZ_16K);

#endif /* ifdef CONFIG_SOC_IMX35 */



#ifdef CONFIG_SOC_IMX51

const struct imx_imx2_wdt_data imx51_imx2_wdt_data __initconst =

	imx_imx2_wdt_data_entry_single(MX51, SZ_16K);

#endif /* ifdef CONFIG_SOC_IMX51 */



struct platform_device *__init imx_add_imx2_wdt(

		const struct imx_imx2_wdt_data *data)

{