Merge tag 'samsung-dt-4' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux...

Samsung another DT udpates for v4.2

- use labels for overriding nodes for all of exynos stuff
  (by Krzysztof Kozlowski)

- add sysmmu nodes for exynos SoCs (by Marek Szyprowski)

- for exynos5422-odroidxu3
  : enalbe wake alarm of S2MPS11 RTC
  : Hook up PWM and use it for LEDs
  : add support for Odroid XU3 Lite

- remove duplicated i2c7 for exynos5250-snow
- add JPEG codec nodes for exynos5420
- add vendor prefix for Hardkernel

* tag 'samsung-dt-4' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: (33 commits)
  ARM: dts: add sysmmu nodes for exynos5420
  ARM: dts: add sysmmu nodes for exynos5250
  ARM: dts: add sysmmu nodes for exynos4415
  ARM: dts: add sysmmu nodes for exynos3250
  ARM: dts: add sysmmu nodes for exynos4
  ARM: dts: Add Odroid XU3 Lite support
  of: Add vendor prefix for Hardkernel
  ARM: dts: odroidxu3: Enable wake alarm of S2MPS11 RTC
  ARM: dts: exynos5420: add nodes for jpeg codec
  ARM: dts: s3c2416: Use labels for overriding nodes in SMDK2416
  ARM: dts: s3c2416: Add labels to S3C2416 nodes
  ARM: dts: Use labels for overriding nodes in exynos5422-odroidxu3
  ARM: dts: Use labels for overriding nodes in exynos5440 boards
  ARM: dts: Use labels for overriding nodes in exynos5420-smdk5420
  ARM: dts: Use labels for overriding nodes in exynos542x
  ARM: dts: Use labels for overriding nodes in exynos5420-arndale-octa
  ARM: dts: Remove duplicated I2C7 nodes in exynos5250-snow
  ARM: dts: Use labels for overriding nodes in exynos5250
  ARM: dts: Add labels to exynos5 nodes
  ARM: dts: exynos5422-odroidxu3: Hook up PWM and use it for LEDs
  ...

diff --combined Documentation/devicetree/bindings/vendor-prefixes.txt
index d55b4e9a9dce9b2dd2639a3ee7859092376df68c,e8a00b74d8fef8acbc1ca7067b50e51c7b97340b..11e4bdb07b6d5fb48455adbbc4829976ad4c60a8
--- 1/Documentation/devicetree/bindings/vendor-prefixes.txt
--- 2/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -40,7 -40,6 +40,7 @@@ calxeda       Calxed
  capella       Capella Microsystems, Inc
  cavium        Cavium, Inc.
  cdns  Cadence Design Systems Inc.
 +ceva  Ceva, Inc.
  chipidea      Chipidea, Inc
  chipone               ChipOne
  chipspark     ChipSPARK
@@@ -53,7 -52,6 +53,7 @@@ cnxt  Conexant Systems, Inc
  cortina       Cortina Systems, Inc.
  cosmic        Cosmic Circuits
  crystalfontz  Crystalfontz America, Inc.
 +cubietech     Cubietech, Ltd.
  dallas        Maxim Integrated Products (formerly Dallas Semiconductor)
  davicom       DAVICOM Semiconductor, Inc.
  denx  Denx Software Engineering
@@@ -62,7 -60,6 +62,7 @@@ digilent      Diglent, Inc
  dlg   Dialog Semiconductor
  dlink D-Link Corporation
  dmo   Data Modul AG
 +ea    Embedded Artists AB
  ebv   EBV Elektronik
  edt   Emerging Display Technologies
  elan  Elan Microelectronic Corp.
@@@ -93,10 -90,10 +93,11 @@@ gumstix    Gumstix, Inc
  gw    Gateworks Corporation
  hannstar      HannStar Display Corporation
  haoyu Haoyu Microelectronic Co. Ltd.
+ hardkernel    Hardkernel Co., Ltd
  himax Himax Technologies, Inc.
  hisilicon     Hisilicon Limited.
  hit   Hitachi Ltd.
 +hitex Hitex Development Tools
  honeywell     Honeywell
  hp    Hewlett Packard
  i2se  I2SE GmbH
@@@ -163,7 -160,6 +164,7 @@@ radxa      Radx
  raidsonic     RaidSonic Technology GmbH
  ralink        Mediatek/Ralink Technology Corp.
  ramtron       Ramtron International
 +raspberrypi   Raspberry Pi Foundation
  realtek Realtek Semiconductor Corp.
  renesas       Renesas Electronics Corporation
  ricoh Ricoh Co. Ltd.
@@@ -207,7 -203,6 +208,7 @@@ variscite  Variscite Ltd
  via   VIA Technologies, Inc.
  virtio        Virtual I/O Device Specification, developed by the OASIS consortium
  voipac        Voipac Technologies s.r.o.
 +wexler        Wexler
  winbond Winbond Electronics corp.
  wlf   Wolfson Microelectronics
  wm    Wondermedia Technologies, Inc.

diff --combined arch/arm/boot/dts/Makefile
index 2b74e9519615112dfff396437b245d45caf0dea8,a0fa23d3aec55ebceb283b379eda471416d17bb8..8a775843799cb58fe22addf96ec1b25384f88e02
--- 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 \
@@@ -31,16 -31,13 +31,16 @@@
        at91sam9n12ek.dtb \
        at91sam9rlek.dtb \
        at91-ariag25.dtb \
 +      at91-ariettag25.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 \
@@@ -59,18 -56,13 +59,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
@@@ -121,6 -113,7 +121,7 @@@ dtb-$(CONFIG_ARCH_EXYNOS5) += 
        exynos5420-peach-pit.dtb \
        exynos5420-smdk5420.dtb \
        exynos5422-odroidxu3.dtb \
+       exynos5422-odroidxu3-lite.dtb \
        exynos5440-sd5v1.dtb \
        exynos5440-ssdk5440.dtb \
        exynos5800-peach-pi.dtb
@@@ -209,9 -202,6 +210,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) += \
@@@ -265,18 -255,14 +266,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 \
@@@ -292,7 -278,6 +293,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 \
@@@ -304,7 -289,6 +305,7 @@@
        imx6q-gw53xx.dtb \
        imx6q-gw5400-a.dtb \
        imx6q-gw54xx.dtb \
 +      imx6q-gw551x.dtb \
        imx6q-gw552x.dtb \
        imx6q-hummingboard.dtb \
        imx6q-nitrogen6x.dtb \
@@@ -330,15 -314,12 +331,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) += \
@@@ -380,7 -361,6 +381,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 \
@@@ -427,7 -407,6 +428,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 \
@@@ -518,7 -497,7 +519,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 \
@@@ -542,39 -521,32 +543,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 \
@@@ -584,25 -556,15 +585,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 \
@@@ -639,11 -601,6 +640,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
@@@ -668,7 -625,6 +669,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 \
@@@ -678,8 -634,6 +679,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
@@@ -696,12 -650,12 +697,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 \