Merge tag 'mvebu-dt-4.4-2' of git://git.infradead.org/linux-mvebu into next/dt
authorOlof Johansson <olof@lixom.net>
Thu, 22 Oct 2015 17:43:03 +0000 (10:43 -0700)
committerOlof Johansson <olof@lixom.net>
Thu, 22 Oct 2015 17:43:03 +0000 (10:43 -0700)
mvebu dt for 4.4 (part 2)

- Add support for severals Armada-370-based Seagate NAS
- Fix Ready NAS device tree
- Modify SDHCI binding for A388-GP allowing using it on old and new
  version of the board

* tag 'mvebu-dt-4.4-2' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: set SW polling as SDHCI card detection on A388-GP
  arm: mvebu: reorder nodes under internal-regs by address in RN2120 .dts file
  arm: mvebu: disable unused Armada RTC on ReadyNAS 102, 104 and 2120
  ARM: mvebu: add DT support for Seagate Personal Cloud
  ARM: mvebu: add DT support for Seagate NAS 2 and 4-Bay

Signed-off-by: Olof Johansson <olof@lixom.net>
1  2 
arch/arm/boot/dts/Makefile

index ad3ac4afb1838846e44c87f8076d07d32de6216f,83c5105b7dc3edb0f4c19f2a4bfe137629e681b3..b2ab89151796599258b6103c815a304397229929
@@@ -72,7 -72,6 +72,7 @@@ dtb-$(CONFIG_ARCH_BCM_5301X) += 
        bcm47081-buffalo-wzr-900dhp.dtb \
        bcm4709-asus-rt-ac87u.dtb \
        bcm4709-buffalo-wxr-1900dhp.dtb \
 +      bcm4709-netgear-r7000.dtb \
        bcm4709-netgear-r8000.dtb
  dtb-$(CONFIG_ARCH_BCM_63XX) += \
        bcm963138dvt.dtb
@@@ -84,8 -83,6 +84,8 @@@ dtb-$(CONFIG_ARCH_BCM_CYGNUS) += 
  dtb-$(CONFIG_ARCH_BCM_MOBILE) += \
        bcm28155-ap.dtb \
        bcm21664-garnet.dtb
 +dtb-$(CONFIG_ARCH_BCM_NSP) += \
 +      bcm958625k.dtb
  dtb-$(CONFIG_ARCH_BERLIN) += \
        berlin2-sony-nsz-gs7.dtb \
        berlin2cd-google-chromecast.dtb \
@@@ -118,7 -115,6 +118,7 @@@ dtb-$(CONFIG_ARCH_EXYNOS5) += 
        exynos5250-arndale.dtb \
        exynos5250-smdk5250.dtb \
        exynos5250-snow.dtb \
 +      exynos5250-snow-rev5.dtb \
        exynos5250-spring.dtb \
        exynos5260-xyref5260.dtb \
        exynos5410-smdk5410.dtb \
        exynos5420-smdk5420.dtb \
        exynos5422-odroidxu3.dtb \
        exynos5422-odroidxu3-lite.dtb \
 +      exynos5422-odroidxu4.dtb \
        exynos5440-sd5v1.dtb \
        exynos5440-ssdk5440.dtb \
        exynos5800-peach-pi.dtb
@@@ -232,9 -227,6 +232,9 @@@ dtb-$(CONFIG_ARCH_MMP) += 
        pxa168-aspenite.dtb \
        pxa910-dkb.dtb \
        mmp2-brownstone.dtb
 +dtb-$(CONFIG_MACH_MESON8B) += \
 +      meson8b-mxq.dtb \
 +      meson8b-odroidc1.dtb
  dtb-$(CONFIG_ARCH_MOXART) += \
        moxart-uc7112lx.dtb
  dtb-$(CONFIG_SOC_IMX1) += \
@@@ -454,7 -446,6 +454,7 @@@ dtb-$(CONFIG_SOC_AM33XX) += 
        am335x-base0033.dtb \
        am335x-bone.dtb \
        am335x-boneblack.dtb \
 +      am335x-bonegreen.dtb \
        am335x-sl50.dtb \
        am335x-evm.dtb \
        am335x-evmsk.dtb \
@@@ -515,10 -506,7 +515,10 @@@ dtb-$(CONFIG_ARCH_ROCKCHIP) += 
        rk3288-evb-rk808.dtb \
        rk3288-firefly-beta.dtb \
        rk3288-firefly.dtb \
 +      rk3288-popmetal.dtb \
        rk3288-r89.dtb \
 +      rk3288-rock2-square.dtb \
 +      rk3288-veyron-jaq.dtb \
        rk3288-veyron-jerry.dtb \
        rk3288-veyron-minnie.dtb \
        rk3288-veyron-pinky.dtb \
@@@ -534,6 -522,9 +534,6 @@@ dtb-$(CONFIG_ARCH_S5PV210) += 
        s5pv210-smdkc110.dtb \
        s5pv210-smdkv210.dtb \
        s5pv210-torbreck.dtb
 -dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += \
 -      r8a7778-bockw.dtb \
 -      r8a7778-bockw-reference.dtb
  dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += \
        emev2-kzm9d.dtb \
        r7s72100-genmai.dtb \
        r8a7790-lager.dtb \
        r8a7791-henninger.dtb \
        r8a7791-koelsch.dtb \
 +      r8a7791-porter.dtb \
        r8a7793-gose.dtb \
        r8a7794-alt.dtb \
        r8a7794-silk.dtb \
@@@ -587,10 -577,8 +587,10 @@@ dtb-$(CONFIG_MACH_SUN4I) += 
        sun4i-a10-gemei-g9.dtb \
        sun4i-a10-hackberry.dtb \
        sun4i-a10-hyundai-a7hd.dtb \
 +      sun4i-a10-inet1.dtb \
        sun4i-a10-inet97fv2.dtb \
 -      sun4i-a10-itead-iteaduino-plus.dts \
 +      sun4i-a10-inet9f-rev03.dtb \
 +      sun4i-a10-itead-iteaduino-plus.dtb \
        sun4i-a10-jesurun-q5.dtb \
        sun4i-a10-marsboard.dtb \
        sun4i-a10-mini-xplus.dtb \
        sun4i-a10-olinuxino-lime.dtb \
        sun4i-a10-pcduino.dtb
  dtb-$(CONFIG_MACH_SUN5I) += \
 +      sun5i-a10s-auxtek-t003.dtb \
        sun5i-a10s-auxtek-t004.dtb \
        sun5i-a10s-mk802.dtb \
        sun5i-a10s-olinuxino-micro.dtb \
        sun5i-a10s-r7-tv-dongle.dtb \
 +      sun5i-a10s-wobo-i5.dtb \
        sun5i-a13-hsg-h702.dtb \
 +      sun5i-a13-inet-98v-rev2.dtb \
        sun5i-a13-olinuxino.dtb \
        sun5i-a13-olinuxino-micro.dtb \
 +      sun5i-a13-q8-tablet.dtb \
        sun5i-a13-utoo-p66.dtb
  dtb-$(CONFIG_MACH_SUN6I) += \
        sun6i-a31-app4-evb1.dtb \
        sun6i-a31-i7.dtb \
        sun6i-a31-m9.dtb \
        sun6i-a31-mele-a1000g-quad.dtb \
 -      sun6i-a31s-cs908.dtb
 +      sun6i-a31s-cs908.dtb \
 +      sun6i-a31s-yones-toptech-bs1078-v2.dtb
  dtb-$(CONFIG_MACH_SUN7I) += \
        sun7i-a20-bananapi.dtb \
        sun7i-a20-bananapro.dtb \
        sun7i-a20-i12-tvbox.dtb \
        sun7i-a20-m3.dtb \
        sun7i-a20-mk808c.dtb \
 +      sun7i-a20-olimex-som-evb.dtb \
        sun7i-a20-olinuxino-lime.dtb \
        sun7i-a20-olinuxino-lime2.dtb \
        sun7i-a20-olinuxino-micro.dtb \
        sun7i-a20-orangepi-mini.dtb \
        sun7i-a20-pcduino3.dtb \
        sun7i-a20-pcduino3-nano.dtb \
 -      sun7i-a20-wexler-tab7200.dtb
 +      sun7i-a20-wexler-tab7200.dtb \
 +      sun7i-a20-wits-pro-a20-dkt.dtb
  dtb-$(CONFIG_MACH_SUN8I) += \
        sun8i-a23-evb.dtb \
 +      sun8i-a23-gt90h-v4.dtb \
        sun8i-a23-ippo-q8h-v5.dtb \
        sun8i-a23-ippo-q8h-v1.2.dtb \
        sun8i-a33-et-q8-v1.6.dtb \
        sun8i-a33-ga10h-v1.1.dtb \
        sun8i-a33-ippo-q8h-v1.2.dtb \
 +      sun8i-a33-q8-tablet.dtb \
        sun8i-a33-sinlinx-sina33.dtb
  dtb-$(CONFIG_MACH_SUN9I) += \
        sun9i-a80-optimus.dtb \
@@@ -723,6 -702,10 +723,10 @@@ dtb-$(CONFIG_MACH_ARMADA_370) += 
        armada-370-netgear-rn102.dtb \
        armada-370-netgear-rn104.dtb \
        armada-370-rd.dtb \
+       armada-370-seagate-nas-2bay.dtb \
+       armada-370-seagate-nas-4bay.dtb \
+       armada-370-seagate-personal-cloud.dtb \
+       armada-370-seagate-personal-cloud-2bay.dtb \
        armada-370-synology-ds213j.dtb
  dtb-$(CONFIG_MACH_ARMADA_375) += \
        armada-375-db.dtb