From 82174b2fa7e20b4c2d2bb8090da447a9fdf9bf9c Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Mon, 1 Dec 2008 14:15:40 -0800 Subject: [PATCH] --- yaml --- r: 123713 b: refs/heads/master c: d40a09920be4d64414c3e5396c6399ac96ad0e00 h: refs/heads/master i: 123711: a82f9731c741e12650659a7021ad88716710cbc7 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-mx2/pcm038.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 67d0b67f46c1..9334f3765c3c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a8405929338063f0fe263d18ca24a6005d39b508 +refs/heads/master: d40a09920be4d64414c3e5396c6399ac96ad0e00 diff --git a/trunk/arch/arm/mach-mx2/pcm038.c b/trunk/arch/arm/mach-mx2/pcm038.c index 7f55746e2591..ac516b1d3f77 100644 --- a/trunk/arch/arm/mach-mx2/pcm038.c +++ b/trunk/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));