]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[ARM] MX2 pcm038: add 1-wire master support
authorSascha Hauer <s.hauer@pengutronix.de>
Mon, 1 Dec 2008 22:15:40 +0000 (14:15 -0800)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 14 Dec 2008 12:05:02 +0000 (12:05 +0000)
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>
arch/arm/mach-mx2/pcm038.c

index 7f55746e259156181442e4c682d7162541a85e9e..ac516b1d3f77ad1213cd08ce8607ba06c06b8f85 100644 (file)
@@ -168,6 +168,7 @@ static void gpio_fec_inactive(void)
 
 static struct platform_device *platform_devices[] __initdata = {
        &pcm038_nor_mtd_device,
+       &mxc_w1_master_device,
 };
 
 static void __init pcm038_init(void)
@@ -177,6 +178,7 @@ static void __init pcm038_init(void)
        mxc_register_device(&mxc_uart_device0, &uart_pdata[0]);
        mxc_register_device(&mxc_uart_device1, &uart_pdata[1]);
        mxc_register_device(&mxc_uart_device2, &uart_pdata[2]);
+       mxc_gpio_mode(PE16_AF_RTCK); /* OWIRE */
 
        platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices));