Skip to contentSkip to conversation

ARM: dts: bcm-mobile: DT cleanup

PATCH Applied Stanislav Jakubek 4 participants 17 messages May 26, 2023 – Jun 18, 2023

Subsystems (4)
Device tree bindings Broadcom BCM2711/BCM2835 Arm architecture Broadcom BCM281XX/BCM11XXX/BCM216XX Arm architecture Broadcom iproc Arm architecture
lore
Share & tools
lore

Stanislav Jakubek

author
#0 lore raw

cover ARM: dts: bcm-mobile: DT cleanup

This series cleans up some parts of Broadcom Kona platform's DT files.

No functional change intended.

Stanislav Jakubek (6):
ARM: dts: bcm-mobile: change "" includes to <> where applicable
ARM: dts: bcm21664/23550: use CCU compatibles directly
ARM: dts: bcm-mobile: move status properties to the end of nodes
ARM: dts: bcm11351/21664: add UART, I2C node labels
ARM: dts: bcm21664-garnet: use node labels
ARM: dts: bcm28155-ap: use node labels

 arch/arm/boot/dts/bcm11351.dtsi       |  27 +++----
 arch/arm/boot/dts/bcm21664-garnet.dts |  46 +++++------
 arch/arm/boot/dts/bcm21664.dtsi       |  31 ++++----
 arch/arm/boot/dts/bcm23550.dtsi       |  19 +++--
 arch/arm/boot/dts/bcm28155-ap.dts     | 110 +++++++++++++-------------
 5 files changed, 115 insertions(+), 118 deletions(-)
Signature · 1 line
2.25.1
author
#1 lore raw

PATCH 1/6 ARM: dts: bcm-mobile: change "" includes to <> where applicable

While at it, also sort the includes alphabetically.

Signed-off-by Stanislav Jakubek <[email protected]>
---
 arch/arm/boot/dts/bcm11351.dtsi | 3 +--
 arch/arm/boot/dts/bcm21664.dtsi | 3 +--
 arch/arm/boot/dts/bcm23550.dtsi | 5 ++---
 3 files changed, 4 insertions(+), 7 deletions(-)
arch/arm/boot/dts/bcm11351.dtsi +1 -2
index c30ff1b02e03..f395e95e0177 100644
@@ -1,11 +1,10 @@
 // SPDX-License-Identifier: GPL-2.0-only
 // Copyright (C) 2012-2013 Broadcom Corporation
 
+#include <dt-bindings/clock/bcm281xx.h>
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/interrupt-controller/irq.h>
 
-#include "dt-bindings/clock/bcm281xx.h"
-
 / {
 	#address-cells = <1>;
 	#size-cells = <1>;
arch/arm/boot/dts/bcm21664.dtsi +1 -2
index 4e96656dc36a..2a426125f9fe 100644
@@ -1,11 +1,10 @@
 // SPDX-License-Identifier: GPL-2.0-only
 // Copyright (C) 2014 Broadcom Corporation
 
+#include <dt-bindings/clock/bcm21664.h>
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/interrupt-controller/irq.h>
 
-#include "dt-bindings/clock/bcm21664.h"
-
 / {
 	#address-cells = <1>;
 	#size-cells = <1>;
arch/arm/boot/dts/bcm23550.dtsi +2 -3
index e1a5f1b40ef5..424c818d7a1b 100644
@@ -30,12 +30,11 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+/* BCM23550 and BCM21664 have almost identical clocks */
+#include <dt-bindings/clock/bcm21664.h>
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/interrupt-controller/irq.h>
 
-/* BCM23550 and BCM21664 have almost identical clocks */
-#include "dt-bindings/clock/bcm21664.h"
-
 / {
 	#address-cells = <1>;
 	#size-cells = <1>;
Signature · 1 line
2.25.1
author
#3 lore raw

PATCH 2/6 ARM: dts: bcm21664/23550: use CCU compatibles directly

In reply to Stanislav Jakubek

BCM21664 and BCM23550 DTs for some reason use constants from a header file for their CCU node compatibles. Change these to use the strings directly.

Signed-off-by Stanislav Jakubek <[email protected]>
---
 arch/arm/boot/dts/bcm21664.dtsi | 8 ++++----
 arch/arm/boot/dts/bcm23550.dtsi | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)
arch/arm/boot/dts/bcm21664.dtsi +4 -4
index 2a426125f9fe..19ade84e42c1 100644
@@ -285,21 +285,21 @@ var_156m_clk: var_156m {
 		};
 
 		root_ccu: root_ccu@35001000 {
-			compatible = BCM21664_DT_ROOT_CCU_COMPAT;
+			compatible = "brcm,bcm21664-root-ccu";
 			reg = <0x35001000 0x0f00>;
 			#clock-cells = <1>;
 			clock-output-names = "frac_1m";
 		};
 
 		aon_ccu: aon_ccu@35002000 {
-			compatible = BCM21664_DT_AON_CCU_COMPAT;
+			compatible = "brcm,bcm21664-aon-ccu";
 			reg = <0x35002000 0x0f00>;
 			#clock-cells = <1>;
 			clock-output-names = "hub_timer";
 		};
 
 		master_ccu: master_ccu@3f001000 {
-			compatible = BCM21664_DT_MASTER_CCU_COMPAT;
+			compatible = "brcm,bcm21664-master-ccu";
 			reg = <0x3f001000 0x0f00>;
 			#clock-cells = <1>;
 			clock-output-names = "sdio1",

@@ -313,7 +313,7 @@ master_ccu: master_ccu@3f001000 {
 		};
 
 		slave_ccu: slave_ccu@3e011000 {
-			compatible = BCM21664_DT_SLAVE_CCU_COMPAT;
+			compatible = "brcm,bcm21664-slave-ccu";
 			reg = <0x3e011000 0x0f00>;
 			#clock-cells = <1>;
 			clock-output-names = "uartb",
arch/arm/boot/dts/bcm23550.dtsi +4 -4
index 424c818d7a1b..ed3ce2fabca6 100644
@@ -371,21 +371,21 @@ var_156m_clk: var_156m {
 		};
 
 		root_ccu: root_ccu@35001000 {
-			compatible = BCM21664_DT_ROOT_CCU_COMPAT;
+			compatible = "brcm,bcm21664-root-ccu";
 			reg = <0x35001000 0x0f00>;
 			#clock-cells = <1>;
 			clock-output-names = "frac_1m";
 		};
 
 		aon_ccu: aon_ccu@35002000 {
-			compatible = BCM21664_DT_AON_CCU_COMPAT;
+			compatible = "brcm,bcm21664-aon-ccu";
 			reg = <0x35002000 0x0f00>;
 			#clock-cells = <1>;
 			clock-output-names = "hub_timer";
 		};
 
 		slave_ccu: slave_ccu@3e011000 {
-			compatible = BCM21664_DT_SLAVE_CCU_COMPAT;
+			compatible = "brcm,bcm21664-slave-ccu";
 			reg = <0x3e011000 0x0f00>;
 			#clock-cells = <1>;
 			clock-output-names = "uartb",

@@ -398,7 +398,7 @@ slave_ccu: slave_ccu@3e011000 {
 		};
 
 		master_ccu: master_ccu@3f001000 {
-			compatible = BCM21664_DT_MASTER_CCU_COMPAT;
+			compatible = "brcm,bcm21664-master-ccu";
 			reg = <0x3f001000 0x0f00>;
 			#clock-cells = <1>;
 			clock-output-names = "sdio1",
Signature · 1 line
2.25.1
maintainer Applied
#4 lore raw

Re: [PATCH 2/6] ARM: dts: bcm21664/23550: use CCU compatibles directly

From: Florian Fainelli <[email protected]>

Quoted 5 lines · Stanislav Jakubek

BCM21664 and BCM23550 DTs for some reason use constants from a header file for their CCU node compatibles. Change these to use the strings directly.

Signed-off-by Stanislav Jakubek <[email protected]>

---

Applied to https://github.com/Broadcom/stblinux/commits/devicetree/next, thanks! --
Florian

#5 lore raw

Re: [PATCH 2/6] ARM: dts: bcm21664/23550: use CCU compatibles directly

In reply to Stanislav Jakubek
Quoted 4 lines · Stanislav Jakubek

BCM21664 and BCM23550 DTs for some reason use constants from a header file for their CCU node compatibles. Change these to use the strings directly.

Signed-off-by Stanislav Jakubek <[email protected]>

The reason is to ensure the code and the DTS reference the same string, applied anyway.

Signature · 1 line
Florian
author
#6 lore raw

PATCH 3/6 ARM: dts: bcm-mobile: move status properties to the end of nodes

In reply to Stanislav Jakubek

Move some DT "status" properties so that they're the last specified property (before sub-nodes).

Signed-off-by Stanislav Jakubek <[email protected]>
---
 arch/arm/boot/dts/bcm11351.dtsi   | 8 ++++----
 arch/arm/boot/dts/bcm21664.dtsi   | 6 +++---
 arch/arm/boot/dts/bcm23550.dtsi   | 6 +++---
 arch/arm/boot/dts/bcm28155-ap.dts | 8 ++++----
 4 files changed, 14 insertions(+), 14 deletions(-)
arch/arm/boot/dts/bcm11351.dtsi +4 -4
index f395e95e0177..773d717de7f0 100644
@@ -51,42 +51,42 @@ smc@3404c000 {
 
 	serial@3e000000 {
 		compatible = "brcm,bcm11351-dw-apb-uart", "snps,dw-apb-uart";
-		status = "disabled";
 		reg = <0x3e000000 0x1000>;
 		clocks = <&slave_ccu BCM281XX_SLAVE_CCU_UARTB>;
 		interrupts = <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>;
 		reg-shift = <2>;
 		reg-io-width = <4>;
+		status = "disabled";
 	};
 
 	serial@3e001000 {
 		compatible = "brcm,bcm11351-dw-apb-uart", "snps,dw-apb-uart";
-		status = "disabled";
 		reg = <0x3e001000 0x1000>;
 		clocks = <&slave_ccu BCM281XX_SLAVE_CCU_UARTB2>;
 		interrupts = <GIC_SPI 66 IRQ_TYPE_LEVEL_HIGH>;
 		reg-shift = <2>;
 		reg-io-width = <4>;
+		status = "disabled";
 	};
 
 	serial@3e002000 {
 		compatible = "brcm,bcm11351-dw-apb-uart", "snps,dw-apb-uart";
-		status = "disabled";
 		reg = <0x3e002000 0x1000>;
 		clocks = <&slave_ccu BCM281XX_SLAVE_CCU_UARTB3>;
 		interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>;
 		reg-shift = <2>;
 		reg-io-width = <4>;
+		status = "disabled";
 	};
 
 	serial@3e003000 {
 		compatible = "brcm,bcm11351-dw-apb-uart", "snps,dw-apb-uart";
-		status = "disabled";
 		reg = <0x3e003000 0x1000>;
 		clocks = <&slave_ccu BCM281XX_SLAVE_CCU_UARTB4>;
 		interrupts = <GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH>;
 		reg-shift = <2>;
 		reg-io-width = <4>;
+		status = "disabled";
 	};
 
 	L2: l2-cache@3ff20000 {
arch/arm/boot/dts/bcm21664.dtsi +3 -3
index 19ade84e42c1..9e3835a0a7ef 100644
@@ -51,32 +51,32 @@ smc@3404e000 {
 
 	serial@3e000000 {
 		compatible = "brcm,bcm21664-dw-apb-uart", "snps,dw-apb-uart";
-		status = "disabled";
 		reg = <0x3e000000 0x118>;
 		clocks = <&slave_ccu BCM21664_SLAVE_CCU_UARTB>;
 		interrupts = <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>;
 		reg-shift = <2>;
 		reg-io-width = <4>;
+		status = "disabled";
 	};
 
 	serial@3e001000 {
 		compatible = "brcm,bcm21664-dw-apb-uart", "snps,dw-apb-uart";
-		status = "disabled";
 		reg = <0x3e001000 0x118>;
 		clocks = <&slave_ccu BCM21664_SLAVE_CCU_UARTB2>;
 		interrupts = <GIC_SPI 66 IRQ_TYPE_LEVEL_HIGH>;
 		reg-shift = <2>;
 		reg-io-width = <4>;
+		status = "disabled";
 	};
 
 	serial@3e002000 {
 		compatible = "brcm,bcm21664-dw-apb-uart", "snps,dw-apb-uart";
-		status = "disabled";
 		reg = <0x3e002000 0x118>;
 		clocks = <&slave_ccu BCM21664_SLAVE_CCU_UARTB3>;
 		interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>;
 		reg-shift = <2>;
 		reg-io-width = <4>;
+		status = "disabled";
 	};
 
 	L2: cache-controller@3ff20000 {
arch/arm/boot/dts/bcm23550.dtsi +3 -3
index ed3ce2fabca6..445eadb8d871 100644
@@ -129,32 +129,32 @@ slaves@3e000000 {
 
 		uartb: serial@0 {
 			compatible = "snps,dw-apb-uart";
-			status = "disabled";
 			reg = <0x00000000 0x118>;
 			clocks = <&slave_ccu BCM21664_SLAVE_CCU_UARTB>;
 			interrupts = <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>;
 			reg-shift = <2>;
 			reg-io-width = <4>;
+			status = "disabled";
 		};
 
 		uartb2: serial@1000 {
 			compatible = "snps,dw-apb-uart";
-			status = "disabled";
 			reg = <0x00001000 0x118>;
 			clocks = <&slave_ccu BCM21664_SLAVE_CCU_UARTB2>;
 			interrupts = <GIC_SPI 66 IRQ_TYPE_LEVEL_HIGH>;
 			reg-shift = <2>;
 			reg-io-width = <4>;
+			status = "disabled";
 		};
 
 		uartb3: serial@2000 {
 			compatible = "snps,dw-apb-uart";
-			status = "disabled";
 			reg = <0x00002000 0x118>;
 			clocks = <&slave_ccu BCM21664_SLAVE_CCU_UARTB3>;
 			interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>;
 			reg-shift = <2>;
 			reg-io-width = <4>;
+			status = "disabled";
 		};
 
 		bsc1: i2c@16000 {
arch/arm/boot/dts/bcm28155-ap.dts +4 -4
index c496e33a71a6..0a8ad1d673d8 100644
@@ -21,23 +21,23 @@ serial@3e000000 {
 	};
 
 	i2c@3e016000 {
-		status = "okay";
 		clock-frequency = <400000>;
+		status = "okay";
 	};
 
 	i2c@3e017000 {
-		status = "okay";
 		clock-frequency = <400000>;
+		status = "okay";
 	};
 
 	i2c@3e018000 {
-		status = "okay";
 		clock-frequency = <400000>;
+		status = "okay";
 	};
 
 	i2c@3500d000 {
-		status = "okay";
 		clock-frequency = <100000>;
+		status = "okay";
 
 		pmu: pmu@8 {
 			reg = <0x08>;
Signature · 1 line
2.25.1
author
#8 lore raw

PATCH 4/6 ARM: dts: bcm11351/21664: add UART, I2C node labels

In reply to Stanislav Jakubek

Add node labels to serial (UART) and I2C nodes for BCM11351 and BCM21664.

Signed-off-by Stanislav Jakubek <[email protected]>
---
 arch/arm/boot/dts/bcm11351.dtsi | 16 ++++++++--------
 arch/arm/boot/dts/bcm21664.dtsi | 14 +++++++-------
 2 files changed, 15 insertions(+), 15 deletions(-)
arch/arm/boot/dts/bcm11351.dtsi +8 -8
index 773d717de7f0..b271a9bf06a9 100644
@@ -49,7 +49,7 @@ smc@3404c000 {
 		reg = <0x3404c000 0x400>; /* 1 KiB in SRAM */
 	};
 
-	serial@3e000000 {
+	uartb: serial@3e000000 {
 		compatible = "brcm,bcm11351-dw-apb-uart", "snps,dw-apb-uart";
 		reg = <0x3e000000 0x1000>;
 		clocks = <&slave_ccu BCM281XX_SLAVE_CCU_UARTB>;

@@ -59,7 +59,7 @@ serial@3e000000 {
 		status = "disabled";
 	};
 
-	serial@3e001000 {
+	uartb2: serial@3e001000 {
 		compatible = "brcm,bcm11351-dw-apb-uart", "snps,dw-apb-uart";
 		reg = <0x3e001000 0x1000>;
 		clocks = <&slave_ccu BCM281XX_SLAVE_CCU_UARTB2>;

@@ -69,7 +69,7 @@ serial@3e001000 {
 		status = "disabled";
 	};
 
-	serial@3e002000 {
+	uartb3: serial@3e002000 {
 		compatible = "brcm,bcm11351-dw-apb-uart", "snps,dw-apb-uart";
 		reg = <0x3e002000 0x1000>;
 		clocks = <&slave_ccu BCM281XX_SLAVE_CCU_UARTB3>;

@@ -79,7 +79,7 @@ serial@3e002000 {
 		status = "disabled";
 	};
 
-	serial@3e003000 {
+	uartb4: serial@3e003000 {
 		compatible = "brcm,bcm11351-dw-apb-uart", "snps,dw-apb-uart";
 		reg = <0x3e003000 0x1000>;
 		clocks = <&slave_ccu BCM281XX_SLAVE_CCU_UARTB4>;

@@ -161,7 +161,7 @@ pinctrl@35004800 {
 		reg = <0x35004800 0x430>;
 	};
 
-	i2c@3e016000 {
+	bsc1: i2c@3e016000 {
 		compatible = "brcm,bcm11351-i2c", "brcm,kona-i2c";
 		reg = <0x3e016000 0x80>;
 		interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>;

@@ -171,7 +171,7 @@ i2c@3e016000 {
 		status = "disabled";
 	};
 
-	i2c@3e017000 {
+	bsc2: i2c@3e017000 {
 		compatible = "brcm,bcm11351-i2c", "brcm,kona-i2c";
 		reg = <0x3e017000 0x80>;
 		interrupts = <GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH>;

@@ -181,7 +181,7 @@ i2c@3e017000 {
 		status = "disabled";
 	};
 
-	i2c@3e018000 {
+	bsc3: i2c@3e018000 {
 		compatible = "brcm,bcm11351-i2c", "brcm,kona-i2c";
 		reg = <0x3e018000 0x80>;
 		interrupts = <GIC_SPI 169 IRQ_TYPE_LEVEL_HIGH>;

@@ -191,7 +191,7 @@ i2c@3e018000 {
 		status = "disabled";
 	};
 
-	i2c@3500d000 {
+	pmu_bsc: i2c@3500d000 {
 		compatible = "brcm,bcm11351-i2c", "brcm,kona-i2c";
 		reg = <0x3500d000 0x80>;
 		interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
arch/arm/boot/dts/bcm21664.dtsi +7 -7
index 9e3835a0a7ef..2eb7f5b0c1dc 100644
@@ -49,7 +49,7 @@ smc@3404e000 {
 		reg = <0x3404e000 0x400>; /* 1 KiB in SRAM */
 	};
 
-	serial@3e000000 {
+	uartb: serial@3e000000 {
 		compatible = "brcm,bcm21664-dw-apb-uart", "snps,dw-apb-uart";
 		reg = <0x3e000000 0x118>;
 		clocks = <&slave_ccu BCM21664_SLAVE_CCU_UARTB>;

@@ -59,7 +59,7 @@ serial@3e000000 {
 		status = "disabled";
 	};
 
-	serial@3e001000 {
+	uartb2: serial@3e001000 {
 		compatible = "brcm,bcm21664-dw-apb-uart", "snps,dw-apb-uart";
 		reg = <0x3e001000 0x118>;
 		clocks = <&slave_ccu BCM21664_SLAVE_CCU_UARTB2>;

@@ -69,7 +69,7 @@ serial@3e001000 {
 		status = "disabled";
 	};
 
-	serial@3e002000 {
+	uartb3: serial@3e002000 {
 		compatible = "brcm,bcm21664-dw-apb-uart", "snps,dw-apb-uart";
 		reg = <0x3e002000 0x118>;
 		clocks = <&slave_ccu BCM21664_SLAVE_CCU_UARTB3>;

@@ -144,7 +144,7 @@ sdio4: mmc@3f1b0000 {
 		status = "disabled";
 	};
 
-	i2c@3e016000 {
+	bsc1: i2c@3e016000 {
 		compatible = "brcm,bcm21664-i2c", "brcm,kona-i2c";
 		reg = <0x3e016000 0x70>;
 		interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>;

@@ -154,7 +154,7 @@ i2c@3e016000 {
 		status = "disabled";
 	};
 
-	i2c@3e017000 {
+	bsc2: i2c@3e017000 {
 		compatible = "brcm,bcm21664-i2c", "brcm,kona-i2c";
 		reg = <0x3e017000 0x70>;
 		interrupts = <GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH>;

@@ -164,7 +164,7 @@ i2c@3e017000 {
 		status = "disabled";
 	};
 
-	i2c@3e018000 {
+	bsc3: i2c@3e018000 {
 		compatible = "brcm,bcm21664-i2c", "brcm,kona-i2c";
 		reg = <0x3e018000 0x70>;
 		interrupts = <GIC_SPI 169 IRQ_TYPE_LEVEL_HIGH>;

@@ -174,7 +174,7 @@ i2c@3e018000 {
 		status = "disabled";
 	};
 
-	i2c@3e01c000 {
+	bsc4: i2c@3e01c000 {
 		compatible = "brcm,bcm21664-i2c", "brcm,kona-i2c";
 		reg = <0x3e01c000 0x70>;
 		interrupts = <GIC_SPI 170 IRQ_TYPE_LEVEL_HIGH>;
Signature · 1 line
2.25.1
author
#10 lore raw

PATCH 5/6 ARM: dts: bcm21664-garnet: use node labels

In reply to Stanislav Jakubek

Use node labels instead of nodename@address for BCM21664 Garnet to simplify its DTS file.

Signed-off-by Stanislav Jakubek <[email protected]>
---
 arch/arm/boot/dts/bcm21664-garnet.dts | 46 +++++++++++++--------------
 1 file changed, 23 insertions(+), 23 deletions(-)
arch/arm/boot/dts/bcm21664-garnet.dts +23 -23
index dead91d97b63..8789fae178bf 100644
@@ -15,33 +15,33 @@ memory@80000000 {
 		device_type = "memory";
 		reg = <0x80000000 0x40000000>; /* 1 GB */
 	};
+};
 
-	serial@3e000000 {
-		status = "okay";
-	};
+&sdio1 {
+	max-frequency = <48000000>;
+	status = "okay";
+};
 
-	sdio1: mmc@3f180000 {
-		max-frequency = <48000000>;
-		status = "okay";
-	};
+&sdio2 {
+	non-removable;
+	max-frequency = <48000000>;
+	status = "okay";
+};
 
-	sdio2: mmc@3f190000 {
-		non-removable;
-		max-frequency = <48000000>;
-		status = "okay";
-	};
+&sdio4 {
+	max-frequency = <48000000>;
+	cd-gpios = <&gpio 91 GPIO_ACTIVE_LOW>;
+	status = "okay";
+};
 
-	sdio4: mmc@3f1b0000 {
-		max-frequency = <48000000>;
-		cd-gpios = <&gpio 91 GPIO_ACTIVE_LOW>;
-		status = "okay";
-	};
+&uartb {
+	status = "okay";
+};
 
-	usbotg: usb@3f120000 {
-		status = "okay";
-	};
+&usbotg {
+	status = "okay";
+};
 
-	usbphy: usb-phy@3f130000 {
-		status = "okay";
-	};
+&usbphy {
+	status = "okay";
 };
Signature · 1 line
2.25.1
author
#12 lore raw

PATCH 6/6 ARM: dts: bcm28155-ap: use node labels

In reply to Stanislav Jakubek

Use node labels instead of nodename@address for BCM28155 AP board to simplify its DTS file.

Signed-off-by Stanislav Jakubek <[email protected]>

---
I was not sure what to do about the &pmu node here, so I left it as is.

 arch/arm/boot/dts/bcm28155-ap.dts | 110 +++++++++++++++---------------
 1 file changed, 55 insertions(+), 55 deletions(-)
arch/arm/boot/dts/bcm28155-ap.dts +55 -55
index 0a8ad1d673d8..08eea8b941b6 100644
@@ -15,64 +15,21 @@ memory@80000000 {
 		device_type = "memory";
 		reg = <0x80000000 0x40000000>; /* 1 GB */
 	};
+};
 
-	serial@3e000000 {
-		status = "okay";
-	};
-
-	i2c@3e016000 {
-		clock-frequency = <400000>;
-		status = "okay";
-	};
-
-	i2c@3e017000 {
-		clock-frequency = <400000>;
-		status = "okay";
-	};
-
-	i2c@3e018000 {
-		clock-frequency = <400000>;
-		status = "okay";
-	};
-
-	i2c@3500d000 {
-		clock-frequency = <100000>;
-		status = "okay";
-
-		pmu: pmu@8 {
-			reg = <0x08>;
-		};
-	};
-
-	sdio2: mmc@3f190000 {
-		non-removable;
-		max-frequency = <48000000>;
-		vmmc-supply = <&camldo1_reg>;
-		vqmmc-supply = <&iosr1_reg>;
-		status = "okay";
-	};
-
-	sdio4: mmc@3f1b0000 {
-		max-frequency = <48000000>;
-		cd-gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
-		vmmc-supply = <&sdldo_reg>;
-		vqmmc-supply = <&sdxldo_reg>;
-		status = "okay";
-	};
-
-	pwm: pwm@3e01a000 {
-		status = "okay";
-	};
+&bsc1 {
+	clock-frequency = <400000>;
+	status = "okay";
+};
 
-	usbotg: usb@3f120000 {
-		vusb_d-supply = <&usbldo_reg>;
-		vusb_a-supply = <&iosr1_reg>;
-		status = "okay";
-	};
+&bsc2 {
+	clock-frequency = <400000>;
+	status = "okay";
+};
 
-	usbphy: usb-phy@3f130000 {
-		status = "okay";
-	};
+&bsc3 {
+	clock-frequency = <400000>;
+	status = "okay";
 };
 
 #include "bcm59056.dtsi"

@@ -110,3 +67,46 @@ iosr1_reg: iosr1 {
 		};
 	};
 };
+
+&pmu_bsc {
+	clock-frequency = <100000>;
+	status = "okay";
+
+	pmu: pmu@8 {
+		reg = <0x08>;
+	};
+};
+
+&pwm {
+	status = "okay";
+};
+
+&sdio2 {
+	non-removable;
+	max-frequency = <48000000>;
+	vmmc-supply = <&camldo1_reg>;
+	vqmmc-supply = <&iosr1_reg>;
+	status = "okay";
+};
+
+&sdio4 {
+	max-frequency = <48000000>;
+	cd-gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
+	vmmc-supply = <&sdldo_reg>;
+	vqmmc-supply = <&sdxldo_reg>;
+	status = "okay";
+};
+
+&uartb {
+	status = "okay";
+};
+
+&usbotg {
+	vusb_d-supply = <&usbldo_reg>;
+	vusb_a-supply = <&iosr1_reg>;
+	status = "okay";
+};
+
+&usbphy {
+	status = "okay";
+};
Signature · 1 line
2.25.1
build bot
#13 lore raw

Re: [PATCH 6/6] ARM: dts: bcm28155-ap: use node labels

kernel test robot noticed the following build errors:

Hi Stanislav,

kernel test robot noticed the following build errors:

[auto build test ERROR on next-20230525]
[cannot apply to robh/for-next krzk/for-next krzk-dt/for-next krzk-mem-ctrl/for-next v6.4-rc3 v6.4-rc2 v6.4-rc1 linus/master v6.4-rc3] [If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]

url:    https://github.com/intel-lab-lkp/linux/commits/Stanislav-Jakubek/ARM-dts-bcm-mobile-change-includes-to-where-applicable/20230527-033251
base:   next-20230525
patch link:    https://lore.kernel.org/r/cb52d36db90fa24e40fccc69724a685344f2c2f3.1685127525.git.stano.jakubek%40gmail.com
patch subject: [PATCH 6/6] ARM: dts: bcm28155-ap: use node labels
config: arm-defconfig (https://download.01.org/0day-ci/archive/20230527/[email protected]/config)
compiler: arm-linux-gnueabi-gcc (GCC) 12.1.0

reproduce (this is a W=1 build):
mkdir -p ~/bin
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# https://github.com/intel-lab-lkp/linux/commit/42bbea48865bd029be4bb3c33c8d455645e3ff58
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Stanislav-Jakubek/ARM-dts-bcm-mobile-change-includes-to-where-applicable/20230527-033251 git checkout 42bbea48865bd029be4bb3c33c8d455645e3ff58
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.1.0 ~/bin/make.cross W=1 O=build_dir ARCH=arm olddefconfig COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.1.0 ~/bin/make.cross W=1 O=build_dir ARCH=arm SHELL=/bin/bash

If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/

All errors (new ones prefixed by >>):

>> Error: arch/arm/boot/dts/bcm59056.dtsi:7.1-5 Label or path pmu not found
>> Error: arch/arm/boot/dts/bcm28155-ap.dts:37.1-5 Label or path pmu not found
>> FATAL ERROR: Syntax error parsing input tree
Signature · 2 lines
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
#15 lore raw

Re: [PATCH 6/6] ARM: dts: bcm28155-ap: use node labels

Quoted 10 lines · Florian Fainelli

From: Florian Fainelli <[email protected]>

Quoted 5 lines · Stanislav Jakubek

Use node labels instead of nodename@address for BCM28155 AP board to simplify its DTS file.

Signed-off-by Stanislav Jakubek <[email protected]>

---

Applied to https://github.com/Broadcom/stblinux/commits/devicetree/next, thanks!

Dropped that one since the kernel test robot reported build failures, please fix and resubmit Stanislav, thanks!

Signature · 1 line
Florian
author
#16 lore raw

Re: [PATCH 6/6] ARM: dts: bcm28155-ap: use node labels

Quoted 7 lines · Florian Fainelli
Quoted 6 lines · Florian Fainelli

From: Florian Fainelli <[email protected]>

Quoted 3 lines · Stanislav Jakubek

Use node labels instead of nodename@address for BCM28155 AP board to simplify its DTS file.

Quoted 10 lines
Quoted 4 lines
Quoted 2 lines
Signed-off-by Stanislav Jakubek <[email protected]>

---

Applied to https://github.com/Broadcom/stblinux/commits/devicetree/next, thanks!

Dropped that one since the kernel test robot reported build failures, please fix and resubmit Stanislav, thanks!

Signature · 1 line
Florian

I'm not actually sure how to fix that. The interaction with the bcm59056.dtsi seems pretty weird to me. Though I could just be missing some obvious step, I'm still pretty new at this.

Any hints would be appreciated.

Stanislav