aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mx2
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2008-12-01 17:15:40 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-12-14 07:05:02 -0500
commitd40a09920be4d64414c3e5396c6399ac96ad0e00 (patch)
tree34e212283314fee645ab0e873016b2c44626da1d /arch/arm/mach-mx2
parenta8405929338063f0fe263d18ca24a6005d39b508 (diff)
[ARM] MX2 pcm038: add 1-wire master support
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/mach-mx2')
-rw-r--r--arch/arm/mach-mx2/pcm038.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-mx2/pcm038.c b/arch/arm/mach-mx2/pcm038.c
index 7f55746e2591..ac516b1d3f77 100644
--- a/arch/arm/mach-mx2/pcm038.c
+++ b/arch/arm/mach-mx2/pcm038.c
@@ -168,6 +168,7 @@ static void gpio_fec_inactive(void)
168 168
169static struct platform_device *platform_devices[] __initdata = { 169static struct platform_device *platform_devices[] __initdata = {
170 &pcm038_nor_mtd_device, 170 &pcm038_nor_mtd_device,
171 &mxc_w1_master_device,
171}; 172};
172 173
173static void __init pcm038_init(void) 174static void __init pcm038_init(void)
@@ -177,6 +178,7 @@ static void __init pcm038_init(void)
177 mxc_register_device(&mxc_uart_device0, &uart_pdata[0]); 178 mxc_register_device(&mxc_uart_device0, &uart_pdata[0]);
178 mxc_register_device(&mxc_uart_device1, &uart_pdata[1]); 179 mxc_register_device(&mxc_uart_device1, &uart_pdata[1]);
179 mxc_register_device(&mxc_uart_device2, &uart_pdata[2]); 180 mxc_register_device(&mxc_uart_device2, &uart_pdata[2]);
181 mxc_gpio_mode(PE16_AF_RTCK); /* OWIRE */
180 182
181 platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices)); 183 platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices));
182 184