ARM: dts: k2*: Rename the k2* files to keystone-k2* files

As reported in [1], rename the k2* dts files to keystone-* files
this will force consistency throughout.

Script for the same (and hand modified for Makefile and config
files):
for i in arch/arm/dts/k2*
do
	b=`basename $i`;
	git mv $i arch/arm/dts/keystone-$b;
	sed -i -e "s/$b/keystone-$b/g" arch/arm/dts/*[si]
done

This is similar to linux kernel commit 5edafc29829bc ("ARM: dts: k2*: Rename
the k2* files to keystone-k2* files")

[1] http://marc.info/?l=linux-arm-kernel&m=145637407804754&w=2

Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>

diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 397a0aec0b77bd8379f7e5c0aa31431108bc2437..2d75f64269343366c43d313cc1c2a1973a4c80cf 100644 (file)
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -320,10 +320,10 @@ dtb-$(CONFIG_MX6) += imx6ull-14x14-evk.dtb \
 
 dtb-$(CONFIG_MX7) += imx7-colibri.dtb
 
-dtb-$(CONFIG_SOC_KEYSTONE) += k2hk-evm.dtb \
-       k2l-evm.dtb \
-       k2e-evm.dtb \
-       k2g-evm.dtb
+dtb-$(CONFIG_SOC_KEYSTONE) += keystone-k2hk-evm.dtb \
+       keystone-k2l-evm.dtb \
+       keystone-k2e-evm.dtb \
+       keystone-k2g-evm.dtb
 
 dtb-$(CONFIG_TARGET_SAMA5D2_XPLAINED) += \
        at91-sama5d2_xplained.dtb

diff --git a/arch/arm/dts/k2e-clocks.dtsi b/arch/arm/dts/keystone-k2e-clocks.dtsi
similarity index 100%
rename from arch/arm/dts/k2e-clocks.dtsi
rename to arch/arm/dts/keystone-k2e-clocks.dtsi

diff --git a/arch/arm/dts/k2e-evm.dts b/arch/arm/dts/keystone-k2e-evm.dts
similarity index 98%
rename from arch/arm/dts/k2e-evm.dts
rename to arch/arm/dts/keystone-k2e-evm.dts
index e2c3fb49102adfcbcabe71fc357975379b24b150..3be8b532525cdb5ef65359c6ea0a53482e9ab4f1 100644 (file)
--- a/arch/arm/dts/k2e-evm.dts
+++ b/arch/arm/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,keystone";

diff --git a/arch/arm/dts/k2e-netcp.dtsi b/arch/arm/dts/keystone-k2e-netcp.dtsi
similarity index 100%
rename from arch/arm/dts/k2e-netcp.dtsi
rename to arch/arm/dts/keystone-k2e-netcp.dtsi

diff --git a/arch/arm/dts/k2e.dtsi b/arch/arm/dts/keystone-k2e.dtsi
similarity index 97%
rename from arch/arm/dts/k2e.dtsi
rename to arch/arm/dts/keystone-k2e.dtsi
index 675fb8e492c6aa0478a6d5df01b30fbe1e281b7d..b5d906184c1ff48247bfa16550a83d9603e31b8b 100644 (file)
--- a/arch/arm/dts/k2e.dtsi
+++ b/arch/arm/dts/keystone-k2e.dtsi
@@ -41,7 +41,7 @@
        };
 
        soc {
-               /include/ "k2e-clocks.dtsi"
+               /include/ "keystone-k2e-clocks.dtsi"
 
                usb: usb@2680000 {
                        interrupts = <GIC_SPI 152 IRQ_TYPE_EDGE_RISING>;
@@ -142,6 +142,6 @@
                        clock-names = "fck";
                        bus_freq        = <2500000>;
                };
-               /include/ "k2e-netcp.dtsi"
+               /include/ "keystone-k2e-netcp.dtsi"
        };
 };

diff --git a/arch/arm/dts/k2g-evm.dts b/arch/arm/dts/keystone-k2g-evm.dts
similarity index 95%
rename from arch/arm/dts/k2g-evm.dts
rename to arch/arm/dts/keystone-k2g-evm.dts
index 61d0d55433375465056e4a8a350b45db6c1a9e0f..696a0d745921a1d872b28fedfd3cdc2ea6064b77 100644 (file)
--- a/arch/arm/dts/k2g-evm.dts
+++ b/arch/arm/dts/keystone-k2g-evm.dts
@@ -1,7 +1,7 @@
 /*
  * Copyright 2014 Texas Instruments, Inc.
  *
- * Keystone 2 Galileo EVM device tree
+ * Device Tree Source for K2G EVM
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -9,11 +9,11 @@
  */
 /dts-v1/;
 
-#include "k2g.dtsi"
+#include "keystone-k2g.dtsi"
 
 / {
        compatible =  "ti,k2g-evm","ti,keystone";
-       model = "Texas Instruments Keystone 2 Galileo EVM";
+       model = "Texas Instruments K2G General Purpose EVM";
 
        chosen {
                stdout-path = &uart0;

diff --git a/arch/arm/dts/k2g-netcp.dtsi b/arch/arm/dts/keystone-k2g-netcp.dtsi
similarity index 98%
rename from arch/arm/dts/k2g-netcp.dtsi
rename to arch/arm/dts/keystone-k2g-netcp.dtsi
index 6f0ff863af6701ba247169bb116ddf14ff8f2167..a9b26c3b3a04338f60fbe04f0bba3e50ac482cb3 100644 (file)
--- a/arch/arm/dts/k2g-netcp.dtsi
+++ b/arch/arm/dts/keystone-k2g-netcp.dtsi
@@ -1,5 +1,5 @@
 /*
- * Device Tree Source for Keystone 2 Galileo Netcp driver
+ * Device Tree Source for K2G Netcp driver
  *
  * Copyright 2015 Texas Instruments, Inc.
  *

diff --git a/arch/arm/dts/k2g.dtsi b/arch/arm/dts/keystone-k2g.dtsi
similarity index 97%
rename from arch/arm/dts/k2g.dtsi
rename to arch/arm/dts/keystone-k2g.dtsi
index add03b74da36dfd1e52aea2f76607c045284a488..2193f9fa21bf4cb50e3d5eb87334e74d0617ea1b 100644 (file)
--- a/arch/arm/dts/k2g.dtsi
+++ b/arch/arm/dts/keystone-k2g.dtsi
@@ -1,7 +1,7 @@
 /*
  * Copyright 2014 Texas Instruments, Inc.
  *
- * Keystone 2 Galileo soc device tree
+ * Device Tree Source for K2G SOC
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -12,7 +12,7 @@
 #include "skeleton.dtsi"
 
 / {
-       model = "Texas Instruments Keystone 2 SoC";
+       model = "Texas Instruments K2G SoC";
        #address-cells = <1>;
        #size-cells = <1>;
        interrupt-parent = <&gic>;
@@ -98,7 +98,7 @@
                        status = "disabled";
                };
 
-               #include "k2g-netcp.dtsi"
+               #include "keystone-k2g-netcp.dtsi"
 
                pmmc: pmmc@2900000 {
                        compatible = "ti,power-processor";

diff --git a/arch/arm/dts/k2hk-clocks.dtsi b/arch/arm/dts/keystone-k2hk-clocks.dtsi
similarity index 100%
rename from arch/arm/dts/k2hk-clocks.dtsi
rename to arch/arm/dts/keystone-k2hk-clocks.dtsi

diff --git a/arch/arm/dts/k2hk-evm.dts b/arch/arm/dts/keystone-k2hk-evm.dts
similarity index 99%
rename from arch/arm/dts/k2hk-evm.dts
rename to arch/arm/dts/keystone-k2hk-evm.dts
index c5cad2c9da80a6a826f2d55fadf2e2f382dc9596..76a675f1e4600feecc9c426c88241f0ca90a60c3 100644 (file)
--- a/arch/arm/dts/k2hk-evm.dts
+++ b/arch/arm/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,keystone";

diff --git a/arch/arm/dts/k2hk-netcp.dtsi b/arch/arm/dts/keystone-k2hk-netcp.dtsi
similarity index 100%
rename from arch/arm/dts/k2hk-netcp.dtsi
rename to arch/arm/dts/keystone-k2hk-netcp.dtsi

diff --git a/arch/arm/dts/k2hk.dtsi b/arch/arm/dts/keystone-k2hk.dtsi
similarity index 96%
rename from arch/arm/dts/k2hk.dtsi
rename to arch/arm/dts/keystone-k2hk.dtsi
index d0810a5f296857394397c7f1c60bffa0011bb6e1..fc786968379cf94486f20806685180556167edd1 100644 (file)
--- a/arch/arm/dts/k2hk.dtsi
+++ b/arch/arm/dts/keystone-k2hk.dtsi
@@ -41,7 +41,7 @@
        };
 
        soc {
-               /include/ "k2hk-clocks.dtsi"
+               /include/ "keystone-k2hk-clocks.dtsi"
 
                dspgpio0: keystone_dsp_gpio@02620240 {
                        compatible = "ti,keystone-dsp-gpio";
@@ -109,6 +109,6 @@
                        clock-names = "fck";
                        bus_freq        = <2500000>;
                };
-               /include/ "k2hk-netcp.dtsi"
+               /include/ "keystone-k2hk-netcp.dtsi"
        };
 };

diff --git a/arch/arm/dts/k2l-clocks.dtsi b/arch/arm/dts/keystone-k2l-clocks.dtsi
similarity index 100%
rename from arch/arm/dts/k2l-clocks.dtsi
rename to arch/arm/dts/keystone-k2l-clocks.dtsi

diff --git a/arch/arm/dts/k2l-evm.dts b/arch/arm/dts/keystone-k2l-evm.dts
similarity index 98%
rename from arch/arm/dts/k2l-evm.dts
rename to arch/arm/dts/keystone-k2l-evm.dts
index da0661ba3e8a058840b2e5e71438c008dea02a52..b5c56176bf6046ab80e214fd42e94ac263c8d42e 100644 (file)
--- a/arch/arm/dts/k2l-evm.dts
+++ b/arch/arm/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,keystone";

diff --git a/arch/arm/dts/k2l-netcp.dtsi b/arch/arm/dts/keystone-k2l-netcp.dtsi
similarity index 100%
rename from arch/arm/dts/k2l-netcp.dtsi
rename to arch/arm/dts/keystone-k2l-netcp.dtsi

diff --git a/arch/arm/dts/k2l.dtsi b/arch/arm/dts/keystone-k2l.dtsi
similarity index 96%
rename from arch/arm/dts/k2l.dtsi
rename to arch/arm/dts/keystone-k2l.dtsi
index 49fd414f680c93ab50cf0dae72d2e9261181da21..d681cab259444473bb14f6a91b65d2ed3f35a34c 100644 (file)
--- a/arch/arm/dts/k2l.dtsi
+++ b/arch/arm/dts/keystone-k2l.dtsi
@@ -29,7 +29,7 @@
        };
 
        soc {
-               /include/ "k2l-clocks.dtsi"
+               /include/ "keystone-k2l-clocks.dtsi"
 
                uart2: serial@02348400 {
                        compatible = "ns16550a";
@@ -89,7 +89,7 @@
                        clock-names = "fck";
                        bus_freq        = <2500000>;
                };
-               /include/ "k2l-netcp.dtsi"
+               /include/ "keystone-k2l-netcp.dtsi"
        };
 };
 

diff --git a/configs/k2e_evm_defconfig b/configs/k2e_evm_defconfig
index 8f0d3fa22b428486efce39ab13f27a8622ee1e95..a42a485e2bbb12905d44d828aa640f4f68bcedbd 100644 (file)
--- a/configs/k2e_evm_defconfig
+++ b/configs/k2e_evm_defconfig
@@ -8,7 +8,7 @@ CONFIG_SPL_POWER_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
-CONFIG_DEFAULT_DEVICE_TREE="k2e-evm"
+CONFIG_DEFAULT_DEVICE_TREE="keystone-k2e-evm"
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_VERSION_VARIABLE=y

diff --git a/configs/k2g_evm_defconfig b/configs/k2g_evm_defconfig
index 17a5e670456c7fffe92e06c464d3c755600dcf37..f3ee01afb1d6094d54f8c3453f9d4d72af926df9 100644 (file)
--- a/configs/k2g_evm_defconfig
+++ b/configs/k2g_evm_defconfig
@@ -8,7 +8,7 @@ CONFIG_SPL_POWER_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
-CONFIG_DEFAULT_DEVICE_TREE="k2g-evm"
+CONFIG_DEFAULT_DEVICE_TREE="keystone-k2g-evm"
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_VERSION_VARIABLE=y

diff --git a/configs/k2hk_evm_defconfig b/configs/k2hk_evm_defconfig
index 6791d56335673e9ffc6abf924f3b6b6262f701ae..d924796627fce03a4f477743fc2748f96ed6ce6b 100644 (file)
--- a/configs/k2hk_evm_defconfig
+++ b/configs/k2hk_evm_defconfig
@@ -8,7 +8,7 @@ CONFIG_SPL_POWER_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
-CONFIG_DEFAULT_DEVICE_TREE="k2hk-evm"
+CONFIG_DEFAULT_DEVICE_TREE="keystone-k2hk-evm"
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_VERSION_VARIABLE=y

diff --git a/configs/k2l_evm_defconfig b/configs/k2l_evm_defconfig
index 4a70e1ad39cc9fab39b93905bec08d06fe3ff2a0..c81758571caf63ff83aa2e3ae2989ee3a52f739b 100644 (file)
--- a/configs/k2l_evm_defconfig
+++ b/configs/k2l_evm_defconfig
@@ -8,7 +8,7 @@ CONFIG_SPL_POWER_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
-CONFIG_DEFAULT_DEVICE_TREE="k2l-evm"
+CONFIG_DEFAULT_DEVICE_TREE="keystone-k2l-evm"
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_VERSION_VARIABLE=y