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

The i.MX device tree changes for 4.2:
 - Add device tree for i.MX7D SoC and imx7d-sdb board
 - New i.MX6 board support: Armadeus Systems APF6, Gateworks GW5510,
   and aristainetos2 boards
 - Change LVDS to use simple-panel for nitrogen6x and sabrelite boards
 - Add Wifi/Bluetooth devices support for cubox-i board
 - Remove unused regulators and correct OTG roles setting for
   imx6sl-warp board
 - Add I2C support for imx23-olinuxino board
 - Move imx6qdl HDMI device to a better place
 - Add power-domain for imx6qdl CODA device

* tag 'imx-dt-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (24 commits)
  ARM: dts: imx6dl: add imx6dl gpt specific compatible string
  ARM: dts: imx6: add DT for aristainetos2 board
  ARM: dts: cubox-i/hummingboard: Fix the license text
  ARM: dts: sabrelite: use simple-panel instead of display-timings for LVDS0
  ARM: dts: nitrogen6x: use simple-panel instead of display-timings for LVDS0
  ARM: dts: add imx7d-sdb support
  ARM: dts: add imx7d soc dtsi file
  ARM: dts: Armadeus Systems APF6 family support (i.MX6)
  ARM: dts: vf610: Nomenclature fixup for PTC12 pin used in RMII mode.
  ARM: dts: cubox-i: add support for Broadcom Wifi/Bluetooth devices
  Document: dt: binding: imx: update document for imx7d support
  ARM: dts: imx6qdl: Add power-domain phandle to CODA device node
  ARM: dts: Gateworks GW5510 support (i.MX6)
  ARM: dts: imx6sl-warp: Fix OTG roles
  ARM: dts: imx6sl-warp: Remove USB regulators
  ARM: dts: imx6sl-warp: Remove unused regulator
  ARM: dts: add pinfunc include file to support imx7d
  ARM: mxs: fix in tree users of ssd1306
  ARM: dts: imx6qdl-hummingboard: Add PCIe support
  ARM: dts: imx23-olinuxino: Add i2c support
  ...

diff --combined arch/arm/boot/dts/Makefile
index 695fed4e4097cfa7d333f7903c356aac4c991215,cea2db37e26a5feb06ba4a6d0288569754f0701a..8e7698f82148ae9e070aca6fe9869bbdd8411005
--- 1/arch/arm/boot/dts/Makefile
--- 2/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -20,9 -20,9 +20,9 @@@ dtb-$(CONFIG_SOC_SAM_V4_V5) += 
        tny_a9263.dtb \
        usb_a9263.dtb \
        at91-foxg20.dtb \
 +      at91-kizbox.dtb \
        at91sam9g20ek.dtb \
        at91sam9g20ek_2mmc.dtb \
 -      kizbox.dtb \
        tny_a9g20.dtb \
        usb_a9g20.dtb \
        usb_a9g20_lpw.dtb \
@@@ -32,14 -32,12 +32,14 @@@
        at91sam9rlek.dtb \
        at91-ariag25.dtb \
        at91-cosino_mega2560.dtb \
 +      at91-kizboxmini.dtb \
        at91sam9g15ek.dtb \
        at91sam9g25ek.dtb \
        at91sam9g35ek.dtb \
        at91sam9x25ek.dtb \
        at91sam9x35ek.dtb
  dtb-$(CONFIG_SOC_SAM_V7) += \
 +      at91-kizbox2.dtb \
        at91-sama5d3_xplained.dtb \
        sama5d31ek.dtb \
        sama5d33ek.dtb \
@@@ -58,18 -56,13 +58,18 @@@ dtb-$(CONFIG_ARCH_BCM2835) += 
        bcm2835-rpi-b.dtb \
        bcm2835-rpi-b-plus.dtb
  dtb-$(CONFIG_ARCH_BCM_5301X) += \
 +      bcm4708-asus-rt-ac56u.dtb \
 +      bcm4708-asus-rt-ac68u.dtb \
        bcm4708-buffalo-wzr-1750dhp.dtb \
        bcm4708-luxul-xwc-1000.dtb \
        bcm4708-netgear-r6250.dtb \
        bcm4708-netgear-r6300-v2.dtb \
 +      bcm4708-smartrg-sr400ac.dtb \
        bcm47081-asus-rt-n18u.dtb \
        bcm47081-buffalo-wzr-600dhp2.dtb \
        bcm47081-buffalo-wzr-900dhp.dtb \
 +      bcm4709-asus-rt-ac87u.dtb \
 +      bcm4709-buffalo-wxr-1900dhp.dtb \
        bcm4709-netgear-r8000.dtb
  dtb-$(CONFIG_ARCH_BCM_63XX) += \
        bcm963138dvt.dtb
@@@ -208,9 -201,6 +208,9 @@@ dtb-$(CONFIG_MACH_KIRKWOOD) += 
        kirkwood-ts219-6282.dtb \
        kirkwood-ts419-6281.dtb \
        kirkwood-ts419-6282.dtb
 +dtb-$(CONFIG_ARCH_LPC18XX) += \
 +      lpc4350-hitex-eval.dtb \
 +      lpc4357-ea4357-devkit.dtb
  dtb-$(CONFIG_ARCH_LPC32XX) += \
        ea3250.dtb phy3250.dtb
  dtb-$(CONFIG_MACH_MESON6) += \
@@@ -264,14 -254,18 +264,18 @@@ dtb-$(CONFIG_SOC_IMX53) += 
        imx53-tx53-x13x.dtb \
        imx53-voipac-bsb.dtb
  dtb-$(CONFIG_SOC_IMX6Q) += \
+       imx6dl-apf6dev.dtb \
        imx6dl-aristainetos_4.dtb \
        imx6dl-aristainetos_7.dtb \
+       imx6dl-aristainetos2_4.dtb \
+       imx6dl-aristainetos2_7.dtb \
        imx6dl-cubox-i.dtb \
        imx6dl-dfi-fs700-m60.dtb \
        imx6dl-gw51xx.dtb \
        imx6dl-gw52xx.dtb \
        imx6dl-gw53xx.dtb \
        imx6dl-gw54xx.dtb \
+       imx6dl-gw551x.dtb \
        imx6dl-gw552x.dtb \
        imx6dl-hummingboard.dtb \
        imx6dl-nitrogen6x.dtb \
@@@ -287,6 -281,7 +291,7 @@@
        imx6dl-udoo.dtb \
        imx6dl-wandboard.dtb \
        imx6dl-wandboard-revb1.dtb \
+       imx6q-apf6dev.dtb \
        imx6q-arm2.dtb \
        imx6q-cm-fx6.dtb \
        imx6q-cubox-i.dtb \
@@@ -298,6 -293,7 +303,7 @@@
        imx6q-gw53xx.dtb \
        imx6q-gw5400-a.dtb \
        imx6q-gw54xx.dtb \
+       imx6q-gw551x.dtb \
        imx6q-gw552x.dtb \
        imx6q-hummingboard.dtb \
        imx6q-nitrogen6x.dtb \
@@@ -323,13 -319,14 +329,15 @@@ dtb-$(CONFIG_SOC_IMX6SX) += 
        imx6sx-sabreauto.dtb \
        imx6sx-sdb-reva.dtb \
        imx6sx-sdb.dtb
+ dtb-$(CONFIG_SOC_IMX7D) += \
+       imx7d-sdb.dtb
  dtb-$(CONFIG_SOC_LS1021A) += \
        ls1021a-qds.dtb \
        ls1021a-twr.dtb
  dtb-$(CONFIG_SOC_VF610) += \
        vf500-colibri-eval-v3.dtb \
        vf610-colibri-eval-v3.dtb \
 +      vf610m4-colibri.dtb \
        vf610-cosmic.dtb \
        vf610-twr.dtb
  dtb-$(CONFIG_ARCH_MXS) += \
@@@ -371,7 -368,6 +379,7 @@@ dtb-$(CONFIG_ARCH_OMAP3) += 
        am3517-craneboard.dtb \
        am3517-evm.dtb \
        am3517_mt_ventoux.dtb \
 +      logicpd-torpedo-37xx-devkit.dtb \
        omap3430-sdp.dtb \
        omap3-beagle.dtb \
        omap3-beagle-xm.dtb \
@@@ -418,7 -414,6 +426,7 @@@
  dtb-$(CONFIG_SOC_TI81XX) += \
        dm8168-evm.dtb
  dtb-$(CONFIG_SOC_AM33XX) += \
 +      am335x-baltos-ir5221.dtb \
        am335x-base0033.dtb \
        am335x-bone.dtb \
        am335x-boneblack.dtb \
@@@ -509,7 -504,7 +517,7 @@@ dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += 
        sh73a0-kzm9g.dtb
  dtb-$(CONFIG_ARCH_SOCFPGA) += \
        socfpga_arria5_socdk.dtb \
 -      socfpga_arria10_socdk.dtb \
 +      socfpga_arria10_socdk_sdmmc.dtb \
        socfpga_cyclone5_socdk.dtb \
        socfpga_cyclone5_sockit.dtb \
        socfpga_cyclone5_socrates.dtb \
@@@ -533,39 -528,32 +541,39 @@@ dtb-$(CONFIG_ARCH_STI) += 
        stih416-b2020.dtb \
        stih416-b2020e.dtb \
        stih418-b2199.dtb
 +dtb-$(CONFIG_ARCH_STM32)+= stm32f429-disco.dtb
  dtb-$(CONFIG_MACH_SUN4I) += \
        sun4i-a10-a1000.dtb \
        sun4i-a10-ba10-tvbox.dtb \
        sun4i-a10-chuwi-v7-cw0825.dtb \
        sun4i-a10-cubieboard.dtb \
 +      sun4i-a10-gemei-g9.dtb \
 +      sun4i-a10-hackberry.dtb \
 +      sun4i-a10-hyundai-a7hd.dtb \
 +      sun4i-a10-inet97fv2.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-hackberry.dtb \
 -      sun4i-a10-hyundai-a7hd.dtb \
 -      sun4i-a10-inet97fv2.dtb \
        sun4i-a10-olinuxino-lime.dtb \
        sun4i-a10-pcduino.dtb
  dtb-$(CONFIG_MACH_SUN5I) += \
 +      sun5i-a10s-auxtek-t004.dtb \
        sun5i-a10s-mk802.dtb \
        sun5i-a10s-olinuxino-micro.dtb \
        sun5i-a10s-r7-tv-dongle.dtb \
        sun5i-a13-hsg-h702.dtb \
        sun5i-a13-olinuxino.dtb \
 -      sun5i-a13-olinuxino-micro.dtb
 +      sun5i-a13-olinuxino-micro.dtb \
 +      sun5i-a13-utoo-p66.dtb
  dtb-$(CONFIG_MACH_SUN6I) += \
        sun6i-a31-app4-evb1.dtb \
        sun6i-a31-colombus.dtb \
        sun6i-a31-hummingbird.dtb \
 +      sun6i-a31-i7.dtb \
        sun6i-a31-m9.dtb \
 +      sun6i-a31-mele-a1000g-quad.dtb \
        sun6i-a31s-cs908.dtb
  dtb-$(CONFIG_MACH_SUN7I) += \
        sun7i-a20-bananapi.dtb \
@@@ -575,25 -563,15 +583,25 @@@
        sun7i-a20-hummingbird.dtb \
        sun7i-a20-i12-tvbox.dtb \
        sun7i-a20-m3.dtb \
 +      sun7i-a20-mk808c.dtb \
        sun7i-a20-olinuxino-lime.dtb \
        sun7i-a20-olinuxino-lime2.dtb \
        sun7i-a20-olinuxino-micro.dtb \
 -      sun7i-a20-pcduino3.dtb
 +      sun7i-a20-orangepi.dtb \
 +      sun7i-a20-orangepi-mini.dtb \
 +      sun7i-a20-pcduino3.dtb \
 +      sun7i-a20-pcduino3-nano.dtb \
 +      sun7i-a20-wexler-tab7200.dtb
  dtb-$(CONFIG_MACH_SUN8I) += \
 +      sun8i-a23-evb.dtb \
        sun8i-a23-ippo-q8h-v5.dtb \
 -      sun8i-a23-ippo-q8h-v1.2.dtb
 +      sun8i-a23-ippo-q8h-v1.2.dtb \
 +      sun8i-a33-et-q8-v1.6.dtb \
 +      sun8i-a33-ga10h-v1.1.dtb \
 +      sun8i-a33-sinlinx-sina33.dtb
  dtb-$(CONFIG_MACH_SUN9I) += \
 -      sun9i-a80-optimus.dtb
 +      sun9i-a80-optimus.dtb \
 +      sun9i-a80-cubieboard4.dtb
  dtb-$(CONFIG_ARCH_TEGRA_2x_SOC) += \
        tegra20-harmony.dtb \
        tegra20-iris-512.dtb \
@@@ -630,11 -608,6 +638,11 @@@ dtb-$(CONFIG_ARCH_U8500) += 
        ste-hrefv60plus-tvk.dtb \
        ste-ccu8540.dtb \
        ste-ccu9540.dtb
 +dtb-$(CONFIG_ARCH_UNIPHIER) += \
 +      uniphier-ph1-sld3-ref.dtb \
 +      uniphier-ph1-ld4-ref.dtb \
 +      uniphier-ph1-pro4-ref.dtb \
 +      uniphier-ph1-sld8-ref.dtb
  dtb-$(CONFIG_ARCH_VERSATILE) += \
        versatile-ab.dtb \
        versatile-pb.dtb
@@@ -659,7 -632,6 +667,7 @@@ dtb-$(CONFIG_ARCH_ZYNQ) += 
        zynq-zybo.dtb
  dtb-$(CONFIG_MACH_ARMADA_370) += \
        armada-370-db.dtb \
 +      armada-370-dlink-dns327l.dtb \
        armada-370-mirabox.dtb \
        armada-370-netgear-rn102.dtb \
        armada-370-netgear-rn104.dtb \
@@@ -669,8 -641,6 +677,8 @@@ dtb-$(CONFIG_MACH_ARMADA_375) += 
        armada-375-db.dtb
  dtb-$(CONFIG_MACH_ARMADA_38X) += \
        armada-385-db-ap.dtb \
 +      armada-385-linksys-caiman.dtb \
 +      armada-385-linksys-cobra.dtb \
        armada-388-db.dtb \
        armada-388-gp.dtb \
        armada-388-rd.dtb
@@@ -687,12 -657,12 +695,12 @@@ dtb-$(CONFIG_MACH_ARMADA_XP) += 
        armada-xp-openblocks-ax3-4.dtb \
        armada-xp-synology-ds414.dtb
  dtb-$(CONFIG_MACH_DOVE) += \
 -      dove-cm-a510.dtb \
        dove-cubox.dtb \
        dove-cubox-es.dtb \
        dove-d2plug.dtb \
        dove-d3plug.dtb \
 -      dove-dove-db.dtb
 +      dove-dove-db.dtb \
 +      dove-sbc-a510.dtb
  dtb-$(CONFIG_ARCH_MEDIATEK) += \
        mt6589-aquaris5.dtb \
        mt6592-evb.dtb \

diff --combined arch/arm/boot/dts/imx23-olinuxino.dts
index 82045398bf1fabdf47664290d636d78a38b23b14,85718df1488c6dfeb4c3098a5e9da4ec3f2a2044..a8b1c53ebe460788da8720a0f217a498d01432f8
--- 1/arch/arm/boot/dts/imx23-olinuxino.dts
--- 2/arch/arm/boot/dts/imx23-olinuxino.dts
+++ b/arch/arm/boot/dts/imx23-olinuxino.dts
@@@ -12,7 -12,6 +12,7 @@@
   */
  
  /dts-v1/;
 +#include <dt-bindings/gpio/gpio.h>
  #include "imx23.dtsi"
  
  / {
@@@ -74,6 -73,12 +74,12 @@@
                                status = "okay";
                        };
  
+                       i2c: i2c@80058000 {
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&i2c_pins_b>;
+                               status = "okay";
+                       };
+ 
                        duart: serial@80070000 {
                                pinctrl-names = "default";
                                pinctrl-0 = <&duart_pins_a>;
@@@ -94,7 -99,6 +100,7 @@@
  
        ahb@80080000 {
                usb0: usb@80080000 {
 +                      dr_mode = "host";
                        vbus-supply = <&reg_usb0_vbus>;
                        status = "okay";
                };
@@@ -124,7 -128,7 +130,7 @@@
  
                user {
                        label = "green";
 -                      gpios = <&gpio2 1 1>;
 +                      gpios = <&gpio2 1 GPIO_ACTIVE_HIGH>;
                };
        };
  };