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 MAINTAINERS
files):
for i in arch/arm/boot/dts/k2*
do
	b=`basename $i`;
	git mv $i arch/arm/boot/dts/keystone-$b;
	sed -i -e "s/$b/keystone-$b/g" arch/arm/boot/dts/*[si]
done

NOTE: bootloaders that depend on older dtb names will need to be
updated as well.

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

Reported-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Santosh Shilimkar <ssantosh@kernel.org>

diff --git a/MAINTAINERS b/MAINTAINERS
index 03e00c7c88ebca4161bff9d4be82d59f3698f177..b618aa92eeed2c162005b92f4bd0827b83e2fc9e 100644 (file)
--- 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 95c1923ce6fa3d32bdeb2e3caedf0ad48eb4d679..b25621ae2ff74b596e5229b36e0bbd11feee4b27 100644 (file)
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -158,9 +158,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
similarity index 100%
rename from arch/arm/boot/dts/k2e-clocks.dtsi
rename to 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
similarity index 98%
rename from arch/arm/boot/dts/k2e-evm.dts
rename to arch/arm/boot/dts/keystone-k2e-evm.dts
index b7e99807f5c2014ad71ae26d0ebc0b06c3426011..4c32ebc1425a0ae52a181e7305706f071a986ae0 100644 (file)
--- 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
similarity index 100%
rename from arch/arm/boot/dts/k2e-netcp.dtsi
rename to 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
similarity index 97%
rename from arch/arm/boot/dts/k2e.dtsi
rename to arch/arm/boot/dts/keystone-k2e.dtsi
index 1097dada56d2e8dc23be80ca63f10b81081e1380..96b349fb0430c4444c55197d40b443c59c58b5f6 100644 (file)
--- 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
similarity index 100%
rename from arch/arm/boot/dts/k2hk-clocks.dtsi
rename to 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
similarity index 99%
rename from arch/arm/boot/dts/k2hk-evm.dts
rename to arch/arm/boot/dts/keystone-k2hk-evm.dts
index 8161bf53271b75242dd84d28f42572b9fe7b4515..b38b3441818b91ea8c00039b726344942442c84d 100644 (file)
--- 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
similarity index 100%
rename from arch/arm/boot/dts/k2hk-netcp.dtsi
rename to 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
similarity index 96%
rename from arch/arm/boot/dts/k2hk.dtsi
rename to arch/arm/boot/dts/keystone-k2hk.dtsi
index ada4c7ac96e73e6bff3d275379c1cc999bc2db9c..8f67fa8df93646858a34266854bfdcce3e61c62c 100644 (file)
--- 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
similarity index 100%
rename from arch/arm/boot/dts/k2l-clocks.dtsi
rename to 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
similarity index 98%
rename from arch/arm/boot/dts/k2l-evm.dts
rename to arch/arm/boot/dts/keystone-k2l-evm.dts
index 00861244d78873a224275a2dffbe052d80a8a901..7f9c2e94d6056829d6ad70905d50b34b97671399 100644 (file)
--- 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
similarity index 100%
rename from arch/arm/boot/dts/k2l-netcp.dtsi
rename to 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
similarity index 96%
rename from arch/arm/boot/dts/k2l.dtsi
rename to arch/arm/boot/dts/keystone-k2l.dtsi
index 4446da72b0aee89e221603698c088c3f481503d6..ff22ffc3dee758c4f9e4f0f5ff0b756a62383b6b 100644 (file)
--- 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"
        };
 };