Merge branch 'next/boards' into for-next

Conflicts:
	arch/arm/mach-shmobile/board-bockw.c
	arch/arm/mach-shmobile/board-marzen.c
	arch/arm/mach-shmobile/setup-r8a7778.c

diff --cc arch/arm/boot/dts/kirkwood-ts219.dtsi
Simple merge

diff --cc arch/arm/mach-kirkwood/Kconfig
Simple merge

diff --cc arch/arm/mach-kirkwood/Makefile
index 2fdc3a7ad226fa91e270bc97d6ec321f06107a90,8846abf8fc737c0dbf80f063d13fb199a5d865eb..ac4cd75dd499d37117bfe1603dfc803ae6e5739f
--- 1/arch/arm/mach-kirkwood/Makefile
--- 2/arch/arm/mach-kirkwood/Makefile
+++ b/arch/arm/mach-kirkwood/Makefile
@@@ -37,7 -37,9 +37,8 @@@ obj-$(CONFIG_MACH_NETSPACE_LITE_V2_DT)        
  obj-$(CONFIG_MACH_NETSPACE_MAX_V2_DT) += board-ns2.o
  obj-$(CONFIG_MACH_NETSPACE_MINI_V2_DT)        += board-ns2.o
  obj-$(CONFIG_MACH_NETSPACE_V2_DT)     += board-ns2.o
 -obj-$(CONFIG_MACH_NSA310_DT)          += board-nsa310.o
  obj-$(CONFIG_MACH_OPENBLOCKS_A6_DT)   += board-openblocks_a6.o
  obj-$(CONFIG_MACH_READYNAS_DT)                += board-readynas.o
+ obj-$(CONFIG_MACH_SHEEVAPLUG_DT)      += board-sheevaplug.o
  obj-$(CONFIG_MACH_TOPKICK_DT)         += board-usi_topkick.o
  obj-$(CONFIG_MACH_TS219_DT)           += board-ts219.o tsx1x-common.o

diff --cc arch/arm/mach-kirkwood/board-dt.c
Simple merge

diff --cc arch/arm/mach-kirkwood/common.h
Simple merge

diff --cc arch/arm/mach-shmobile/board-bockw.c
index 7ed2401b899c05044d2e8471545571711dc9d515,2b6103e55c34d6911e83c1e06cb5d78ff5809580..f453923b56e704bb2a679bfd724ceb89d1cf3002
--- 1/arch/arm/mach-shmobile/board-bockw.c
--- 2/arch/arm/mach-shmobile/board-bockw.c
+++ b/arch/arm/mach-shmobile/board-bockw.c
@@@ -38,24 -56,31 +56,39 @@@ static struct resource smsc911x_resourc
        DEFINE_RES_IRQ(irq_pin(0)), /* IRQ 0 */
  };
  
 +static struct rcar_phy_platform_data usb_phy_platform_data __initdata;
 +
+ /* SDHI */
+ static struct sh_mobile_sdhi_info sdhi0_info = {
+       .tmio_caps      = MMC_CAP_SD_HIGHSPEED,
+       .tmio_ocr_mask  = MMC_VDD_165_195 | MMC_VDD_32_33 | MMC_VDD_33_34,
+       .tmio_flags     = TMIO_MMC_HAS_IDLE_WAIT,
+ };
+ 
  static const struct pinctrl_map bockw_pinctrl_map[] = {
        /* SCIF0 */
        PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.0", "pfc-r8a7778",
                                  "scif0_data_a", "scif0"),
        PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.0", "pfc-r8a7778",
                                  "scif0_ctrl", "scif0"),
++
++      /* EHCI */
 +      PIN_MAP_MUX_GROUP_DEFAULT("ehci-platform", "pfc-r8a7778",
 +                                "usb0", "usb0"),
 +      PIN_MAP_MUX_GROUP_DEFAULT("ehci-platform", "pfc-r8a7778",
 +                                "usb1", "usb1"),
+       /* SDHI0 */
+       PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7778",
+                                 "sdhi0", "sdhi0"),
  };
  
+ #define FPGA  0x18200000
  #define IRQ0MR        0x30
+ #define PFC   0xfffc0000
+ #define PUPR4 0x110
  static void __init bockw_init(void)
  {
-       void __iomem *fpga;
+       void __iomem *base;
  
        r8a7778_clock_init();
        r8a7778_init_irq_extpin(1);

diff --cc arch/arm/mach-shmobile/board-marzen.c
index b1b41b199f99b429c1e54f865fda63591b2f6930,a3810b03297c27ecf3e55eee50b77dc4f5a3f47d..a7d1010505bf9ff9246df09eca4a9706f2cf3a3f
--- 1/arch/arm/mach-shmobile/board-marzen.c
--- 2/arch/arm/mach-shmobile/board-marzen.c
+++ b/arch/arm/mach-shmobile/board-marzen.c
@@@ -231,9 -405,9 +231,10 @@@ static void __init marzen_init(void
        pinctrl_register_mappings(marzen_pinctrl_map,
                                  ARRAY_SIZE(marzen_pinctrl_map));
        r8a7779_pinmux_init();
+       r8a7779_init_irq_extpin(1); /* IRQ1 as individual interrupt */
  
        r8a7779_add_standard_devices();
 +      r8a7779_add_usb_phy_device(&usb_phy_platform_data);
        platform_add_devices(marzen_devices, ARRAY_SIZE(marzen_devices));
  }