Skip to contentSkip to conversation

ARM: ux500: fix devicetree builds

PATCH New Linus Walleij 2 participants 3 messages Aug 7, 2013

Subsystems (2)
Device tree bindings Arm and arm64 SoC sub-architectures (common parts)
lore
Share & tools
lore

Linus Walleij

author
#0 lore raw

PATCH 1/1 ARM: ux500: fix devicetree builds

From: Linus Walleij <[email protected]>

The patch set beginning with commit:
"ARM: ux500: Apply a ste-* prefix onto snowball.dts" thru commit:
"ARM: ux500: Remove u9540.dts as it's been replaced" altered the names of the ux500 device tree files but forgot to:

- Rename the ccu8540-pinctrl.dtsi file

- Update #include statements from files using these files, so the build broke.

- Update the Makefile for the device trees so the build broke.

Fix it up so we can build them all again.

Cc Lee Jones <[email protected]>
Signed-off-by Linus Walleij <[email protected]>
---
 arch/arm/boot/dts/Makefile                 |  10 +-
 arch/arm/boot/dts/ccu8540-pinctrl.dtsi     | 196 -----------------------------
 arch/arm/boot/dts/ste-ccu8540-pinctrl.dtsi | 196 +++++++++++++++++++++++++++++
 arch/arm/boot/dts/ste-ccu8540.dts          |   4 +-
 arch/arm/boot/dts/ste-ccu9540.dts          |   2 +-
 arch/arm/boot/dts/ste-href.dtsi            |   2 +-
 arch/arm/boot/dts/ste-hrefprev60.dts       |   6 +-
 arch/arm/boot/dts/ste-hrefv60plus.dts      |   6 +-
 arch/arm/boot/dts/ste-snowball.dts         |   2 +-
 9 files changed, 212 insertions(+), 212 deletions(-)
 delete mode 100644 arch/arm/boot/dts/ccu8540-pinctrl.dtsi
 create mode 100644 arch/arm/boot/dts/ste-ccu8540-pinctrl.dtsi
arch/arm/boot/dts/Makefile +5 -5
index 641b3c9..efee128 100644
@@ -176,11 +176,11 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \
 	am43x-epos-evm.dtb
 dtb-$(CONFIG_ARCH_ORION5X) += orion5x-lacie-ethernet-disk-mini-v2.dtb
 dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb
-dtb-$(CONFIG_ARCH_U8500) += snowball.dtb \
-	hrefprev60.dtb \
-	hrefv60plus.dtb \
-	ccu8540.dtb \
-	ccu9540.dtb
+dtb-$(CONFIG_ARCH_U8500) += ste-snowball.dtb \
+	ste-hrefprev60.dtb \
+	ste-hrefv60plus.dtb \
+	ste-ccu8540.dtb \
+	ste-ccu9540.dtb
 dtb-$(CONFIG_ARCH_S3C24XX) += s3c2416-smdk2416.dtb
 dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \
 	r8a7740-armadillo800eva.dtb \
arch/arm/boot/dts/ccu8540-pinctrl.dtsi deleted +0 -196

196 lines not on this page · raw message

arch/arm/boot/dts/ste-ccu8540-pinctrl.dtsi new file +196 -0

196 lines not on this page · raw message

arch/arm/boot/dts/ste-ccu8540.dts +2 -2
index 7df65f0..7f3baf5 100644
@@ -10,8 +10,8 @@
  */
 
 /dts-v1/;
-#include "dbx5x0.dtsi"
-#include "ccu8540-pinctrl.dtsi"
+#include "ste-dbx5x0.dtsi"
+#include "ste-ccu8540-pinctrl.dtsi"
 
 / {
 	model = "ST-Ericsson U8540 platform with Device Tree";
arch/arm/boot/dts/ste-ccu9540.dts +1 -1
index ed29ec7..2295087 100644
@@ -10,7 +10,7 @@
  */
 
 /dts-v1/;
-#include "dbx5x0.dtsi"
+#include "ste-dbx5x0.dtsi"
 
 / {
 	model = "ST-Ericsson CCU9540 platform with Device Tree";
arch/arm/boot/dts/ste-href.dtsi +1 -1
index 9db41b9..370e03f 100644
@@ -10,7 +10,7 @@
  */
 
 #include <dt-bindings/interrupt-controller/irq.h>
-#include "dbx5x0.dtsi"
+#include "ste-dbx5x0.dtsi"
 
 / {
 	memory {
arch/arm/boot/dts/ste-hrefprev60.dts +3 -3
index c6bb07d..d8d3b99 100644
@@ -10,9 +10,9 @@
  */
 
 /dts-v1/;
-#include "dbx5x0.dtsi"
-#include "href.dtsi"
-#include "stuib.dtsi"
+#include "ste-dbx5x0.dtsi"
+#include "ste-href.dtsi"
+#include "ste-stuib.dtsi"
 
 / {
 	model = "ST-Ericsson HREF (pre-v60) platform with Device Tree";
arch/arm/boot/dts/ste-hrefv60plus.dts +3 -3
index 3d580d6..6e52ebb 100644
@@ -10,9 +10,9 @@
  */
 
 /dts-v1/;
-#include "dbx5x0.dtsi"
-#include "href.dtsi"
-#include "stuib.dtsi"
+#include "ste-dbx5x0.dtsi"
+#include "ste-href.dtsi"
+#include "ste-stuib.dtsi"
 
 / {
 	model = "ST-Ericsson HREF (v60+) platform with Device Tree";
arch/arm/boot/dts/ste-snowball.dts +1 -1
index f1567a0..f1fc128 100644
@@ -10,7 +10,7 @@
  */
 
 /dts-v1/;
-#include "dbx5x0.dtsi"
+#include "ste-dbx5x0.dtsi"
 
 / {
 	model = "Calao Systems Snowball platform with device tree";
Signature · 1 line
1.8.1.4
#1 lore raw

PATCH 1/1 ARM: ux500: fix devicetree builds

Quoted 21 lines · Linus Walleij

From: Linus Walleij <[email protected]>

The patch set beginning with commit:
"ARM: ux500: Apply a ste-* prefix onto snowball.dts" thru commit:
"ARM: ux500: Remove u9540.dts as it's been replaced" altered the names of the ux500 device tree files but forgot to:

- Rename the ccu8540-pinctrl.dtsi file

- Update #include statements from files using these files, so the build broke.

- Update the Makefile for the device trees so the build broke.

Fix it up so we can build them all again.

Cc Lee Jones <[email protected]>
Signed-off-by Linus Walleij <[email protected]>
Quoted 13 lines
---
 arch/arm/boot/dts/Makefile                 |  10 +-
 arch/arm/boot/dts/ccu8540-pinctrl.dtsi     | 196 -----------------------------
 arch/arm/boot/dts/ste-ccu8540-pinctrl.dtsi | 196 +++++++++++++++++++++++++++++
 arch/arm/boot/dts/ste-ccu8540.dts          |   4 +-
 arch/arm/boot/dts/ste-ccu9540.dts          |   2 +-
 arch/arm/boot/dts/ste-href.dtsi            |   2 +-
 arch/arm/boot/dts/ste-hrefprev60.dts       |   6 +-
 arch/arm/boot/dts/ste-hrefv60plus.dts      |   6 +-
 arch/arm/boot/dts/ste-snowball.dts         |   2 +-
 9 files changed, 212 insertions(+), 212 deletions(-)
 delete mode 100644 arch/arm/boot/dts/ccu8540-pinctrl.dtsi
 create mode 100644 arch/arm/boot/dts/ste-ccu8540-pinctrl.dtsi

I would have been (and still am) happy to fixup the original patches if you think that is a better approach.

If you think this way is better, feel free to add my Acked-by to this patch.

Signature · 4 lines
Lee Jones
Linaro ST-Ericsson Landing Team Lead
Linaro.org ? Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
#2 lore raw

PATCH 1/1 ARM: ux500: fix devicetree builds

In reply to Linus Walleij
Quoted 17 lines · Linus Walleij

From: Linus Walleij <[email protected]>

The patch set beginning with commit:
"ARM: ux500: Apply a ste-* prefix onto snowball.dts" thru commit:
"ARM: ux500: Remove u9540.dts as it's been replaced" altered the names of the ux500 device tree files but forgot to:

- Rename the ccu8540-pinctrl.dtsi file

- Update #include statements from files using these files, so the build broke.

- Update the Makefile for the device trees so the build broke.

Quoted 8 lines

Fix it up so we can build them all again.

Cc Lee Jones <[email protected]>
Signed-off-by Linus Walleij <[email protected]>
---
 arch/arm/boot/dts/Makefile                 |  10 +-
 arch/arm/boot/dts/ccu8540-pinctrl.dtsi     | 196 -----------------------------
 arch/arm/boot/dts/ste-ccu8540-pinctrl.dtsi | 196 +++++++++++++++++++++++++++++

... also, I think you wanted to use git format-patch -M here.

Signature · 4 lines
Lee Jones
Linaro ST-Ericsson Landing Team Lead
Linaro.org ? Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog