Merge branch 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas...

Renesas board changes from Simon Horman:

* 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: Remove G4EVM machine support
  ARM: shmobile: Remove G3EVM machine support
  ARM: mach-shmobile: Use DT_MACHINE for mackerel
  ARM: shmobile: marzen: add HSPI support
  ARM: shmobile: armadillo800eva: enable restart
  ARM: shmobile: kzm9g: enable DMAEngine on SHDI0 and SDHI2
  ARM: shmobile: kzm9g: enable three-axis digital accelerometer ADXL345
  ARM: shmobile: kzm9g: enable magnetometer ak8975.

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --combined arch/arm/boot/dts/Makefile
index f37cf9fa5fa073318b3c6faad5d0a1480bd99826,063223945368f61cc88a3f7d4b8d522f09a6a03e..a9d8a10d1ac6f81f4ef44f720d6e0f3b099e4aaf
--- 1/arch/arm/boot/dts/Makefile
--- 2/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -25,8 -25,6 +25,8 @@@ dtb-$(CONFIG_ARCH_EXYNOS) += exynos4210
        exynos4210-trats.dtb \
        exynos5250-smdk5250.dtb
  dtb-$(CONFIG_ARCH_HIGHBANK) += highbank.dtb
 +dtb-$(CONFIG_ARCH_INTEGRATOR) += integratorap.dtb \
 +      integratorcp.dtb
  dtb-$(CONFIG_ARCH_LPC32XX) += ea3250.dtb phy3250.dtb
  dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-dns320.dtb \
        kirkwood-dns325.dtb \
@@@ -77,7 -75,8 +77,8 @@@ dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb
  dtb-$(CONFIG_ARCH_U8500) += snowball.dtb
  dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \
        r8a7740-armadillo800eva.dtb \
-       sh73a0-kzm9g.dtb
+       sh73a0-kzm9g.dtb \
+       sh7372-mackerel.dtb
  dtb-$(CONFIG_ARCH_SPEAR13XX) += spear1310-evb.dtb \
        spear1340-evb.dtb
  dtb-$(CONFIG_ARCH_SPEAR3XX)+= spear300-evb.dtb \

diff --combined arch/arm/mach-shmobile/board-armadillo800eva.c
index 3cc8b1c21da9edffc4dfc7dd8a0d2288a4f69e05,fe27d7eda4bb001f612bf668e007d5ca7ba9752f..499e6e3766660817fef28cc9022596ab11633dd3
--- 1/arch/arm/mach-shmobile/board-armadillo800eva.c
--- 2/arch/arm/mach-shmobile/board-armadillo800eva.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
@@@ -1196,7 -1196,7 +1196,7 @@@ static void __init eva_init(void
  
  #ifdef CONFIG_CACHE_L2X0
        /* Early BRESP enable, Shared attribute override enable, 32K*8way */
 -      l2x0_init(__io(0xf0002000), 0x40440000, 0x82000fff);
 +      l2x0_init(IOMEM(0xf0002000), 0x40440000, 0x82000fff);
  #endif
  
        i2c_register_board_info(0, i2c0_devices, ARRAY_SIZE(i2c0_devices));
@@@ -1229,6 -1229,13 +1229,13 @@@ static void __init eva_add_early_device
        shmobile_timer.init = eva_earlytimer_init;
  }
  
+ #define RESCNT2 IOMEM(0xe6188020)
+ static void eva_restart(char mode, const char *cmd)
+ {
+       /* Do soft power on reset */
+       writel((1 << 31), RESCNT2);
+ }
+ 
  static const char *eva_boards_compat_dt[] __initdata = {
        "renesas,armadillo800eva",
        NULL,
@@@ -1243,4 -1250,5 +1250,5 @@@ DT_MACHINE_START(ARMADILLO800EVA_DT, "a
        .init_late      = shmobile_init_late,
        .timer          = &shmobile_timer,
        .dt_compat      = eva_boards_compat_dt,
+       .restart        = eva_restart,
  MACHINE_END