Merge branch 'next/boards' into for-next

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

diff --cc arch/arm/mach-shmobile/board-bockw.c
index f453923b56e704bb2a679bfd724ceb89d1cf3002,ce56381e0077ef16082816d64e2eed04439d5d1d..55ca6e3da7f510a698d3ea0f752d79175a44455e
--- 1/arch/arm/mach-shmobile/board-bockw.c
--- 2/arch/arm/mach-shmobile/board-bockw.c
+++ b/arch/arm/mach-shmobile/board-bockw.c
@@@ -93,8 -173,15 +181,17 @@@ static void __init bockw_init(void
        r8a7778_clock_init();
        r8a7778_init_irq_extpin(1);
        r8a7778_add_standard_devices();
 +      r8a7778_add_usb_phy_device(&usb_phy_platform_data);
 +
+       r8a7778_add_ether_device(&ether_platform_data);
+       r8a7778_add_i2c_device(0);
+       r8a7778_add_hspi_device(0);
+       r8a7778_add_mmc_device(&sh_mmcif_plat);
+ 
+       i2c_register_board_info(0, i2c0_devices,
+                               ARRAY_SIZE(i2c0_devices));
+       spi_register_board_info(spi_board_info,
+                               ARRAY_SIZE(spi_board_info));
        pinctrl_register_mappings(bockw_pinctrl_map,
                                  ARRAY_SIZE(bockw_pinctrl_map));
        r8a7778_pinmux_init();