Merge tag 'keystone_dts_for_4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into next/dt

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

15 files changed, 24 insertions, 13 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 61a323a6b2cf..efa0d392f5e7 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1260,7 +1260,7 @@ M:	Santosh Shilimkar <ssantosh@kernel.org>
 L:      linux-arm-kernel@lists.infradead.org (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
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index b40b1c5b40f4..f57199f40e19 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -159,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 \
diff --git a/arch/arm/boot/dts/k2e-clocks.dtsi b/arch/arm/boot/dts/keystone-k2e-clocks.dtsi
index d56d68fe7ffc..d56d68fe7ffc 100644
--- a/arch/arm/boot/dts/k2e-clocks.dtsi
+++ b/arch/arm/boot/dts/keystone-k2e-clocks.dtsi
diff --git a/arch/arm/boot/dts/k2e-evm.dts b/arch/arm/boot/dts/keystone-k2e-evm.dts
index b7e99807f5c2..4c32ebc1425a 100644
--- a/arch/arm/boot/dts/k2e-evm.dts
+++ b/arch/arm/boot/dts/keystone-k2e-evm.dts
@@ -10,7 +10,7 @@
 /dts-v1/;
 
 #include "keystone.dtsi"
-#include "k2e.dtsi"
+#include "keystone-k2e.dtsi"
 
 / {
         compatible = "ti,k2e-evm", "ti,k2e", "ti,keystone";
diff --git a/arch/arm/boot/dts/k2e-netcp.dtsi b/arch/arm/boot/dts/keystone-k2e-netcp.dtsi
index ac990f679725..ac990f679725 100644
--- a/arch/arm/boot/dts/k2e-netcp.dtsi
+++ b/arch/arm/boot/dts/keystone-k2e-netcp.dtsi
diff --git a/arch/arm/boot/dts/k2e.dtsi b/arch/arm/boot/dts/keystone-k2e.dtsi
index 1097dada56d2..96b349fb0430 100644
--- a/arch/arm/boot/dts/k2e.dtsi
+++ b/arch/arm/boot/dts/keystone-k2e.dtsi
@@ -44,7 +44,7 @@
         };
 
         soc {
-                /include/ "k2e-clocks.dtsi"
+                /include/ "keystone-k2e-clocks.dtsi"
 
                 usb: usb@2680000 {
                         interrupts = <GIC_SPI 152 IRQ_TYPE_EDGE_RISING>;
@@ -145,6 +145,6 @@
                         clock-names = "fck";
                         bus_freq        = <2500000>;
                 };
-                /include/ "k2e-netcp.dtsi"
+                /include/ "keystone-k2e-netcp.dtsi"
         };
 };
diff --git a/arch/arm/boot/dts/k2hk-clocks.dtsi b/arch/arm/boot/dts/keystone-k2hk-clocks.dtsi
index af9b7190533a..af9b7190533a 100644
--- a/arch/arm/boot/dts/k2hk-clocks.dtsi
+++ b/arch/arm/boot/dts/keystone-k2hk-clocks.dtsi
diff --git a/arch/arm/boot/dts/k2hk-evm.dts b/arch/arm/boot/dts/keystone-k2hk-evm.dts
index 8161bf53271b..b38b3441818b 100644
--- a/arch/arm/boot/dts/k2hk-evm.dts
+++ b/arch/arm/boot/dts/keystone-k2hk-evm.dts
@@ -10,7 +10,7 @@
 /dts-v1/;
 
 #include "keystone.dtsi"
-#include "k2hk.dtsi"
+#include "keystone-k2hk.dtsi"
 
 / {
         compatible =  "ti,k2hk-evm", "ti,k2hk", "ti,keystone";
diff --git a/arch/arm/boot/dts/k2hk-netcp.dtsi b/arch/arm/boot/dts/keystone-k2hk-netcp.dtsi
index f86d6ddb832b..f86d6ddb832b 100644
--- a/arch/arm/boot/dts/k2hk-netcp.dtsi
+++ b/arch/arm/boot/dts/keystone-k2hk-netcp.dtsi
diff --git a/arch/arm/boot/dts/k2hk.dtsi b/arch/arm/boot/dts/keystone-k2hk.dtsi
index ada4c7ac96e7..8f67fa8df936 100644
--- a/arch/arm/boot/dts/k2hk.dtsi
+++ b/arch/arm/boot/dts/keystone-k2hk.dtsi
@@ -44,7 +44,7 @@
         };
 
         soc {
-                /include/ "k2hk-clocks.dtsi"
+                /include/ "keystone-k2hk-clocks.dtsi"
 
                 dspgpio0: keystone_dsp_gpio@02620240 {
                         compatible = "ti,keystone-dsp-gpio";
@@ -112,6 +112,6 @@
                         clock-names = "fck";
                         bus_freq        = <2500000>;
                 };
-                /include/ "k2hk-netcp.dtsi"
+                /include/ "keystone-k2hk-netcp.dtsi"
         };
 };
diff --git a/arch/arm/boot/dts/k2l-clocks.dtsi b/arch/arm/boot/dts/keystone-k2l-clocks.dtsi
index ef8464bb11ff..ef8464bb11ff 100644
--- a/arch/arm/boot/dts/k2l-clocks.dtsi
+++ b/arch/arm/boot/dts/keystone-k2l-clocks.dtsi
diff --git a/arch/arm/boot/dts/k2l-evm.dts b/arch/arm/boot/dts/keystone-k2l-evm.dts
index 00861244d788..7f9c2e94d605 100644
--- a/arch/arm/boot/dts/k2l-evm.dts
+++ b/arch/arm/boot/dts/keystone-k2l-evm.dts
@@ -10,7 +10,7 @@
 /dts-v1/;
 
 #include "keystone.dtsi"
-#include "k2l.dtsi"
+#include "keystone-k2l.dtsi"
 
 / {
         compatible = "ti,k2l-evm", "ti,k2l", "ti,keystone";
diff --git a/arch/arm/boot/dts/k2l-netcp.dtsi b/arch/arm/boot/dts/keystone-k2l-netcp.dtsi
index 5acbd0dcc2ab..5acbd0dcc2ab 100644
--- a/arch/arm/boot/dts/k2l-netcp.dtsi
+++ b/arch/arm/boot/dts/keystone-k2l-netcp.dtsi
diff --git a/arch/arm/boot/dts/k2l.dtsi b/arch/arm/boot/dts/keystone-k2l.dtsi
index 4446da72b0ae..ff22ffc3dee7 100644
--- a/arch/arm/boot/dts/k2l.dtsi
+++ b/arch/arm/boot/dts/keystone-k2l.dtsi
@@ -32,7 +32,7 @@
         };
 
         soc {
-                /include/ "k2l-clocks.dtsi"
+                /include/ "keystone-k2l-clocks.dtsi"
 
                 uart2: serial@02348400 {
                         compatible = "ns16550a";
@@ -92,7 +92,7 @@
                         clock-names = "fck";
                         bus_freq        = <2500000>;
                 };
-                /include/ "k2l-netcp.dtsi"
+                /include/ "keystone-k2l-netcp.dtsi"
         };
 };
 
diff --git a/arch/arm/boot/dts/keystone.dtsi b/arch/arm/boot/dts/keystone.dtsi
index 3f272826f537..e34b2265458a 100644
--- a/arch/arm/boot/dts/keystone.dtsi
+++ b/arch/arm/boot/dts/keystone.dtsi
@@ -20,6 +20,9 @@
 
         aliases {
                 serial0 = &uart0;
+                spi0 = &spi0;
+                spi1 = &spi1;
+                spi2 = &spi2;
         };
 
         memory {
@@ -59,6 +62,14 @@
                              <GIC_SPI 23 IRQ_TYPE_EDGE_RISING>;
         };
 
+        psci {
+                compatible      = "arm,psci";
+                method          = "smc";
+                cpu_suspend     = <0x84000001>;
+                cpu_off         = <0x84000002>;
+                cpu_on          = <0x84000003>;
+        };
+
         soc {
                 #address-cells = <1>;
                 #size-cells = <1>;