aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2008-12-01 17:15:39 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-12-14 07:05:02 -0500
commita8405929338063f0fe263d18ca24a6005d39b508 (patch)
treeb0d40a1734ceb5b816f6f8b4b65ed3557535719c
parent3d89baa73a392e242b5eb7b0e749a08af3bf014f (diff)
[ARM] MX31: add w1 platform_device and resources
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Evgeniy Polyakov <zbr@ioremap.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/mach-mx3/devices.c15
-rw-r--r--arch/arm/mach-mx3/devices.h1
2 files changed, 16 insertions, 0 deletions
diff --git a/arch/arm/mach-mx3/devices.c b/arch/arm/mach-mx3/devices.c
index a6bdcc07f3c9..12b3e3c00460 100644
--- a/arch/arm/mach-mx3/devices.c
+++ b/arch/arm/mach-mx3/devices.c
@@ -145,3 +145,18 @@ int __init mxc_register_gpios(void)
145{ 145{
146 return mxc_gpio_init(imx_gpio_ports, ARRAY_SIZE(imx_gpio_ports)); 146 return mxc_gpio_init(imx_gpio_ports, ARRAY_SIZE(imx_gpio_ports));
147} 147}
148
149static struct resource mxc_w1_master_resources[] = {
150 {
151 .start = OWIRE_BASE_ADDR,
152 .end = OWIRE_BASE_ADDR + SZ_4K - 1,
153 .flags = IORESOURCE_MEM,
154 },
155};
156
157struct platform_device mxc_w1_master_device = {
158 .name = "mxc_w1",
159 .id = 0,
160 .num_resources = ARRAY_SIZE(mxc_w1_master_resources),
161 .resource = mxc_w1_master_resources,
162};
diff --git a/arch/arm/mach-mx3/devices.h b/arch/arm/mach-mx3/devices.h
index 4dc03f9e6001..cb1459c7c960 100644
--- a/arch/arm/mach-mx3/devices.h
+++ b/arch/arm/mach-mx3/devices.h
@@ -4,3 +4,4 @@ extern struct platform_device mxc_uart_device1;
4extern struct platform_device mxc_uart_device2; 4extern struct platform_device mxc_uart_device2;
5extern struct platform_device mxc_uart_device3; 5extern struct platform_device mxc_uart_device3;
6extern struct platform_device mxc_uart_device4; 6extern struct platform_device mxc_uart_device4;
7extern struct platform_device mxc_w1_master_device;