Merge tag 'keystone-dts-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ssant...

Merge "Keystone DTS fixes for 3.15" from Santosh Shilimkar:

- Few fixes found during NAND ubifs testing
- Fix to build all dtbs together with dtbs
- Last patch is follow up comment from previous pull request

* tag 'keystone-dts-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone:
  ARM: dts: keystone: use common "ti,keystone" compatible instead of -evm
  ARM: dts: k2hk-evm: set ubifs partition size for 512M NAND
  ARM: dts: Build all keystone dt blobs
  ARM: dts: keystone: Fix control register range for clktsip
  ARM: dts: keystone: Fix domain register range for clkfftc1

Conflicts:
	arch/arm/boot/dts/Makefile

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --combined arch/arm/boot/dts/Makefile
index 4780ca1c8885f98cbb78c46b587f071d3c65f767,49ff796dc02e4d21ba4f39ac7959a95f5196a991..4bf43375eb901cb3f7062271d814937a748fdc42
--- 1/arch/arm/boot/dts/Makefile
--- 2/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -38,7 -38,6 +38,7 @@@ dtb-$(CONFIG_ARCH_AT91) += at91sam9g35e
  dtb-$(CONFIG_ARCH_AT91) += at91sam9x25ek.dtb
  dtb-$(CONFIG_ARCH_AT91) += at91sam9x35ek.dtb
  # sama5d3
 +dtb-$(CONFIG_ARCH_AT91)       += at91-sama5d3_xplained.dtb
  dtb-$(CONFIG_ARCH_AT91)       += sama5d31ek.dtb
  dtb-$(CONFIG_ARCH_AT91)       += sama5d33ek.dtb
  dtb-$(CONFIG_ARCH_AT91)       += sama5d34ek.dtb
@@@ -47,15 -46,19 +47,15 @@@ 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 \
 +      bcm21664-garnet.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
  dtb-$(CONFIG_ARCH_DAVINCI) += da850-enbw-cmc.dtb \
        da850-evm.dtb
 -dtb-$(CONFIG_ARCH_DOVE) += dove-cm-a510.dtb \
 -      dove-cubox.dtb \
 -      dove-d2plug.dtb \
 -      dove-d3plug.dtb \
 -      dove-dove-db.dtb
  dtb-$(CONFIG_ARCH_EFM32) += efm32gg-dk3750.dtb
  dtb-$(CONFIG_ARCH_EXYNOS) += exynos4210-origen.dtb \
        exynos4210-smdkv310.dtb \
@@@ -78,27 -81,17 +78,30 @@@ dtb-$(CONFIG_ARCH_HIGHBANK) += highbank
        ecx-2000.dtb
  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_KEYSTONE) += k2hk-evm.dtb \
+       k2l-evm.dtb \
+       k2e-evm.dtb
 +kirkwood := \
 +      kirkwood-b3.dtb \
 +      kirkwood-cloudbox.dtb \
        kirkwood-db-88f6281.dtb \
        kirkwood-db-88f6282.dtb \
        kirkwood-dns320.dtb \
        kirkwood-dns325.dtb \
        kirkwood-dockstar.dtb \
        kirkwood-dreamplug.dtb \
 +      kirkwood-ds109.dtb \
 +      kirkwood-ds110jv10.dtb \
 +      kirkwood-ds111.dtb \
 +      kirkwood-ds209.dtb \
 +      kirkwood-ds210.dtb \
 +      kirkwood-ds212.dtb \
 +      kirkwood-ds212j.dtb \
 +      kirkwood-ds409.dtb \
 +      kirkwood-ds409slim.dtb \
 +      kirkwood-ds411.dtb \
 +      kirkwood-ds411j.dtb \
 +      kirkwood-ds411slim.dtb \
        kirkwood-goflexnet.dtb \
        kirkwood-guruplug-server-plus.dtb \
        kirkwood-ib62x0.dtb \
@@@ -121,74 -114,54 +124,74 @@@
        kirkwood-nsa310a.dtb \
        kirkwood-openblocks_a6.dtb \
        kirkwood-openblocks_a7.dtb \
 +      kirkwood-rd88f6192.dtb \
 +      kirkwood-rd88f6281-a0.dtb \
 +      kirkwood-rd88f6281-a1.dtb \
 +      kirkwood-rs212.dtb \
 +      kirkwood-rs409.dtb \
 +      kirkwood-rs411.dtb \
        kirkwood-sheevaplug.dtb \
        kirkwood-sheevaplug-esata.dtb \
 +      kirkwood-t5325.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_KIRKWOOD) += $(kirkwood)
 +dtb-$(CONFIG_MACH_KIRKWOOD) += $(kirkwood)
 +dtb-$(CONFIG_ARCH_LPC32XX) += ea3250.dtb phy3250.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 \
 -      armada-370-netgear-rn104.dtb \
 -      armada-370-rd.dtb \
 -      armada-xp-axpwifiap.dtb \
 -      armada-xp-db.dtb \
 -      armada-xp-gp.dtb \
 -      armada-xp-netgear-rn2120.dtb \
 -      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 \
@@@ -212,9 -185,6 +215,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 \
@@@ -231,10 -201,6 +234,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,24 -211,11 +248,24 @@@
        omap3-n900.dtb \
        omap3-n9.dtb \
        omap3-n950.dtb \
 -      omap3-tobi.dtb \
 +      omap3-overo-alto35.dtb \
 +      omap3-overo-storm-alto35.dtb \
 +      omap3-overo-chestnut43.dtb \
 +      omap3-overo-storm-chestnut43.dtb \
 +      omap3-overo-gallop43.dtb \
 +      omap3-overo-storm-gallop43.dtb \
 +      omap3-overo-palo43.dtb \
 +      omap3-overo-storm-palo43.dtb \
 +      omap3-overo-summit.dtb \
 +      omap3-overo-storm-summit.dtb \
 +      omap3-overo-tobi.dtb \
 +      omap3-overo-storm-tobi.dtb \
        omap3-gta04.dtb \
        omap3-igep0020.dtb \
        omap3-igep0030.dtb \
 +      omap3-lilly-dbb056.dtb \
        omap3-zoom3.dtb \
 +      omap4-duovero-parlor.dtb \
        omap4-panda.dtb \
        omap4-panda-a4.dtb \
        omap4-panda-es.dtb \
@@@ -276,17 -229,12 +279,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 \
@@@ -337,9 -285,6 +340,9 @@@ dtb-$(CONFIG_ARCH_SUNXI) += 
        sun4i-a10-cubieboard.dtb \
        sun4i-a10-mini-xplus.dtb \
        sun4i-a10-hackberry.dtb \
 +      sun4i-a10-inet97fv2.dtb \
 +      sun4i-a10-olinuxino-lime.dtb \
 +      sun4i-a10-pcduino.dtb \
        sun5i-a10s-olinuxino-micro.dtb \
        sun5i-a13-olinuxino.dtb \
        sun5i-a13-olinuxino-micro.dtb \
@@@ -378,29 -323,6 +381,29 @@@ dtb-$(CONFIG_ARCH_VT8500) += vt8500-bv0
  dtb-$(CONFIG_ARCH_ZYNQ) += zynq-zc702.dtb \
        zynq-zc706.dtb \
        zynq-zed.dtb
 +dtb-$(CONFIG_MACH_ARMADA_370) += \
 +      armada-370-db.dtb \
 +      armada-370-mirabox.dtb \
 +      armada-370-netgear-rn102.dtb \
 +      armada-370-netgear-rn104.dtb \
 +      armada-370-rd.dtb
 +dtb-$(CONFIG_MACH_ARMADA_375) += \
 +      armada-375-db.dtb
 +dtb-$(CONFIG_MACH_ARMADA_38X) += \
 +      armada-385-db.dtb \
 +      armada-385-rd.dtb
 +dtb-$(CONFIG_MACH_ARMADA_XP) += \
 +      armada-xp-axpwifiap.dtb \
 +      armada-xp-db.dtb \
 +      armada-xp-gp.dtb \
 +      armada-xp-netgear-rn2120.dtb \
 +      armada-xp-matrix.dtb \
 +      armada-xp-openblocks-ax3-4.dtb
 +dtb-$(CONFIG_MACH_DOVE) += dove-cm-a510.dtb \
 +      dove-cubox.dtb \
 +      dove-d2plug.dtb \
 +      dove-d3plug.dtb \
 +      dove-dove-db.dtb
  
  targets += dtbs
  targets += $(dtb-y)