diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2008-12-01 23:15:40 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-12-14 13:05:02 +0100 |
commit | d40a09920be4d64414c3e5396c6399ac96ad0e00 (patch) | |
tree | 34e212283314fee645ab0e873016b2c44626da1d /arch/arm/mach-mx2 | |
parent | [ARM] MX31: add w1 platform_device and resources (diff) | |
download | linux-d40a09920be4d64414c3e5396c6399ac96ad0e00.tar.xz linux-d40a09920be4d64414c3e5396c6399ac96ad0e00.zip |
[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.c | 2 |
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) 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)); |