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>
This commit is contained in:
Nishanth Menon 2016-03-22 09:06:22 -07:00 committed by Santosh Shilimkar
parent f55532a0c0
commit 5edafc2982
14 changed files with 13 additions and 13 deletions

View File

@ -1260,7 +1260,7 @@ M: Santosh Shilimkar <ssantosh@kernel.org>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S: Maintained S: Maintained
F: arch/arm/mach-keystone/ 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 T: git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git
ARM/TEXAS INSTRUMENT KEYSTONE CLOCK FRAMEWORK ARM/TEXAS INSTRUMENT KEYSTONE CLOCK FRAMEWORK

View File

@ -158,9 +158,9 @@ dtb-$(CONFIG_ARCH_INTEGRATOR) += \
integratorap.dtb \ integratorap.dtb \
integratorcp.dtb integratorcp.dtb
dtb-$(CONFIG_ARCH_KEYSTONE) += \ dtb-$(CONFIG_ARCH_KEYSTONE) += \
k2hk-evm.dtb \ keystone-k2hk-evm.dtb \
k2l-evm.dtb \ keystone-k2l-evm.dtb \
k2e-evm.dtb \ keystone-k2e-evm.dtb \
keystone-k2g-evm.dtb keystone-k2g-evm.dtb
dtb-$(CONFIG_MACH_KIRKWOOD) += \ dtb-$(CONFIG_MACH_KIRKWOOD) += \
kirkwood-b3.dtb \ kirkwood-b3.dtb \

View File

@ -10,7 +10,7 @@
/dts-v1/; /dts-v1/;
#include "keystone.dtsi" #include "keystone.dtsi"
#include "k2e.dtsi" #include "keystone-k2e.dtsi"
/ { / {
compatible = "ti,k2e-evm", "ti,k2e", "ti,keystone"; compatible = "ti,k2e-evm", "ti,k2e", "ti,keystone";

View File

@ -44,7 +44,7 @@
}; };
soc { soc {
/include/ "k2e-clocks.dtsi" /include/ "keystone-k2e-clocks.dtsi"
usb: usb@2680000 { usb: usb@2680000 {
interrupts = <GIC_SPI 152 IRQ_TYPE_EDGE_RISING>; interrupts = <GIC_SPI 152 IRQ_TYPE_EDGE_RISING>;
@ -145,6 +145,6 @@
clock-names = "fck"; clock-names = "fck";
bus_freq = <2500000>; bus_freq = <2500000>;
}; };
/include/ "k2e-netcp.dtsi" /include/ "keystone-k2e-netcp.dtsi"
}; };
}; };

View File

@ -10,7 +10,7 @@
/dts-v1/; /dts-v1/;
#include "keystone.dtsi" #include "keystone.dtsi"
#include "k2hk.dtsi" #include "keystone-k2hk.dtsi"
/ { / {
compatible = "ti,k2hk-evm", "ti,k2hk", "ti,keystone"; compatible = "ti,k2hk-evm", "ti,k2hk", "ti,keystone";

View File

@ -44,7 +44,7 @@
}; };
soc { soc {
/include/ "k2hk-clocks.dtsi" /include/ "keystone-k2hk-clocks.dtsi"
dspgpio0: keystone_dsp_gpio@02620240 { dspgpio0: keystone_dsp_gpio@02620240 {
compatible = "ti,keystone-dsp-gpio"; compatible = "ti,keystone-dsp-gpio";
@ -112,6 +112,6 @@
clock-names = "fck"; clock-names = "fck";
bus_freq = <2500000>; bus_freq = <2500000>;
}; };
/include/ "k2hk-netcp.dtsi" /include/ "keystone-k2hk-netcp.dtsi"
}; };
}; };

View File

@ -10,7 +10,7 @@
/dts-v1/; /dts-v1/;
#include "keystone.dtsi" #include "keystone.dtsi"
#include "k2l.dtsi" #include "keystone-k2l.dtsi"
/ { / {
compatible = "ti,k2l-evm", "ti,k2l", "ti,keystone"; compatible = "ti,k2l-evm", "ti,k2l", "ti,keystone";

View File

@ -32,7 +32,7 @@
}; };
soc { soc {
/include/ "k2l-clocks.dtsi" /include/ "keystone-k2l-clocks.dtsi"
uart2: serial@02348400 { uart2: serial@02348400 {
compatible = "ns16550a"; compatible = "ns16550a";
@ -92,7 +92,7 @@
clock-names = "fck"; clock-names = "fck";
bus_freq = <2500000>; bus_freq = <2500000>;
}; };
/include/ "k2l-netcp.dtsi" /include/ "keystone-k2l-netcp.dtsi"
}; };
}; };