Commit e0a1961d authored by Uwe Kleine-König's avatar Uwe Kleine-König
Browse files

ARM: imx: dynamically allocate imx2-wdt devices 



Currently there is no platform data used in the driver.  In case this
changes and for consistency NULL is passed unused to the soc specific
functions.

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
parent b2997cb1

arch/arm/mach-imx/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ config MACH_MX27ADS 


config MACH_PCM038

	bool "Phytec phyCORE-i.MX27 CPU module (pcm038)"

	select IMX_HAVE_PLATFORM_IMX2_WDT

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_MXC_NAND
@@ -121,6 +122,7 @@ endchoice 


config MACH_CPUIMX27

	bool "Eukrea CPUIMX27 module"

	select IMX_HAVE_PLATFORM_IMX2_WDT

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_MXC_NAND
@@ -185,6 +187,7 @@ config MACH_IMX27LITE 


config MACH_PCA100

	bool "Phytec phyCARD-s (pca100)"

	select IMX_HAVE_PLATFORM_IMX2_WDT

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_IMX_SSI

	select IMX_HAVE_PLATFORM_IMX_UART

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

+4 −0
Original line number Diff line number Diff line
@@ -9,6 +9,10 @@ 
#include <mach/mx21.h>

#include <mach/devices-common.h>



extern const struct imx_imx2_wdt_data imx21_imx2_wdt_data __initconst;

#define imx21_add_imx2_wdt(pdata)	\

	imx_add_imx2_wdt(&imx21_imx2_wdt_data)



extern const struct imx_imx_i2c_data imx21_imx_i2c_data __initconst;

#define imx21_add_imx_i2c(pdata)	\

	imx_add_imx_i2c(&imx21_imx_i2c_data, pdata)

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

+4 −0
Original line number Diff line number Diff line
@@ -13,6 +13,10 @@ extern const struct imx_fec_data imx27_fec_data __initconst; 
#define imx27_add_fec(pdata)	\

	imx_add_fec(&imx27_fec_data, pdata)



extern const struct imx_imx2_wdt_data imx27_imx2_wdt_data __initconst;

#define imx27_add_imx2_wdt(pdata)	\

	imx_add_imx2_wdt(&imx27_imx2_wdt_data)



extern const struct imx_imx_i2c_data imx27_imx_i2c_data[] __initconst;

#define imx27_add_imx_i2c(id, pdata)	\

	imx_add_imx_i2c(&imx27_imx_i2c_data[id], pdata)

arch/arm/mach-imx/devices.c

+0 −16
Original line number Diff line number Diff line
@@ -77,22 +77,6 @@ int __init imx1_register_gpios(void) 
#endif



#if defined(CONFIG_MACH_MX21) || defined(CONFIG_MACH_MX27)

/* Watchdog: i.MX1 has seperate driver, i.MX21 and i.MX27 are equal */

static struct resource mxc_wdt_resources[] = {

	{

		.start = MX2x_WDOG_BASE_ADDR,

		.end = MX2x_WDOG_BASE_ADDR + SZ_4K - 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,

};



/*

 * lcdc:

 * - i.MX1: the basic controller

arch/arm/mach-imx/devices.h

+0 −1
Original line number Diff line number Diff line 
#if defined(CONFIG_MACH_MX21) || defined(CONFIG_MACH_MX27)

extern struct platform_device mxc_wdt;

extern struct platform_device mxc_fb_device;

extern struct platform_device mxc_pwm_device;

extern struct platform_device mxc_sdhc_device0;