Merge branch 'next/boards' into for-next

* next/boards:
  ARM: shmobile: lager: disable MMCIF Command Completion Signal, add CLK_CTRL2
  ARM: shmobile: kzm9g: disable MMCIF Command Completion Signal
  ARM: shmobile: armadillo800eva: disable MMCIF Command Completion Signal
  ARM: shmobile: ape6evm: disable MMCIF Command Completion Signal
  ARM: shmobile: bockw: add USB Function support
  ARM: shmobile: Koelsch support
  ARM: shmobile: bockw: add R-Car sound support (PIO)
  ARM: shmobile: bockw: enable global use of FPGA
  ARM: shmobile: lager: Fix Display Unit platform data
  ARM: shmobile: ape6evm: update MMC0, SDHI0 and SDHI1 with correct regulators
  ARM: shmobile: lager: Add Display Unit support
  ARM: shmobile: marzen: Add Display Unit support

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

diff --cc arch/arm/arm-soc-for-next-contents.txt
index f495e69c34255b7397b1732ccc5aad9ce8cb0d34,0000000000000000000000000000000000000000..7f00e3e6e15efd41b7a20e546f1c4ced5ea6d7f2
mode 100644,000000..100644
--- 1/arch/arm/arm-soc-for-next-contents.txt
--- /dev/null
+++ b/arch/arm/arm-soc-for-next-contents.txt
@@@ -1,37 -1,0 +1,41 @@@
 +
 +
 +next/cleanup
 +      shark/removal
 +                git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/del-shark-for-v3.13
 +      cleanup/dt-clock
 +              https://github.com/shesselba/linux-dove.git clk-of-init-v2_for-3.13
 +      patch
 +              ARM: drop explicit selection of HAVE_CLK and CLKDEV_LOOKUP
 +      reneasas/initdata-cleanup
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-fixes5-for-v3.12
 +      renesas/cleanup
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-cleanup-for-v3.13
 +
 +next/soc
 +      samsung/s3c64xx-clk
 +              http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/samsung-clk-s3c64xx
 +      patch
 +              ARM: davinci: remove deprecated IRQF_DISABLED
 +      renesas/soc
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-soc-for-v3.13
 +      renesas/smp
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-smp-for-v3.13
 +
 +next/drivers
 +      davinci/gpio
 +              git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci.git tags/davinci-for-v3.13/gpio
 +
++next/boards
++      renesas/boards
++              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git renesas-boards-for-v3.13
++
 +next/dt
 +      samsung/s3c64xx-dt
 +                http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/samsung-dt-s3c64xx
 +      ux500/dt
 +              git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/ux500-dt-for-v3.13-2
 +              patch "ARM: ux500: enable appended dtb in u8500_defconfig"
 +      ux500/dt2
 +              git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/ux500-devicetree-2
 +

diff --cc arch/arm/boot/dts/Makefile
Simple merge

diff --cc arch/arm/mach-shmobile/Makefile
Simple merge

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

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

diff --cc arch/arm/mach-shmobile/board-lager.c
index 6d1026e99e1362617742a4aa5c4f4911f1baa94a,1e231423b2b093defd49f338f0a46b638dec0aee..7e8f9eb5bd63b1d17b8cc5c893cb0a9cbfd180c0
--- 1/arch/arm/mach-shmobile/board-lager.c
--- 2/arch/arm/mach-shmobile/board-lager.c
+++ b/arch/arm/mach-shmobile/board-lager.c
@@@ -28,8 -28,8 +28,9 @@@
  #include <linux/mmc/sh_mmcif.h>
  #include <linux/pinctrl/machine.h>
  #include <linux/platform_data/gpio-rcar.h>
+ #include <linux/platform_data/rcar-du.h>
  #include <linux/platform_device.h>
 +#include <linux/phy.h>
  #include <linux/regulator/fixed.h>
  #include <linux/regulator/machine.h>
  #include <linux/sh_eth.h>
@@@ -154,32 -219,10 +220,34 @@@ static void __init lager_add_standard_d
                                          ether_resources,
                                          ARRAY_SIZE(ether_resources),
                                          &ether_pdata, sizeof(ether_pdata));
+ 
+       lager_add_du_device();
  }
  
 +/*
 + * Ether LEDs on the Lager board are named LINK and ACTIVE which corresponds
 + * to non-default 01 setting of the Micrel KSZ8041 PHY control register 1 bits
 + * 14-15. We have to set them back to 01 from the default 00 value each time
 + * the PHY is reset. It's also important because the PHY's LED0 signal is
 + * connected to SoC's ETH_LINK signal and in the PHY's default mode it will
 + * bounce on and off after each packet, which we apparently want to avoid.
 + */
 +static int lager_ksz8041_fixup(struct phy_device *phydev)
 +{
 +      u16 phyctrl1 = phy_read(phydev, 0x1e);
 +
 +      phyctrl1 &= ~0xc000;
 +      phyctrl1 |= 0x4000;
 +      return phy_write(phydev, 0x1e, phyctrl1);
 +}
 +
 +static void __init lager_init(void)
 +{
 +      lager_add_standard_devices();
 +
 +      phy_register_fixup_for_id("r8a7790-ether-ff:01", lager_ksz8041_fixup);
 +}
 +
  static const char *lager_boards_compat_dt[] __initdata = {
        "renesas,lager",
        NULL,