Merge tag 'armsoc/for-3.15/dt' of git://github.com/broadcom/mach-bcm into next/dt

Merge "ARM: mach-bcm dt updates for 3.15" from Matt Porter:

- add BCM4708 dt support
- remove bcm11351-brt
- bcm281xx common clock support

* tag 'armsoc/for-3.15/dt' of git://github.com/broadcom/mach-bcm:
  ARM: dts: remove bcm11351-brt.dts
  ARM: dts: Leave sdio1 as disabled on bcm28155-ap
  ARM: dts: bcm281xx: define real clocks
  ARM: BCM5301X: add dts files for BCM4708 SoC

Signed-off-by: Olof Johansson <[email protected]>

diff --combined arch/arm/boot/dts/Makefile
index 8f7bb77f4322afa25be8f2b432acb2e38075ec1d,ca755521caeec350caa74cf3bd8b383e35104df7..fa2814441e7e0d37b365db78bda23f270e78656b
--- 1/arch/arm/boot/dts/Makefile
--- 2/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -47,9 -47,9 +47,9 @@@ dtb-$(CONFIG_ARCH_AT91)       += sama5d36ek.d
  
  dtb-$(CONFIG_ARCH_ATLAS6) += atlas6-evb.dtb
  dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb
- dtb-$(CONFIG_ARCH_BCM_MOBILE) += bcm11351-brt.dtb \
-       bcm28155-ap.dtb
+ dtb-$(CONFIG_ARCH_BCM_MOBILE) += bcm28155-ap.dtb
  dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb
+ dtb-$(CONFIG_ARCH_BCM_5301X) += bcm4708-netgear-r6250.dtb
  dtb-$(CONFIG_ARCH_BERLIN) += \
        berlin2-sony-nsz-gs7.dtb        \
        berlin2cd-google-chromecast.dtb
@@@ -83,8 -83,7 +83,8 @@@ dtb-$(CONFIG_ARCH_HIGHBANK) += highbank
  dtb-$(CONFIG_ARCH_INTEGRATOR) += integratorap.dtb \
        integratorcp.dtb
  dtb-$(CONFIG_ARCH_LPC32XX) += ea3250.dtb phy3250.dtb
 -dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-cloudbox.dtb \
 +dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-b3.dtb \
 +      kirkwood-cloudbox.dtb \
        kirkwood-db-88f6281.dtb \
        kirkwood-db-88f6282.dtb \
        kirkwood-dns320.dtb \
@@@ -113,18 -112,16 +113,18 @@@
        kirkwood-nsa310a.dtb \
        kirkwood-openblocks_a6.dtb \
        kirkwood-openblocks_a7.dtb \
 +      kirkwood-rd88f6192.dtb \
 +      kirkwood-rd88f6281-a0.dtb \
 +      kirkwood-rd88f6281-a1.dtb \
        kirkwood-sheevaplug.dtb \
        kirkwood-sheevaplug-esata.dtb \
        kirkwood-topkick.dtb \
        kirkwood-ts219-6281.dtb \
 -      kirkwood-ts219-6282.dtb
 +      kirkwood-ts219-6282.dtb \
 +      kirkwood-ts419-6281.dtb \
 +      kirkwood-ts419-6282.dtb
  dtb-$(CONFIG_ARCH_MARCO) += marco-evb.dtb
  dtb-$(CONFIG_ARCH_MOXART) += moxart-uc7112lx.dtb
 -dtb-$(CONFIG_ARCH_MSM) += qcom-msm8660-surf.dtb \
 -      qcom-msm8960-cdp.dtb \
 -      qcom-apq8074-dragonboard.dtb
  dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \
        armada-370-mirabox.dtb \
        armada-370-netgear-rn102.dtb \
@@@ -137,54 -134,32 +137,54 @@@
        armada-xp-matrix.dtb \
        armada-xp-openblocks-ax3-4.dtb
  dtb-$(CONFIG_ARCH_MXC) += \
 +      imx25-eukrea-mbimxsd25-baseboard.dtb \
        imx25-karo-tx25.dtb \
        imx25-pdk.dtb \
        imx27-apf27.dtb \
        imx27-apf27dev.dtb \
        imx27-pdk.dtb \
 -      imx27-phytec-phycore-som.dtb \
        imx27-phytec-phycore-rdk.dtb \
 -      imx27-phytec-phycard-s-som.dtb \
        imx27-phytec-phycard-s-rdk.dtb \
        imx31-bug.dtb \
 +      imx35-eukrea-mbimxsd35-baseboard.dtb \
 +      imx50-evk.dtb \
        imx51-apf51.dtb \
        imx51-apf51dev.dtb \
        imx51-babbage.dtb \
 +      imx51-eukrea-mbimxsd51-baseboard.dtb \
        imx53-ard.dtb \
 -      imx53-evk.dtb \
        imx53-m53evk.dtb \
        imx53-mba53.dtb \
        imx53-qsb.dtb \
 +      imx53-qsrb.dtb \
        imx53-smd.dtb \
 +      imx53-tx53-x03x.dtb \
 +      imx53-tx53-x13x.dtb \
 +      imx53-voipac-bsb.dtb \
        imx6dl-cubox-i.dtb \
 +      imx6dl-dfi-fs700-m60.dtb \
 +      imx6dl-gw51xx.dtb \
 +      imx6dl-gw52xx.dtb \
 +      imx6dl-gw53xx.dtb \
 +      imx6dl-gw54xx.dtb \
        imx6dl-hummingboard.dtb \
 +      imx6dl-nitrogen6x.dtb \
        imx6dl-sabreauto.dtb \
 +      imx6dl-sabrelite.dtb \
        imx6dl-sabresd.dtb \
        imx6dl-wandboard.dtb \
        imx6q-arm2.dtb \
 +      imx6q-cm-fx6.dtb \
        imx6q-cubox-i.dtb \
 +      imx6q-dfi-fs700-m60.dtb \
 +      imx6q-dmo-edmqmx6.dtb \
 +      imx6q-gk802.dtb \
 +      imx6q-gw51xx.dtb \
 +      imx6q-gw52xx.dtb \
 +      imx6q-gw53xx.dtb \
 +      imx6q-gw5400-a.dtb \
 +      imx6q-gw54xx.dtb \
 +      imx6q-nitrogen6x.dtb \
        imx6q-phytec-pbab01.dtb \
        imx6q-sabreauto.dtb \
        imx6q-sabrelite.dtb \
@@@ -208,9 -183,6 +208,9 @@@ dtb-$(CONFIG_ARCH_MXS) += imx23-evk.dt
        imx28-cfa10056.dtb \
        imx28-cfa10057.dtb \
        imx28-cfa10058.dtb \
 +      imx28-duckbill.dtb \
 +      imx28-eukrea-mbmx283lc.dtb \
 +      imx28-eukrea-mbmx287lc.dtb \
        imx28-evk.dtb \
        imx28-m28cu3.dtb \
        imx28-m28evk.dtb \
@@@ -227,10 -199,6 +227,10 @@@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap242
        omap2420-n810-wimax.dtb \
        omap3430-sdp.dtb \
        omap3-beagle.dtb \
 +      omap3-cm-t3517.dtb \
 +      omap3-sbc-t3517.dtb \
 +      omap3-cm-t3530.dtb \
 +      omap3-sbc-t3530.dtb \
        omap3-cm-t3730.dtb \
        omap3-sbc-t3730.dtb \
        omap3-devkit8000.dtb \
@@@ -245,7 -213,6 +245,7 @@@
        omap3-gta04.dtb \
        omap3-igep0020.dtb \
        omap3-igep0030.dtb \
 +      omap3-lilly-dbb056.dtb \
        omap3-zoom3.dtb \
        omap4-panda.dtb \
        omap4-panda-a4.dtb \
@@@ -260,17 -227,12 +260,17 @@@
        am335x-boneblack.dtb \
        am335x-nano.dtb \
        am335x-base0033.dtb \
 +      am3517-craneboard.dtb \
        am3517-evm.dtb \
        am3517_mt_ventoux.dtb \
        am43x-epos-evm.dtb \
 +      am437x-gp-evm.dtb \
        dra7-evm.dtb
  dtb-$(CONFIG_ARCH_ORION5X) += orion5x-lacie-ethernet-disk-mini-v2.dtb
  dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb
 +dtb-$(CONFIG_ARCH_QCOM) += qcom-msm8660-surf.dtb \
 +      qcom-msm8960-cdp.dtb \
 +      qcom-apq8074-dragonboard.dtb
  dtb-$(CONFIG_ARCH_U8500) += ste-snowball.dtb \
        ste-hrefprev60-stuib.dtb \
        ste-hrefprev60-tvk.dtb \
@@@ -321,7 -283,6 +321,7 @@@ dtb-$(CONFIG_ARCH_SUNXI) += 
        sun4i-a10-cubieboard.dtb \
        sun4i-a10-mini-xplus.dtb \
        sun4i-a10-hackberry.dtb \
 +      sun4i-a10-pcduino.dtb \
        sun5i-a10s-olinuxino-micro.dtb \
        sun5i-a13-olinuxino.dtb \
        sun5i-a13-olinuxino-micro.dtb \