summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLokesh Vutla <lokeshvutla@ti.com>2017-01-31 09:32:57 +0530
committerTom Rini <trini@konsulko.com>2017-02-08 15:56:30 -0500
commitf0a3f3492ac197ea89be58a29aed7500aad5542d (patch)
treef06e66775b0f7880c1e590428727175d795e7789 /arch
parentd5ce3574619d6814ea095a798702e342d45203d4 (diff)
downloadu-boot-imx-f0a3f3492ac197ea89be58a29aed7500aad5542d.zip
u-boot-imx-f0a3f3492ac197ea89be58a29aed7500aad5542d.tar.gz
u-boot-imx-f0a3f3492ac197ea89be58a29aed7500aad5542d.tar.bz2
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/dts/Makefile8
-rw-r--r--arch/arm/dts/keystone-k2e-clocks.dtsi (renamed from arch/arm/dts/k2e-clocks.dtsi)0
-rw-r--r--arch/arm/dts/keystone-k2e-evm.dts (renamed from arch/arm/dts/k2e-evm.dts)2
-rw-r--r--arch/arm/dts/keystone-k2e-netcp.dtsi (renamed from arch/arm/dts/k2e-netcp.dtsi)0
-rw-r--r--arch/arm/dts/keystone-k2e.dtsi (renamed from arch/arm/dts/k2e.dtsi)4
-rw-r--r--arch/arm/dts/keystone-k2g-evm.dts (renamed from arch/arm/dts/k2g-evm.dts)6
-rw-r--r--arch/arm/dts/keystone-k2g-netcp.dtsi (renamed from arch/arm/dts/k2g-netcp.dtsi)2
-rw-r--r--arch/arm/dts/keystone-k2g.dtsi (renamed from arch/arm/dts/k2g.dtsi)6
-rw-r--r--arch/arm/dts/keystone-k2hk-clocks.dtsi (renamed from arch/arm/dts/k2hk-clocks.dtsi)0
-rw-r--r--arch/arm/dts/keystone-k2hk-evm.dts (renamed from arch/arm/dts/k2hk-evm.dts)2
-rw-r--r--arch/arm/dts/keystone-k2hk-netcp.dtsi (renamed from arch/arm/dts/k2hk-netcp.dtsi)0
-rw-r--r--arch/arm/dts/keystone-k2hk.dtsi (renamed from arch/arm/dts/k2hk.dtsi)4
-rw-r--r--arch/arm/dts/keystone-k2l-clocks.dtsi (renamed from arch/arm/dts/k2l-clocks.dtsi)0
-rw-r--r--arch/arm/dts/keystone-k2l-evm.dts (renamed from arch/arm/dts/k2l-evm.dts)2
-rw-r--r--arch/arm/dts/keystone-k2l-netcp.dtsi (renamed from arch/arm/dts/k2l-netcp.dtsi)0
-rw-r--r--arch/arm/dts/keystone-k2l.dtsi (renamed from arch/arm/dts/k2l.dtsi)4
16 files changed, 20 insertions, 20 deletions
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 397a0ae..2d75f64 100644
--- 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
index d56d68f..d56d68f 100644
--- a/arch/arm/dts/k2e-clocks.dtsi
+++ b/arch/arm/dts/keystone-k2e-clocks.dtsi
diff --git a/arch/arm/dts/k2e-evm.dts b/arch/arm/dts/keystone-k2e-evm.dts
index e2c3fb4..3be8b53 100644
--- 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
index b13b3c9..b13b3c9 100644
--- a/arch/arm/dts/k2e-netcp.dtsi
+++ b/arch/arm/dts/keystone-k2e-netcp.dtsi
diff --git a/arch/arm/dts/k2e.dtsi b/arch/arm/dts/keystone-k2e.dtsi
index 675fb8e..b5d9061 100644
--- 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
index 61d0d55..696a0d7 100644
--- 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
index 6f0ff86..a9b26c3 100644
--- 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
index add03b7..2193f9f 100644
--- 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
index af9b719..af9b719 100644
--- a/arch/arm/dts/k2hk-clocks.dtsi
+++ b/arch/arm/dts/keystone-k2hk-clocks.dtsi
diff --git a/arch/arm/dts/k2hk-evm.dts b/arch/arm/dts/keystone-k2hk-evm.dts
index c5cad2c..76a675f 100644
--- 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
index 77a32c3..77a32c3 100644
--- a/arch/arm/dts/k2hk-netcp.dtsi
+++ b/arch/arm/dts/keystone-k2hk-netcp.dtsi
diff --git a/arch/arm/dts/k2hk.dtsi b/arch/arm/dts/keystone-k2hk.dtsi
index d0810a5..fc78696 100644
--- 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
index ef8464b..ef8464b 100644
--- a/arch/arm/dts/k2l-clocks.dtsi
+++ b/arch/arm/dts/keystone-k2l-clocks.dtsi
diff --git a/arch/arm/dts/k2l-evm.dts b/arch/arm/dts/keystone-k2l-evm.dts
index da0661b..b5c5617 100644
--- 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
index 6b95284..6b95284 100644
--- a/arch/arm/dts/k2l-netcp.dtsi
+++ b/arch/arm/dts/keystone-k2l-netcp.dtsi
diff --git a/arch/arm/dts/k2l.dtsi b/arch/arm/dts/keystone-k2l.dtsi
index 49fd414..d681cab 100644
--- 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"
};
};