diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2008-12-01 17:15:38 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-12-14 07:05:01 -0500 |
commit | 3d89baa73a392e242b5eb7b0e749a08af3bf014f (patch) | |
tree | 268a831b8245fd051a824f3916b7eb913d04b797 /arch/arm | |
parent | 7180d868e3ff0741e9483c7a056445854e5af876 (diff) |
[ARM] MX2: Add W1 device/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>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-mx2/devices.c | 15 | ||||
-rw-r--r-- | arch/arm/mach-mx2/devices.h | 2 |
2 files changed, 16 insertions, 1 deletions
diff --git a/arch/arm/mach-mx2/devices.c b/arch/arm/mach-mx2/devices.c index bd0559d5933e..092e09baeefa 100644 --- a/arch/arm/mach-mx2/devices.c +++ b/arch/arm/mach-mx2/devices.c | |||
@@ -190,6 +190,21 @@ struct platform_device mxc_wdt = { | |||
190 | .resource = mxc_wdt_resources, | 190 | .resource = mxc_wdt_resources, |
191 | }; | 191 | }; |
192 | 192 | ||
193 | static struct resource mxc_w1_master_resources[] = { | ||
194 | { | ||
195 | .start = OWIRE_BASE_ADDR, | ||
196 | .end = OWIRE_BASE_ADDR + SZ_4K - 1, | ||
197 | .flags = IORESOURCE_MEM, | ||
198 | }, | ||
199 | }; | ||
200 | |||
201 | struct platform_device mxc_w1_master_device = { | ||
202 | .name = "mxc_w1", | ||
203 | .id = 0, | ||
204 | .num_resources = ARRAY_SIZE(mxc_w1_master_resources), | ||
205 | .resource = mxc_w1_master_resources, | ||
206 | }; | ||
207 | |||
193 | /* GPIO port description */ | 208 | /* GPIO port description */ |
194 | static struct mxc_gpio_port imx_gpio_ports[] = { | 209 | static struct mxc_gpio_port imx_gpio_ports[] = { |
195 | [0] = { | 210 | [0] = { |
diff --git a/arch/arm/mach-mx2/devices.h b/arch/arm/mach-mx2/devices.h index c77a4b8f73b4..5683c4574325 100644 --- a/arch/arm/mach-mx2/devices.h +++ b/arch/arm/mach-mx2/devices.h | |||
@@ -12,4 +12,4 @@ extern struct platform_device mxc_uart_device2; | |||
12 | extern struct platform_device mxc_uart_device3; | 12 | extern struct platform_device mxc_uart_device3; |
13 | extern struct platform_device mxc_uart_device4; | 13 | extern struct platform_device mxc_uart_device4; |
14 | extern struct platform_device mxc_uart_device5; | 14 | extern struct platform_device mxc_uart_device5; |
15 | 15 | extern struct platform_device mxc_w1_master_device; | |