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

ARM: imx: dynamically allocate mxc_w1 devices 



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

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

arch/arm/mach-imx/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ config MACH_MX27ADS 
	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_MXC_NAND

	select IMX_HAVE_PLATFORM_MXC_W1

	help

	  Include support for MX27ADS platform. This includes specific

	  configurations for the board and its peripherals.
@@ -97,6 +98,7 @@ config MACH_PCM038 
	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_MXC_NAND

	select IMX_HAVE_PLATFORM_MXC_W1

	select IMX_HAVE_PLATFORM_SPI_IMX

	select MXC_ULPI if USB_ULPI

	help
@@ -122,6 +124,7 @@ config MACH_CPUIMX27 
	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_MXC_NAND

	select IMX_HAVE_PLATFORM_MXC_W1

	select MXC_ULPI if USB_ULPI

	help

	  Include support for Eukrea CPUIMX27 platform. This includes
@@ -186,6 +189,7 @@ config MACH_PCA100 
	select IMX_HAVE_PLATFORM_IMX_SSI

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_MXC_NAND

	select IMX_HAVE_PLATFORM_MXC_W1

	select IMX_HAVE_PLATFORM_SPI_IMX

	select MXC_ULPI if USB_ULPI

	help

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

+4 −0
Original line number Diff line number Diff line
@@ -29,6 +29,10 @@ extern const struct imx_mxc_nand_data imx21_mxc_nand_data __initconst; 
#define imx21_add_mxc_nand(pdata)	\

	imx_add_mxc_nand(&imx21_mxc_nand_data, pdata)



extern const struct imx_mxc_w1_data imx21_mxc_w1_data __initconst;

#define imx21_add_mxc_w1(pdata)	\

	imx_add_mxc_w1(&imx21_mxc_w1_data)



extern const struct imx_spi_imx_data imx21_cspi_data[] __initconst;

#define imx21_add_cspi(id, pdata)	\

	imx_add_spi_imx(&imx21_cspi_data[id], pdata)

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

+4 −0
Original line number Diff line number Diff line
@@ -35,6 +35,10 @@ extern const struct imx_mxc_nand_data imx27_mxc_nand_data __initconst; 
#define imx27_add_mxc_nand(pdata)	\

	imx_add_mxc_nand(&imx27_mxc_nand_data, pdata)



extern const struct imx_mxc_w1_data imx27_mxc_w1_data __initconst;

#define imx27_add_mxc_w1(pdata)	\

	imx_add_mxc_w1(&imx27_mxc_w1_data)



extern const struct imx_spi_imx_data imx27_cspi_data[] __initconst;

#define imx27_add_cspi(id, pdata)	\

	imx_add_spi_imx(&imx27_cspi_data[id], pdata)

arch/arm/mach-imx/devices.c

+0 −15
Original line number Diff line number Diff line
@@ -270,21 +270,6 @@ struct platform_device mxc_wdt = { 
	.resource = mxc_wdt_resources,

};



static struct resource mxc_w1_master_resources[] = {

	{

		.start = MX2x_OWIRE_BASE_ADDR,

		.end = MX2x_OWIRE_BASE_ADDR + SZ_4K - 1,

		.flags = IORESOURCE_MEM,

	},

};



struct platform_device mxc_w1_master_device = {

	.name = "mxc_w1",

	.id = 0,

	.num_resources = ARRAY_SIZE(mxc_w1_master_resources),

	.resource = mxc_w1_master_resources,

};



/*

 * lcdc:

 * - i.MX1: the basic controller

arch/arm/mach-imx/devices.h

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ extern struct platform_device mxc_gpt4; 
extern struct platform_device mxc_gpt5;

#endif

extern struct platform_device mxc_wdt;

extern struct platform_device mxc_w1_master_device;

extern struct platform_device mxc_fb_device;

extern struct platform_device mxc_pwm_device;

extern struct platform_device mxc_sdhc_device0;