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

Merge "Samsung 3rd DT updates for v3.16" from Kukjin Kim:

- add dts files support for new SoCs
  : exynos3250 SoC
  : exynos5260 SoC and exynos5260-xyref5260 board
  : exynos5410 SoC and exynos5410-smdk5410 board
  : exynos5800 SoC and exynos5800-peach-pi board

- exynos4210-origen and exynos4412-origen
  : enable RTC and WDT nodes
  : use key code macros

- exynos5250-arndale
  : use key code macros

- exynos5420-arndale-octa
  : add secure firmware support

- exynos5440
  : update watchdog node name

* tag 'samsung-dt-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: dts: add secure firmware support for exynos5420-arndale-octa
  ARM: dts: add pmu sysreg node to exynos3250
  ARM: dts: correct the usb phy node in exynos5800-peach-pi
  ARM: dts: correct the usb phy node in exynos5420-peach-pit
  ARM: dts: add dts files for exynos5410 and exynos5410-smdk5410
  ARM: dts: add dts files for exynos3250 SoC
  ARM: dts: add mfc node for exynos5800
  ARM: dts: add Vbus regulator for USB 3.0 on exynos5800-peach-pi
  ARM: dts: enable fimd for exynos5800-peach-pi
  ARM: dts: enable display controller for exynos5800-peach-pi
  ARM: dts: enable hdmi for exynos5800-peach-pi
  ARM: dts: add dts file for exynos5800-peach-pi board
  ARM: dts: add dts file for exynos5800 SoC
  ARM: dts: add dts file for exynos5260-xyref5260 board
  ARM: dts: add dts files for exynos5260 SoC
  ARM: dts: update watchdog node name in exynos5440
  ARM: dts: use key code macros on Origen and Arndale boards
  ARM: dts: enable RTC and WDT nodes on Origen boards

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

diff --combined arch/arm/boot/dts/Makefile
index 33409a3895b5dca959b4cbf5e033029b4469f47b,78ba9d0f4a9e9534127a90b21e540e5e5f28ce80..cbe223c882d9efb71996c15a66641cb97406ac62
--- 1/arch/arm/boot/dts/Makefile
--- 2/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -51,13 -51,13 +51,13 @@@ 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_5301X) += bcm4708-netgear-r6250.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
 +      berlin2cd-google-chromecast.dtb \
 +      berlin2q-marvell-dmp.dtb
  dtb-$(CONFIG_ARCH_DAVINCI) += da850-enbw-cmc.dtb \
        da850-evm.dtb
  dtb-$(CONFIG_ARCH_EFM32) += efm32gg-dk3750.dtb
@@@ -73,11 -73,14 +73,14 @@@ dtb-$(CONFIG_ARCH_EXYNOS) += exynos4210
        exynos5250-arndale.dtb \
        exynos5250-smdk5250.dtb \
        exynos5250-snow.dtb \
+       exynos5260-xyref5260.dtb \
+       exynos5410-smdk5410.dtb \
        exynos5420-arndale-octa.dtb \
        exynos5420-peach-pit.dtb \
        exynos5420-smdk5420.dtb \
        exynos5440-sd5v1.dtb \
-       exynos5440-ssdk5440.dtb
+       exynos5440-ssdk5440.dtb \
+       exynos5800-peach-pi.dtb
  dtb-$(CONFIG_ARCH_HI3xxx) += hi3620-hi4511.dtb
  dtb-$(CONFIG_ARCH_HIGHBANK) += highbank.dtb \
        ecx-2000.dtb
@@@ -129,9 -132,6 +132,9 @@@ kirkwood := 
        kirkwood-nsa310a.dtb \
        kirkwood-openblocks_a6.dtb \
        kirkwood-openblocks_a7.dtb \
 +      kirkwood-openrd-base.dtb \
 +      kirkwood-openrd-client.dtb \
 +      kirkwood-openrd-ultimate.dtb \
        kirkwood-rd88f6192.dtb \
        kirkwood-rd88f6281-a0.dtb \
        kirkwood-rd88f6281-a1.dtb \
@@@ -162,12 -162,10 +165,12 @@@ dtb-$(CONFIG_ARCH_MXC) += 
        imx27-phytec-phycard-s-rdk.dtb \
        imx31-bug.dtb \
        imx35-eukrea-mbimxsd35-baseboard.dtb \
 +      imx35-pdk.dtb \
        imx50-evk.dtb \
        imx51-apf51.dtb \
        imx51-apf51dev.dtb \
        imx51-babbage.dtb \
 +      imx51-digi-connectcore-jsk.dtb \
        imx51-eukrea-mbimxsd51-baseboard.dtb \
        imx53-ard.dtb \
        imx53-m53evk.dtb \
@@@ -186,8 -184,6 +189,8 @@@
        imx6dl-gw54xx.dtb \
        imx6dl-hummingboard.dtb \
        imx6dl-nitrogen6x.dtb \
 +      imx6dl-phytec-pbab01.dtb \
 +      imx6dl-riotboard.dtb \
        imx6dl-sabreauto.dtb \
        imx6dl-sabrelite.dtb \
        imx6dl-sabresd.dtb \
@@@ -212,7 -208,6 +215,7 @@@
        imx6q-udoo.dtb \
        imx6q-wandboard.dtb \
        imx6sl-evk.dtb \
 +      vf610-colibri.dtb \
        vf610-cosmic.dtb \
        vf610-twr.dtb
  dtb-$(CONFIG_ARCH_MXS) += imx23-evk.dtb \
@@@ -240,80 -235,76 +243,80 @@@ dtb-$(CONFIG_ARCH_NOMADIK) += ste-nomad
  dtb-$(CONFIG_ARCH_NSPIRE) += nspire-cx.dtb \
        nspire-tp.dtb \
        nspire-clp.dtb
 -dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \
 -      omap2430-sdp.dtb \
 +dtb-$(CONFIG_ARCH_OMAP2) += omap2420-h4.dtb \
        omap2420-n800.dtb \
        omap2420-n810.dtb \
        omap2420-n810-wimax.dtb \
 +      omap2430-sdp.dtb
 +dtb-$(CONFIG_ARCH_OMAP3) += am3517-craneboard.dtb \
 +      am3517-evm.dtb \
 +      am3517_mt_ventoux.dtb \
        omap3430-sdp.dtb \
        omap3-beagle.dtb \
 +      omap3-beagle-xm.dtb \
 +      omap3-beagle-xm-ab.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 \
 -      omap3-beagle-xm.dtb \
        omap3-evm.dtb \
        omap3-evm-37xx.dtb \
 +      omap3-gta04.dtb \
 +      omap3-igep0020.dtb \
 +      omap3-igep0030.dtb \
        omap3-ldp.dtb \
 +      omap3-lilly-dbb056.dtb \
        omap3-n900.dtb \
        omap3-n9.dtb \
        omap3-n950.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-alto35.dtb \
 +      omap3-overo-storm-chestnut43.dtb \
 +      omap3-overo-storm-gallop43.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 \
 +      omap3-overo-summit.dtb \
 +      omap3-overo-tobi.dtb \
 +      omap3-sbc-t3517.dtb \
 +      omap3-sbc-t3530.dtb \
 +      omap3-sbc-t3730.dtb \
 +      omap3-zoom3.dtb
 +dtb-$(CONFIG_SOC_AM33XX) += am335x-base0033.dtb \
 +      am335x-bone.dtb \
 +      am335x-boneblack.dtb \
 +      am335x-evm.dtb \
 +      am335x-evmsk.dtb \
 +      am335x-nano.dtb
 +dtb-$(CONFIG_ARCH_OMAP4) += omap4-duovero-parlor.dtb \
        omap4-panda.dtb \
        omap4-panda-a4.dtb \
        omap4-panda-es.dtb \
 -      omap4-var-som.dtb \
        omap4-sdp.dtb \
        omap4-sdp-es23plus.dtb \
 -      omap5-uevm.dtb \
 -      am335x-evm.dtb \
 -      am335x-evmsk.dtb \
 -      am335x-bone.dtb \
 -      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
 +      omap4-var-dvk-om44.dtb \
 +      omap4-var-stk-om44.dtb
 +dtb-$(CONFIG_SOC_AM43XX) += am43x-epos-evm.dtb \
 +      am437x-gp-evm.dtb
 +dtb-$(CONFIG_SOC_OMAP5) += omap5-cm-t54.dtb \
 +      omap5-sbc-t54.dtb \
 +      omap5-uevm.dtb
 +dtb-$(CONFIG_SOC_DRA7XX) += dra7-evm.dtb \
 +      dra72-evm.dtb
 +dtb-$(CONFIG_ARCH_ORION5X) += orion5x-lacie-d2-network.dtb \
 +      orion5x-lacie-ethernet-disk-mini-v2.dtb \
 +      orion5x-maxtor-shared-storage-2.dtb \
 +      orion5x-rd88f5182-nas.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 \
 -      ste-hrefv60plus-stuib.dtb \
 -      ste-hrefv60plus-tvk.dtb \
 -      ste-ccu8540.dtb \
 -      ste-ccu9540.dtb
 +dtb-$(CONFIG_ARCH_QCOM) += \
 +      qcom-apq8064-ifc6410.dtb \
 +      qcom-apq8074-dragonboard.dtb \
 +      qcom-apq8084-mtp.dtb \
 +      qcom-msm8660-surf.dtb \
 +      qcom-msm8960-cdp.dtb
  dtb-$(CONFIG_ARCH_S3C24XX) += s3c2416-smdk2416.dtb
  dtb-$(CONFIG_ARCH_S3C64XX) += s3c6410-mini6410.dtb \
        s3c6410-smdk6410.dtb
@@@ -335,13 -326,11 +338,13 @@@ dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += e
        sh7372-mackerel.dtb
  dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += emev2-kzm9d.dtb \
        r7s72100-genmai-reference.dtb \
 +      r8a7791-henninger.dtb \
        r8a7791-koelsch.dtb \
        r8a7790-lager.dtb
  dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_arria5_socdk.dtb \
        socfpga_cyclone5_socdk.dtb \
        socfpga_cyclone5_sockit.dtb \
 +      socfpga_cyclone5_socrates.dtb \
        socfpga_vt.dtb
  dtb-$(CONFIG_ARCH_SPEAR13XX) += spear1310-evb.dtb \
        spear1340-evb.dtb
@@@ -350,33 -339,24 +353,33 @@@ dtb-$(CONFIG_ARCH_SPEAR3XX)+= spear300-
        spear320-evb.dtb \
        spear320-hmi.dtb
  dtb-$(CONFIG_ARCH_SPEAR6XX)+= spear600-evb.dtb
 -dtb-$(CONFIG_ARCH_STI)+= stih415-b2000.dtb \
 -      stih416-b2000.dtb \
 +dtb-$(CONFIG_ARCH_STI)+= stih407-b2120.dtb \
 +      stih415-b2000.dtb \
        stih415-b2020.dtb \
 -      stih416-b2020.dtb
 -dtb-$(CONFIG_ARCH_SUNXI) += \
 +      stih416-b2000.dtb \
 +      stih416-b2020.dtb \
 +      stih416-b2020-revE.dtb
 +dtb-$(CONFIG_MACH_SUN4I) += \
        sun4i-a10-a1000.dtb \
        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 \
 +      sun4i-a10-pcduino.dtb
 +dtb-$(CONFIG_MACH_SUN5I) += \
        sun5i-a10s-olinuxino-micro.dtb \
 +      sun5i-a10s-r7-tv-dongle.dtb \
        sun5i-a13-olinuxino.dtb \
 -      sun5i-a13-olinuxino-micro.dtb \
 +      sun5i-a13-olinuxino-micro.dtb
 +dtb-$(CONFIG_MACH_SUN6I) += \
 +      sun6i-a31-app4-evb1.dtb \
        sun6i-a31-colombus.dtb \
 +      sun6i-a31-m9.dtb
 +dtb-$(CONFIG_MACH_SUN7I) += \
        sun7i-a20-cubieboard2.dtb \
        sun7i-a20-cubietruck.dtb \
 +      sun7i-a20-i12-tvbox.dtb \
        sun7i-a20-olinuxino-micro.dtb
  dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \
        tegra20-iris-512.dtb \
@@@ -391,22 -371,11 +394,22 @@@
        tegra30-beaver.dtb \
        tegra30-cardhu-a02.dtb \
        tegra30-cardhu-a04.dtb \
 +      tegra30-colibri-eval-v3.dtb \
        tegra114-dalmore.dtb \
 +      tegra114-roth.dtb \
 +      tegra114-tn7.dtb \
 +      tegra124-jetson-tk1.dtb \
        tegra124-venice2.dtb
 +dtb-$(CONFIG_ARCH_U300) += ste-u300.dtb
 +dtb-$(CONFIG_ARCH_U8500) += ste-snowball.dtb \
 +      ste-hrefprev60-stuib.dtb \
 +      ste-hrefprev60-tvk.dtb \
 +      ste-hrefv60plus-stuib.dtb \
 +      ste-hrefv60plus-tvk.dtb \
 +      ste-ccu8540.dtb \
 +      ste-ccu9540.dtb
  dtb-$(CONFIG_ARCH_VERSATILE) += versatile-ab.dtb \
        versatile-pb.dtb
 -dtb-$(CONFIG_ARCH_U300) += ste-u300.dtb
  dtb-$(CONFIG_ARCH_VEXPRESS) += vexpress-v2p-ca5s.dtb \
        vexpress-v2p-ca9.dtb \
        vexpress-v2p-ca15-tc1.dtb \

diff --combined arch/arm/boot/dts/exynos5420-arndale-octa.dts
index 6ee8149fd5c4940c27c5ac74903ee5e964014822,f623b849272d1553e90419884155bf844c3cd06a..434fd9d3e09dc12f7065a9f96c45c896fd9f0158
--- 1/arch/arm/boot/dts/exynos5420-arndale-octa.dts
--- 2/arch/arm/boot/dts/exynos5420-arndale-octa.dts
+++ b/arch/arm/boot/dts/exynos5420-arndale-octa.dts
@@@ -26,6 -26,11 +26,11 @@@
                bootargs = "console=ttySAC3,115200";
        };
  
+       firmware@02073000 {
+               compatible = "samsung,secure-firmware";
+               reg = <0x02073000 0x1000>;
+       };
+ 
        fixed-rate-clocks {
                oscclk {
                        compatible = "samsung,exynos5420-oscclk";
@@@ -369,4 -374,16 +374,4 @@@
                        gpio-key,wakeup;
                };
        };
 -
 -      amba {
 -              mdma1: mdma@11C10000 {
 -                      /*
 -                       * MDMA1 can support both secure and non-secure
 -                       * AXI transactions. When this is enabled in the kernel
 -                       * for boards that run in secure mode, we are getting
 -                       * imprecise external aborts causing the kernel to oops.
 -                       */
 -                      status = "disabled";
 -              };
 -      };
  };