Merge tag 'arm-soc/for-3.18/cygnus-dts-v9' of http://github.com/brcm/linux into next/dt

Merge "Broadcom Cygnus SoC Device Tree changes" from Florian Fianelli:

This patchset contains initial support for Broadcom's Cygnus SoC based on our
iProc architecture. Initial support is minimal and includes just the mach
platform code, clock driver, and a basic device tree configuration. Peripheral
drivers will be submitted soon, as will device tree configurations for other
Cygnus board variants.

These are the Device Tree changes

* tag 'arm-soc/for-3.18/cygnus-dts-v9' of http://github.com/brcm/linux:
  ARM: dts: Enable Broadcom Cygnus SoC
  dt-bindings: Document Broadcom Cygnus SoC and clocks

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

diff --combined arch/arm/boot/dts/Makefile
index 387b691,4b3a590..cfe973f
--- 1/arch/arm/boot/dts/Makefile
--- 2/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -54,6 -54,10 +54,10 @@@ dtb-$(CONFIG_ARCH_AT91)     += at91-sama5d4
  dtb-$(CONFIG_ARCH_ATLAS6) += atlas6-evb.dtb
  dtb-$(CONFIG_ARCH_AXXIA) += axm5516-amarillo.dtb
  dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb
+ dtb-$(CONFIG_ARCH_BCM_CYGNUS) += \
+       bcm911360_entphn.dtb \
+       bcm911360k.dtb \
+       bcm958300k.dtb
  dtb-$(CONFIG_ARCH_BCM_5301X) += bcm4708-netgear-r6250.dtb
  dtb-$(CONFIG_ARCH_BCM_63XX) += bcm963138dvt.dtb
  dtb-$(CONFIG_ARCH_BCM_MOBILE) += bcm28155-ap.dtb \
@@@ -81,7 -85,6 +85,7 @@@ dtb-$(CONFIG_ARCH_EXYNOS) += exynos4210
        exynos5250-arndale.dtb \
        exynos5250-smdk5250.dtb \
        exynos5250-snow.dtb \
 +      exynos5250-spring.dtb \
        exynos5260-xyref5260.dtb \
        exynos5410-smdk5410.dtb \
        exynos5420-arndale-octa.dtb \
@@@ -364,7 -367,6 +368,7 @@@ dtb-$(CONFIG_ARCH_QCOM) += 
        qcom-msm8660-surf.dtb \
        qcom-msm8960-cdp.dtb \
        qcom-msm8974-sony-xperia-honami.dtb
 +dtb-$(CONFIG_ARCH_REALVIEW) += arm-realview-pb1176.dtb
  dtb-$(CONFIG_ARCH_ROCKCHIP) += \
        rk3066a-bqcurie2.dtb \
        rk3188-radxarock.dtb \
@@@ -378,25 -380,25 +382,25 @@@ dtb-$(CONFIG_ARCH_S5PV210) += s5pv210-a
        s5pv210-smdkc110.dtb \
        s5pv210-smdkv210.dtb \
        s5pv210-torbreck.dtb
 -dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += r7s72100-genmai.dtb \
 +dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += \
 +      r8a73a4-ape6evm.dtb \
 +      r8a73a4-ape6evm-reference.dtb \
        r8a7740-armadillo800eva.dtb \
        r8a7778-bockw.dtb \
        r8a7778-bockw-reference.dtb \
        r8a7779-marzen.dtb \
 -      r8a7791-koelsch.dtb \
        r8a7790-lager.dtb \
 +      r8a7791-koelsch.dtb \
 +      sh7372-mackerel.dtb \
        sh73a0-kzm9g.dtb \
 -      sh73a0-kzm9g-reference.dtb \
 -      r8a73a4-ape6evm.dtb \
 -      r8a73a4-ape6evm-reference.dtb \
 -      sh7372-mackerel.dtb
 +      sh73a0-kzm9g-reference.dtb
  dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += emev2-kzm9d.dtb \
        r7s72100-genmai.dtb \
        r8a7740-armadillo800eva.dtb \
 +      r8a7779-marzen.dtb \
 +      r8a7790-lager.dtb \
        r8a7791-henninger.dtb \
        r8a7791-koelsch.dtb \
 -      r8a7790-lager.dtb \
 -      r8a7779-marzen.dtb \
        r8a7794-alt.dtb
  dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_arria5_socdk.dtb \
        socfpga_cyclone5_socdk.dtb \