Merge tag 'keystone_dts_for_4.7' of git://git.kernel.org/pub/scm/linux/kernel/git...

Merge "ARM: Keystone DTS for 4.7" from Santosh Shilimkar:

- Remainder k2-* rename to keystone-*
- PSCI node info
- SPI alias nodes for bootloaders

* tag 'keystone_dts_for_4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone:
  ARM: keystone: dts: add psci command definition
  ARM: dts: keystone: Add aliases for SPI nodes
  ARM: dts: k2*: Rename the k2* files to keystone-k2* files

diff --combined MAINTAINERS
index 61a323a6b2cfe7348c63f49eadcd858100dc8a03,b618aa92eeed2c162005b92f4bd0827b83e2fc9e..efa0d392f5e7c0a6bd6db32a923686773eb0b3cc
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1260,7 -1260,7 +1260,7 @@@ M:      Santosh Shilimkar <[email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/mach-keystone/
- F:    arch/arm/boot/dts/k2*
+ F:    arch/arm/boot/dts/keystone-*
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git
  
  ARM/TEXAS INSTRUMENT KEYSTONE CLOCK FRAMEWORK
@@@ -4302,7 -4302,7 +4302,7 @@@ F:      drivers/net/ethernet/agere
  
  ETHERNET BRIDGE
  M:    Stephen Hemminger <[email protected]>
 -L:    [email protected]
 +L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
  W:    http://www.linuxfoundation.org/en/Net:Bridge
  S:    Maintained
@@@ -5042,7 -5042,6 +5042,7 @@@ F:      include/linux/hw_random.
  HARDWARE SPINLOCK CORE
  M:    Ohad Ben-Cohen <[email protected]>
  M:    Bjorn Andersson <[email protected]>
 +L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock.git
  F:    Documentation/hwspinlock.txt
@@@ -5751,7 -5750,7 +5751,7 @@@ R:      Don Skidmore <donald.c.skidmore@inte
  R:    Bruce Allan <[email protected]>
  R:    John Ronciak <[email protected]>
  R:    Mitch Williams <[email protected]>
 -L:    [email protected]
 +L:    [email protected] (moderated for non-subscribers)
  W:    http://www.intel.com/support/feedback.htm
  W:    http://e1000.sourceforge.net/
  Q:    http://patchwork.ozlabs.org/project/intel-wired-lan/list/
@@@ -6403,7 -6402,7 +6403,7 @@@ KPROBE
  M:    Ananth N Mavinakayanahalli <[email protected]>
  M:    Anil S Keshavamurthy <[email protected]>
  M:    "David S. Miller" <[email protected]>
 -M:    Masami Hiramatsu <m[email protected]>
 +M:    Masami Hiramatsu <m[email protected]>
  S:    Maintained
  F:    Documentation/kprobes.txt
  F:    include/linux/kprobes.h
@@@ -7576,7 -7575,7 +7576,7 @@@ F:      drivers/infiniband/hw/nes
  
  NETEM NETWORK EMULATOR
  M:    Stephen Hemminger <[email protected]>
 -L:    [email protected]
 +L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    net/sched/sch_netem.c
  
@@@ -8254,7 -8253,7 +8254,7 @@@ F:      Documentation/filesystems/overlayfs.
  
  ORANGEFS FILESYSTEM
  M:    Mike Marshall <[email protected]>
 -L:    [email protected]
 +L:    [email protected] (subscribers-only)
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux.git
  S:    Supported
  F:    fs/orangefs/
@@@ -8712,8 -8711,6 +8712,8 @@@ F:      drivers/pinctrl/sh-pfc
  
  PIN CONTROLLER - SAMSUNG
  M:    Tomasz Figa <[email protected]>
 +M:    Krzysztof Kozlowski <[email protected]>
 +M:    Sylwester Nawrocki <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
@@@ -9142,13 -9139,6 +9142,13 @@@ T:    git git://github.com/KrasnikovEugene
  S:    Supported
  F:    drivers/net/wireless/ath/wcn36xx/
  
 +QEMU MACHINE EMULATOR AND VIRTUALIZER SUPPORT
 +M:    Gabriel Somlo <[email protected]>
 +M:    "Michael S. Tsirkin" <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/firmware/qemu_fw_cfg.c
 +
  RADOS BLOCK DEVICE (RBD)
  M:    Ilya Dryomov <[email protected]>
  M:    Sage Weil <[email protected]>
@@@ -9324,7 -9314,6 +9324,7 @@@ F:      include/linux/regmap.
  REMOTE PROCESSOR (REMOTEPROC) SUBSYSTEM
  M:    Ohad Ben-Cohen <[email protected]>
  M:    Bjorn Andersson <[email protected]>
 +L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc.git
  S:    Maintained
  F:    drivers/remoteproc/
@@@ -9334,7 -9323,6 +9334,7 @@@ F:      include/linux/remoteproc.
  REMOTE PROCESSOR MESSAGING (RPMSG) SUBSYSTEM
  M:    Ohad Ben-Cohen <[email protected]>
  M:    Bjorn Andersson <[email protected]>
 +L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/rpmsg.git
  S:    Maintained
  F:    drivers/rpmsg/
@@@ -10595,14 -10583,6 +10595,14 @@@ L: [email protected]
  S:    Maintained
  F:    drivers/staging/nvec/
  
 +STAGING - OLPC SECONDARY DISPLAY CONTROLLER (DCON)
 +M:    Jens Frederich <[email protected]>
 +M:    Daniel Drake <[email protected]>
 +M:    Jon Nettleton <[email protected]>
 +W:    http://wiki.laptop.org/go/DCON
 +S:    Maintained
 +F:    drivers/staging/olpc_dcon/
 +
  STAGING - REALTEK RTL8712U DRIVERS
  M:    Larry Finger <[email protected]>
  M:    Florian Schilhabel <[email protected]>.
@@@ -11157,8 -11137,8 +11157,8 @@@ F:   include/uapi/linux/tipc*.
  F:    net/tipc/
  
  TILE ARCHITECTURE
 -M:    Chris Metcalf <cmetcalf@ezchip.com>
 -W:    http://www.ezchip.com/scm/
 +M:    Chris Metcalf <cmetcalf@mellanox.com>
 +W:    http://www.mellanox.com/repository/solutions/tile-scm/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile.git
  S:    Supported
  F:    arch/tile/
@@@ -12222,9 -12202,9 +12222,9 @@@ S:   Maintaine
  F:    drivers/media/tuners/tuner-xc2028.*
  
  XEN HYPERVISOR INTERFACE
 -M:    Konrad Rzeszutek Wilk <[email protected]>
  M:    Boris Ostrovsky <[email protected]>
  M:    David Vrabel <[email protected]>
 +M:    Juergen Gross <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git
  S:    Supported
@@@ -12236,16 -12216,16 +12236,16 @@@ F:        include/xen
  F:    include/uapi/xen/
  
  XEN HYPERVISOR ARM
 -M:    Stefano Stabellini <s[email protected]>
 +M:    Stefano Stabellini <s[email protected]>
  L:    [email protected] (moderated for non-subscribers)
 -S:    Supported
 +S:    Maintained
  F:    arch/arm/xen/
  F:    arch/arm/include/asm/xen/
  
  XEN HYPERVISOR ARM64
 -M:    Stefano Stabellini <s[email protected]>
 +M:    Stefano Stabellini <s[email protected]>
  L:    [email protected] (moderated for non-subscribers)
 -S:    Supported
 +S:    Maintained
  F:    arch/arm64/xen/
  F:    arch/arm64/include/asm/xen/
  

diff --combined arch/arm/boot/dts/Makefile
index b40b1c5b40f435cb4b56c2f2a3fb59223f67435a,b25621ae2ff74b596e5229b36e0bbd11feee4b27..f57199f40e196e7be22fd14ac3055b0dda06ef37
--- 1/arch/arm/boot/dts/Makefile
--- 2/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -112,7 -112,6 +112,7 @@@ dtb-$(CONFIG_ARCH_DIGICOLOR) += 
  dtb-$(CONFIG_ARCH_EFM32) += \
        efm32gg-dk3750.dtb
  dtb-$(CONFIG_ARCH_EXYNOS3) += \
 +      exynos3250-artik5-eval.dtb \
        exynos3250-monk.dtb \
        exynos3250-rinato.dtb
  dtb-$(CONFIG_ARCH_EXYNOS4) += \
@@@ -159,9 -158,9 +159,9 @@@ dtb-$(CONFIG_ARCH_INTEGRATOR) += 
        integratorap.dtb \
        integratorcp.dtb
  dtb-$(CONFIG_ARCH_KEYSTONE) += \
-       k2hk-evm.dtb \
-       k2l-evm.dtb \
-       k2e-evm.dtb \
+       keystone-k2hk-evm.dtb \
+       keystone-k2l-evm.dtb \
+       keystone-k2e-evm.dtb \
        keystone-k2g-evm.dtb
  dtb-$(CONFIG_MACH_KIRKWOOD) += \
        kirkwood-b3.dtb \
@@@ -178,7 -177,6 +178,7 @@@
        kirkwood-ds109.dtb \
        kirkwood-ds110jv10.dtb \
        kirkwood-ds111.dtb \
 +      kirkwood-ds112.dtb \
        kirkwood-ds209.dtb \
        kirkwood-ds210.dtb \
        kirkwood-ds212.dtb \
@@@ -201,7 -199,6 +201,7 @@@
        kirkwood-linkstation-lswsxl.dtb \
        kirkwood-linkstation-lswvl.dtb \
        kirkwood-linkstation-lswxl.dtb \
 +      kirkwood-linksys-viper.dtb \
        kirkwood-lschlv2.dtb \
        kirkwood-lsxhl.dtb \
        kirkwood-mplcec4.dtb \
@@@ -217,7 -214,6 +217,7 @@@
        kirkwood-ns2mini.dtb \
        kirkwood-nsa310.dtb \
        kirkwood-nsa310a.dtb \
 +      kirkwood-nsa320.dtb \
        kirkwood-nsa325.dtb \
        kirkwood-openblocks_a6.dtb \
        kirkwood-openblocks_a7.dtb \
@@@ -324,12 -320,8 +324,12 @@@ dtb-$(CONFIG_SOC_IMX6Q) += 
        imx6dl-sabrelite.dtb \
        imx6dl-sabresd.dtb \
        imx6dl-tx6dl-comtft.dtb \
 +      imx6dl-tx6s-8034.dtb \
 +      imx6dl-tx6s-8035.dtb \
        imx6dl-tx6u-801x.dtb \
 +      imx6dl-tx6u-8033.dtb \
        imx6dl-tx6u-811x.dtb \
 +      imx6dl-tx6u-81xx-mb7.dtb \
        imx6dl-udoo.dtb \
        imx6dl-wandboard.dtb \
        imx6dl-wandboard-revb1.dtb \
@@@ -368,29 -360,21 +368,29 @@@
        imx6q-tx6q-1010-comtft.dtb \
        imx6q-tx6q-1020.dtb \
        imx6q-tx6q-1020-comtft.dtb \
 +      imx6q-tx6q-1036.dtb \
        imx6q-tx6q-1110.dtb \
 +      imx6q-tx6q-11x0-mb7.dtb \
        imx6q-udoo.dtb \
        imx6q-wandboard.dtb \
        imx6q-wandboard-revb1.dtb \
 +      imx6qp-nitrogen6_max.dtb \
        imx6qp-sabreauto.dtb \
        imx6qp-sabresd.dtb
  dtb-$(CONFIG_SOC_IMX6SL) += \
        imx6sl-evk.dtb \
        imx6sl-warp.dtb
  dtb-$(CONFIG_SOC_IMX6SX) += \
 +      imx6sx-nitrogen6sx.dtb \
        imx6sx-sabreauto.dtb \
        imx6sx-sdb-reva.dtb \
 +      imx6sx-sdb-sai.dtb \
        imx6sx-sdb.dtb
  dtb-$(CONFIG_SOC_IMX6UL) += \
 -      imx6ul-14x14-evk.dtb
 +      imx6ul-14x14-evk.dtb \
 +      imx6ul-tx6ul-0010.dtb \
 +      imx6ul-tx6ul-0011.dtb \
 +      imx6ul-tx6ul-mainboard.dtb
  dtb-$(CONFIG_SOC_IMX7D) += \
        imx7d-cl-som-imx7.dtb \
        imx7d-sbc-imx7.dtb \
@@@ -404,8 -388,7 +404,8 @@@ dtb-$(CONFIG_SOC_VF610) += 
        vf610m4-colibri.dtb \
        vf610-cosmic.dtb \
        vf610m4-cosmic.dtb \
 -      vf610-twr.dtb
 +      vf610-twr.dtb \
 +      vf610-zii-dev-rev-b.dtb
  dtb-$(CONFIG_ARCH_MXS) += \
        imx23-evk.dtb \
        imx23-olinuxino.dtb \
@@@ -511,7 -494,6 +511,7 @@@ dtb-$(CONFIG_SOC_AM33XX) += 
        am335x-cm-t335.dtb \
        am335x-evm.dtb \
        am335x-evmsk.dtb \
 +      am335x-icev2.dtb \
        am335x-lxm.dtb \
        am335x-nano.dtb \
        am335x-pepper.dtb \
@@@ -521,7 -503,6 +521,7 @@@
        am335x-wega-rdk.dtb
  dtb-$(CONFIG_ARCH_OMAP4) += \
        omap4-duovero-parlor.dtb \
 +      omap4-kc1.dtb \
        omap4-panda.dtb \
        omap4-panda-a4.dtb \
        omap4-panda-es.dtb \
@@@ -545,12 -526,9 +545,12 @@@ dtb-$(CONFIG_SOC_DRA7XX) += 
        am57xx-beagle-x15.dtb \
        am57xx-cl-som-am57x.dtb \
        am57xx-sbc-am57x.dtb \
 +      am572x-idk.dtb \
        dra7-evm.dtb \
 -      dra72-evm.dtb
 +      dra72-evm.dtb \
 +      dra72-evm-revc.dtb
  dtb-$(CONFIG_ARCH_ORION5X) += \
 +      orion5x-kuroboxpro.dtb \
        orion5x-lacie-d2-network.dtb \
        orion5x-lacie-ethernet-disk-mini-v2.dtb \
        orion5x-linkstation-lsgl.dtb \
@@@ -561,7 -539,6 +561,7 @@@
  dtb-$(CONFIG_ARCH_PRIMA2) += \
        prima2-evb.dtb
  dtb-$(CONFIG_ARCH_QCOM) += \
 +      qcom-apq8064-arrow-db600c.dtb \
        qcom-apq8064-cm-qs600.dtb \
        qcom-apq8064-ifc6410.dtb \
        qcom-apq8064-sony-xperia-yuga.dtb \
@@@ -569,20 -546,13 +569,20 @@@
        qcom-apq8074-dragonboard.dtb \
        qcom-apq8084-ifc6540.dtb \
        qcom-apq8084-mtp.dtb \
 +      qcom-ipq4019-ap.dk01.1-c1.dtb \
        qcom-ipq8064-ap148.dtb \
        qcom-msm8660-surf.dtb \
        qcom-msm8960-cdp.dtb \
        qcom-msm8974-sony-xperia-honami.dtb
  dtb-$(CONFIG_ARCH_REALVIEW) += \
        arm-realview-pb1176.dtb \
 -      arm-realview-pb11mp.dtb
 +      arm-realview-pb11mp.dtb \
 +      arm-realview-eb.dtb \
 +      arm-realview-eb-11mp.dtb \
 +      arm-realview-eb-11mp-revb.dtb \
 +      arm-realview-eb-a9mp.dtb \
 +      arm-realview-pba8.dtb \
 +      arm-realview-pbx-a9.dtb
  dtb-$(CONFIG_ARCH_ROCKCHIP) += \
        rk3036-evb.dtb \
        rk3036-kylin.dtb \