linux-next: manual merge of the usb tree with the s5p tree

From: Stephen Rothwell
Date: Thu Apr 14 2011 - 00:15:53 EST

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
arch/arm/mach-exynos4/mach-nuri.c between commit d2a852f78de6 ("ARM:
EXYNOS4: Add Atmel mXT touchscreen device to the NURI board") from the
s5p tree and commit 01da92f7f643 ("ARM: EXYNOS4: Add usb ehci device to
the NURI board") from the usb tree.

I fixed it up (see below) and can carry the fix as necessary.
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

diff --cc arch/arm/mach-exynos4/mach-nuri.c
index d13c5e8,bb5d12f..0000000
--- a/arch/arm/mach-exynos4/mach-nuri.c
+++ b/arch/arm/mach-exynos4/mach-nuri.c
@@@ -31,8 -30,8 +31,10 @@@
#include <plat/cpu.h>
#include <plat/devs.h>
#include <plat/sdhci.h>
+#include <plat/gpio-cfg.h>
+#include <plat/iic.h>
+ #include <plat/ehci.h>
+ #include <plat/clock.h>

#include <mach/map.h>

@@@ -355,7 -282,7 +367,8 @@@ static struct platform_device *nuri_dev
+ &s3c_device_i2c3,
+ &s5p_device_ehci,

/* NURI Devices */
@@@ -373,13 -300,13 +386,16 @@@ static void __init nuri_map_io(void
static void __init nuri_machine_init(void)
+ nuri_tsp_init();

i2c_register_board_info(1, i2c1_devs, ARRAY_SIZE(i2c1_devs));
+ s3c_i2c3_set_platdata(&i2c3_data);
+ i2c_register_board_info(3, i2c3_devs, ARRAY_SIZE(i2c3_devs));
i2c_register_board_info(5, i2c5_devs, ARRAY_SIZE(i2c5_devs));

+ nuri_ehci_init();
+ clk_xusbxti.rate = 24000000;
/* Last */
platform_add_devices(nuri_devices, ARRAY_SIZE(nuri_devices));
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at
Please read the FAQ at