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>
This commit is contained in:
Lokesh Vutla 2017-01-31 09:32:57 +05:30 committed by Tom Rini
parent d5ce357461
commit f0a3f3492a
20 changed files with 24 additions and 24 deletions

View File

@ -320,10 +320,10 @@ dtb-$(CONFIG_MX6) += imx6ull-14x14-evk.dtb \
dtb-$(CONFIG_MX7) += imx7-colibri.dtb dtb-$(CONFIG_MX7) += imx7-colibri.dtb
dtb-$(CONFIG_SOC_KEYSTONE) += k2hk-evm.dtb \ dtb-$(CONFIG_SOC_KEYSTONE) += keystone-k2hk-evm.dtb \
k2l-evm.dtb \ keystone-k2l-evm.dtb \
k2e-evm.dtb \ keystone-k2e-evm.dtb \
k2g-evm.dtb keystone-k2g-evm.dtb
dtb-$(CONFIG_TARGET_SAMA5D2_XPLAINED) += \ dtb-$(CONFIG_TARGET_SAMA5D2_XPLAINED) += \
at91-sama5d2_xplained.dtb at91-sama5d2_xplained.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,keystone"; compatible = "ti,k2e-evm","ti,keystone";

View File

@ -41,7 +41,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>;
@ -142,6 +142,6 @@
clock-names = "fck"; clock-names = "fck";
bus_freq = <2500000>; bus_freq = <2500000>;
}; };
/include/ "k2e-netcp.dtsi" /include/ "keystone-k2e-netcp.dtsi"
}; };
}; };

View File

@ -1,7 +1,7 @@
/* /*
* Copyright 2014 Texas Instruments, Inc. * 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 * 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 * it under the terms of the GNU General Public License version 2 as
@ -9,11 +9,11 @@
*/ */
/dts-v1/; /dts-v1/;
#include "k2g.dtsi" #include "keystone-k2g.dtsi"
/ { / {
compatible = "ti,k2g-evm","ti,keystone"; compatible = "ti,k2g-evm","ti,keystone";
model = "Texas Instruments Keystone 2 Galileo EVM"; model = "Texas Instruments K2G General Purpose EVM";
chosen { chosen {
stdout-path = &uart0; stdout-path = &uart0;

View File

@ -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. * Copyright 2015 Texas Instruments, Inc.
* *

View File

@ -1,7 +1,7 @@
/* /*
* Copyright 2014 Texas Instruments, Inc. * 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 * 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 * it under the terms of the GNU General Public License version 2 as
@ -12,7 +12,7 @@
#include "skeleton.dtsi" #include "skeleton.dtsi"
/ { / {
model = "Texas Instruments Keystone 2 SoC"; model = "Texas Instruments K2G SoC";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
@ -98,7 +98,7 @@
status = "disabled"; status = "disabled";
}; };
#include "k2g-netcp.dtsi" #include "keystone-k2g-netcp.dtsi"
pmmc: pmmc@2900000 { pmmc: pmmc@2900000 {
compatible = "ti,power-processor"; compatible = "ti,power-processor";

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,keystone"; compatible = "ti,k2hk-evm","ti,keystone";

View File

@ -41,7 +41,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";
@ -109,6 +109,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,keystone"; compatible = "ti,k2l-evm","ti,keystone";

View File

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

View File

@ -8,7 +8,7 @@ CONFIG_SPL_POWER_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_FLASH_SUPPORT=y
CONFIG_SPL_SPI_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_OF_BOARD_SETUP=y
CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_VERSION_VARIABLE=y CONFIG_VERSION_VARIABLE=y

View File

@ -8,7 +8,7 @@ CONFIG_SPL_POWER_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_FLASH_SUPPORT=y
CONFIG_SPL_SPI_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_OF_BOARD_SETUP=y
CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_VERSION_VARIABLE=y CONFIG_VERSION_VARIABLE=y

View File

@ -8,7 +8,7 @@ CONFIG_SPL_POWER_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_FLASH_SUPPORT=y
CONFIG_SPL_SPI_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_OF_BOARD_SETUP=y
CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_VERSION_VARIABLE=y CONFIG_VERSION_VARIABLE=y

View File

@ -8,7 +8,7 @@ CONFIG_SPL_POWER_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_FLASH_SUPPORT=y
CONFIG_SPL_SPI_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_OF_BOARD_SETUP=y
CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_VERSION_VARIABLE=y CONFIG_VERSION_VARIABLE=y