Merge tag 'imx-dt-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo...

The i.MX device tree changes for 4.4:
 - Add IOMUXC LPSR (Low Power State Retention) device for i.MX7D.
 - Add a few low power mode related devices and touch controller for
   i.MX6UL.
 - Add a number of devices for i.MX7D SDB board support, USB, Dual FEC,
   and eMMC5.0.
 - i.MX6 Boundary Devices updates: relicense under GPLv2/X11, add Okaya
   LCD, touch and wifi support, add new boards Nitrogen6_Lite and
   Nitrogen6_Max.
 - Enable touch screen and NAND Flash controller for a few Vybrid
   devices.
 - Some random and small updates on LS1021A and MXS support.

* tag 'imx-dt-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (53 commits)
  ARM: dts: ls1021a: Add quirk for Erratum A009116
  ARM: imx6sx-sdb: Fix typo in regulator enable GPIO property
  ARM: dts: imx6: phyFLEX: fix typo in "pinctrl-names"
  ARM: dts: imx6: change the core clock of spdif
  ARM: dts: vf-colibri: enable NAND flash controller
  ARM: dts: vf610twr: add NAND flash controller peripherial
  ARM: dts: imx: add Boundary Devices Nitrogen6_Lite board
  ARM: dts: imx: add Boundary Devices Nitrogen6_Max board
  ARM: dts: imx6dl-nitrogen6x: change manufacturer to Boundary Devices
  ARM: dts: imx6q-nitrogen6x: change manufacturer to Boundary Devices
  of: Add Boundary Devices Inc. vendor prefix
  ARM: dts: imx6qdl-sabrelite: relicense under GPLv2/X11
  ARM: dts: imx6qdl-nitrogen6x: relicense under GPLv2/X11
  ARM: dts: imx6qdl-nitrogen6x: add wifi wl1271 support
  ARM: dts: imx6dql-nitrogen6x: add touchscreen support
  ARM: dts: imx6qdl-sabrelite: add Okaya LCD panel
  ARM: dts: imx6qdl-nitrogen6x: add Okaya LCD panel
  ARM: dts: vf500-colibri: Add device tree node for touchscreen support
  ARM: dts: i.MX35: fix cpu compatible value
  ARM: dts: i.MX31: fix cpu compatible value
  ...

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

diff --combined Documentation/devicetree/bindings/vendor-prefixes.txt
index 54c91efc551fe1e05ede3cd20b6216e3806b888c,4c67e2a3caef67d4d33d109a757b888e01691cc5..dbfe839c201a81060311e6b233ec790144880638
--- 1/Documentation/devicetree/bindings/vendor-prefixes.txt
--- 2/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -34,6 -34,7 +34,7 @@@ avago Avago Technologie
  avic  Shanghai AVIC Optoelectronics Co., Ltd.
  axis  Axis Communications AB
  bosch Bosch Sensortec GmbH
+ boundary      Boundary Devices Inc.
  brcm  Broadcom Corporation
  buffalo       Buffalo, Inc.
  calxeda       Calxeda
@@@ -203,7 -204,6 +204,7 @@@ sitronix   Sitronix Technology Corporatio
  skyworks      Skyworks Solutions, Inc.
  smsc  Standard Microsystems Corporation
  snps  Synopsys, Inc.
 +socionext     Socionext Inc.
  solidrun      SolidRun
  solomon        Solomon Systech Limited
  sony  Sony Corporation
@@@ -222,7 -222,6 +223,7 @@@ toradex    Toradex A
  toshiba       Toshiba Corporation
  toumaz        Toumaz
  tplink        TP-LINK Technologies Co., Ltd.
 +tronfy        Tronfy
  truly Truly Semiconductors Limited
  usi   Universal Scientific Industrial Co., Ltd.
  v3    V3 Semiconductor

diff --combined arch/arm/boot/dts/Makefile
index b18a3ba6c81ce58e678a5617df6b1b70b1c9e1a5,b4afb42e2fc5b0e4b2dd9b99adf9f67367836fba..3e38fbb72e3b42d03470a6bd17528745d01a73d8
--- 1/arch/arm/boot/dts/Makefile
--- 2/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -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 \
@@@ -127,7 -123,6 +127,7 @@@
        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) += \
@@@ -292,6 -284,7 +292,7 @@@ dtb-$(CONFIG_SOC_IMX6Q) += 
        imx6dl-gw551x.dtb \
        imx6dl-gw552x.dtb \
        imx6dl-hummingboard.dtb \
+       imx6dl-nit6xlite.dtb \
        imx6dl-nitrogen6x.dtb \
        imx6dl-phytec-pbab01.dtb \
        imx6dl-rex-basic.dtb \
@@@ -321,6 -314,7 +322,7 @@@
        imx6q-gw552x.dtb \
        imx6q-hummingboard.dtb \
        imx6q-nitrogen6x.dtb \
+       imx6q-nitrogen6_max.dtb \
        imx6q-phytec-pbab01.dtb \
        imx6q-rex-pro.dtb \
        imx6q-sabreauto.dtb \
@@@ -454,7 -448,6 +456,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 -508,7 +517,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 -524,9 +536,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 \
@@@ -544,7 -537,6 +546,7 @@@
        r8a7790-lager.dtb \
        r8a7791-henninger.dtb \
        r8a7791-koelsch.dtb \
 +      r8a7791-porter.dtb \
        r8a7793-gose.dtb \
        r8a7794-alt.dtb \
        r8a7794-silk.dtb \
@@@ -587,32 -579,24 +589,32 @@@ 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-mk802.dtb \
        sun4i-a10-mk802ii.dtb \
        sun4i-a10-olinuxino-lime.dtb \
 -      sun4i-a10-pcduino.dtb
 +      sun4i-a10-pcduino.dtb \
 +      sun4i-a10-pcduino2.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-utoo-p66.dtb
 +      sun5i-a13-q8-tablet.dtb \
 +      sun5i-a13-utoo-p66.dtb \
 +      sun5i-r8-chip.dtb
  dtb-$(CONFIG_MACH_SUN6I) += \
        sun6i-a31-app4-evb1.dtb \
        sun6i-a31-colombus.dtb \
@@@ -620,9 -604,7 +622,9 @@@
        sun6i-a31-i7.dtb \
        sun6i-a31-m9.dtb \
        sun6i-a31-mele-a1000g-quad.dtb \
 -      sun6i-a31s-cs908.dtb
 +      sun6i-a31s-cs908.dtb \
 +      sun6i-a31s-sinovoip-bpi-m2.dtb \
 +      sun6i-a31s-yones-toptech-bs1078-v2.dtb
  dtb-$(CONFIG_MACH_SUN7I) += \
        sun7i-a20-bananapi.dtb \
        sun7i-a20-bananapro.dtb \
@@@ -632,7 -614,6 +634,7 @@@
        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 \
@@@ -640,18 -621,14 +642,18 @@@
        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-a23-q8-tablet.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 \
@@@ -727,10 -704,6 +729,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