Merge branch 'heads/soc2' into boards2-base

diff --cc arch/arm/mach-shmobile/Kconfig
index 3e57d457308a4c16d0e4970e7093ffb3faab6dbe,8c8889211f6d11cf186a46e21e1040785ea409a8..cd89d6348e0eda60867eaccdee1d6e428e1324a3
--- 1/arch/arm/mach-shmobile/Kconfig
--- 2/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@@ -265,18 -243,8 +269,19 @@@ config MACH_KOELSC
        bool "Koelsch board"
        depends on ARCH_R8A7791
        select USE_OF
+       select MICREL_PHY if SH_ETH
  
 +config MACH_KOELSCH_REFERENCE
 +      bool "Koelsch board - Reference Device Tree Implementation"
 +      depends on ARCH_R8A7791
 +      select USE_OF
 +      ---help---
 +         Use reference implementation of Koelsch board support
 +         which makes use of device tree at the expense
 +         of not supporting a number of devices.
 +
 +         This is intended to aid developers
 +
  config MACH_KZM9G
        bool "KZM-A9-GT board"
        depends on ARCH_SH73A0

diff --cc arch/arm/mach-shmobile/board-bockw.c
Simple merge

diff --cc arch/arm/mach-shmobile/clock-r7s72100.c
Simple merge

diff --cc arch/arm/mach-shmobile/clock-r8a7790.c
Simple merge

diff --cc arch/arm/mach-shmobile/clock-sh73a0.c
Simple merge

diff --cc arch/arm/mach-shmobile/setup-r8a7790.c
index 3543c3bacb75d828cd9681f9e5b93740822a9467,1a11e26a9431803978d360b9f3bf750bb1e23475..8474818a7ae06830579eab1a9cee1bd9a407bb81
--- 1/arch/arm/mach-shmobile/setup-r8a7790.c
--- 2/arch/arm/mach-shmobile/setup-r8a7790.c
+++ b/arch/arm/mach-shmobile/setup-r8a7790.c
@@@ -67,9 -63,31 +67,30 @@@ R8A7790_GPIO(5)
                &r8a7790_gpio##idx##_platform_data,                     \
                sizeof(r8a7790_gpio##idx##_platform_data))
  
+ static struct resource i2c_resources[] __initdata = {
+       /* I2C0 */
+       DEFINE_RES_MEM(0xE6508000, 0x40),
+       DEFINE_RES_IRQ(gic_spi(287)),
+       /* I2C1 */
+       DEFINE_RES_MEM(0xE6518000, 0x40),
+       DEFINE_RES_IRQ(gic_spi(288)),
+       /* I2C2 */
+       DEFINE_RES_MEM(0xE6530000, 0x40),
+       DEFINE_RES_IRQ(gic_spi(286)),
+       /* I2C3 */
+       DEFINE_RES_MEM(0xE6540000, 0x40),
+       DEFINE_RES_IRQ(gic_spi(290)),
+ 
+ };
+ 
+ #define r8a7790_register_i2c(idx)             \
+       platform_device_register_simple(        \
+               "i2c-rcar", idx,                \
+               i2c_resources + (2 * idx), 2);  \
+ 
  void __init r8a7790_pinmux_init(void)
  {
 -      platform_device_register_simple("pfc-r8a7790", -1, pfc_resources,
 -                                      ARRAY_SIZE(pfc_resources));
 +      r8a7790_register_pfc();
        r8a7790_register_gpio(0);
        r8a7790_register_gpio(1);
        r8a7790_register_gpio(2);