diff options
-rw-r--r-- | arch/arm/boot/dts/Makefile | 10 | ||||
-rw-r--r-- | arch/arm/boot/dts/ste-ccu8540-pinctrl.dtsi (renamed from arch/arm/boot/dts/ccu8540-pinctrl.dtsi) | 0 | ||||
-rw-r--r-- | arch/arm/boot/dts/ste-ccu8540.dts | 4 | ||||
-rw-r--r-- | arch/arm/boot/dts/ste-ccu9540.dts | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/ste-href.dtsi | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/ste-hrefprev60.dts | 6 | ||||
-rw-r--r-- | arch/arm/boot/dts/ste-hrefv60plus.dts | 6 | ||||
-rw-r--r-- | arch/arm/boot/dts/ste-snowball.dts | 2 |
8 files changed, 16 insertions, 16 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 641b3c9a7028..efee128a9d1f 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile | |||
@@ -176,11 +176,11 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \ | |||
176 | am43x-epos-evm.dtb | 176 | am43x-epos-evm.dtb |
177 | dtb-$(CONFIG_ARCH_ORION5X) += orion5x-lacie-ethernet-disk-mini-v2.dtb | 177 | dtb-$(CONFIG_ARCH_ORION5X) += orion5x-lacie-ethernet-disk-mini-v2.dtb |
178 | dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb | 178 | dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb |
179 | dtb-$(CONFIG_ARCH_U8500) += snowball.dtb \ | 179 | dtb-$(CONFIG_ARCH_U8500) += ste-snowball.dtb \ |
180 | hrefprev60.dtb \ | 180 | ste-hrefprev60.dtb \ |
181 | hrefv60plus.dtb \ | 181 | ste-hrefv60plus.dtb \ |
182 | ccu8540.dtb \ | 182 | ste-ccu8540.dtb \ |
183 | ccu9540.dtb | 183 | ste-ccu9540.dtb |
184 | dtb-$(CONFIG_ARCH_S3C24XX) += s3c2416-smdk2416.dtb | 184 | dtb-$(CONFIG_ARCH_S3C24XX) += s3c2416-smdk2416.dtb |
185 | dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \ | 185 | dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \ |
186 | r8a7740-armadillo800eva.dtb \ | 186 | r8a7740-armadillo800eva.dtb \ |
diff --git a/arch/arm/boot/dts/ccu8540-pinctrl.dtsi b/arch/arm/boot/dts/ste-ccu8540-pinctrl.dtsi index e0799966bc25..e0799966bc25 100644 --- a/arch/arm/boot/dts/ccu8540-pinctrl.dtsi +++ b/arch/arm/boot/dts/ste-ccu8540-pinctrl.dtsi | |||
diff --git a/arch/arm/boot/dts/ste-ccu8540.dts b/arch/arm/boot/dts/ste-ccu8540.dts index 7df65f0a33a5..7f3baf51a3a9 100644 --- a/arch/arm/boot/dts/ste-ccu8540.dts +++ b/arch/arm/boot/dts/ste-ccu8540.dts | |||
@@ -10,8 +10,8 @@ | |||
10 | */ | 10 | */ |
11 | 11 | ||
12 | /dts-v1/; | 12 | /dts-v1/; |
13 | #include "dbx5x0.dtsi" | 13 | #include "ste-dbx5x0.dtsi" |
14 | #include "ccu8540-pinctrl.dtsi" | 14 | #include "ste-ccu8540-pinctrl.dtsi" |
15 | 15 | ||
16 | / { | 16 | / { |
17 | model = "ST-Ericsson U8540 platform with Device Tree"; | 17 | model = "ST-Ericsson U8540 platform with Device Tree"; |
diff --git a/arch/arm/boot/dts/ste-ccu9540.dts b/arch/arm/boot/dts/ste-ccu9540.dts index ed29ec7288e4..229508750890 100644 --- a/arch/arm/boot/dts/ste-ccu9540.dts +++ b/arch/arm/boot/dts/ste-ccu9540.dts | |||
@@ -10,7 +10,7 @@ | |||
10 | */ | 10 | */ |
11 | 11 | ||
12 | /dts-v1/; | 12 | /dts-v1/; |
13 | #include "dbx5x0.dtsi" | 13 | #include "ste-dbx5x0.dtsi" |
14 | 14 | ||
15 | / { | 15 | / { |
16 | model = "ST-Ericsson CCU9540 platform with Device Tree"; | 16 | model = "ST-Ericsson CCU9540 platform with Device Tree"; |
diff --git a/arch/arm/boot/dts/ste-href.dtsi b/arch/arm/boot/dts/ste-href.dtsi index 9db41b9d8358..370e03f5e7b2 100644 --- a/arch/arm/boot/dts/ste-href.dtsi +++ b/arch/arm/boot/dts/ste-href.dtsi | |||
@@ -10,7 +10,7 @@ | |||
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include <dt-bindings/interrupt-controller/irq.h> | 12 | #include <dt-bindings/interrupt-controller/irq.h> |
13 | #include "dbx5x0.dtsi" | 13 | #include "ste-dbx5x0.dtsi" |
14 | 14 | ||
15 | / { | 15 | / { |
16 | memory { | 16 | memory { |
diff --git a/arch/arm/boot/dts/ste-hrefprev60.dts b/arch/arm/boot/dts/ste-hrefprev60.dts index c6bb07df2d1d..d8d3b99ab007 100644 --- a/arch/arm/boot/dts/ste-hrefprev60.dts +++ b/arch/arm/boot/dts/ste-hrefprev60.dts | |||
@@ -10,9 +10,9 @@ | |||
10 | */ | 10 | */ |
11 | 11 | ||
12 | /dts-v1/; | 12 | /dts-v1/; |
13 | #include "dbx5x0.dtsi" | 13 | #include "ste-dbx5x0.dtsi" |
14 | #include "href.dtsi" | 14 | #include "ste-href.dtsi" |
15 | #include "stuib.dtsi" | 15 | #include "ste-stuib.dtsi" |
16 | 16 | ||
17 | / { | 17 | / { |
18 | model = "ST-Ericsson HREF (pre-v60) platform with Device Tree"; | 18 | model = "ST-Ericsson HREF (pre-v60) platform with Device Tree"; |
diff --git a/arch/arm/boot/dts/ste-hrefv60plus.dts b/arch/arm/boot/dts/ste-hrefv60plus.dts index 3d580d6447f9..6e52ebbf113f 100644 --- a/arch/arm/boot/dts/ste-hrefv60plus.dts +++ b/arch/arm/boot/dts/ste-hrefv60plus.dts | |||
@@ -10,9 +10,9 @@ | |||
10 | */ | 10 | */ |
11 | 11 | ||
12 | /dts-v1/; | 12 | /dts-v1/; |
13 | #include "dbx5x0.dtsi" | 13 | #include "ste-dbx5x0.dtsi" |
14 | #include "href.dtsi" | 14 | #include "ste-href.dtsi" |
15 | #include "stuib.dtsi" | 15 | #include "ste-stuib.dtsi" |
16 | 16 | ||
17 | / { | 17 | / { |
18 | model = "ST-Ericsson HREF (v60+) platform with Device Tree"; | 18 | model = "ST-Ericsson HREF (v60+) platform with Device Tree"; |
diff --git a/arch/arm/boot/dts/ste-snowball.dts b/arch/arm/boot/dts/ste-snowball.dts index f1567a075fe2..f1fc128e249d 100644 --- a/arch/arm/boot/dts/ste-snowball.dts +++ b/arch/arm/boot/dts/ste-snowball.dts | |||
@@ -10,7 +10,7 @@ | |||
10 | */ | 10 | */ |
11 | 11 | ||
12 | /dts-v1/; | 12 | /dts-v1/; |
13 | #include "dbx5x0.dtsi" | 13 | #include "ste-dbx5x0.dtsi" |
14 | 14 | ||
15 | / { | 15 | / { |
16 | model = "Calao Systems Snowball platform with device tree"; | 16 | model = "Calao Systems Snowball platform with device tree"; |