Skip to contentSkip to conversation

ARM: dts: imx23/8: Rename apbh and apbx nodes

PATCH Applied Fabio Estevam 3 participants 4 messages Aug 28, 2024 – Sep 3, 2024

Subsystems (3)
lore
Share & tools
lore

Fabio Estevam

author reviewer
#0 lore raw

PATCH 1/1 ARM: dts: imx23/8: Rename apbh and apbx nodes

From: Fabio Estevam <[email protected]>

According to simple-bus.yaml, apbh and apbx are not valid bus names.

Rename them to apbh-bus and apbx-bus to fix the following dt-schema warnings:

'apbh@80000000' does not match '^([a-z][a-z0-9\\-]+-bus|bus|localbus|soc|axi|ahb|apb)(@.+)?$'
'apbx@80040000' does not match '^([a-z][a-z0-9\\-]+-bus|bus|localbus|soc|axi|ahb|apb)(@.+)?$'
---
 arch/arm/boot/dts/nxp/mxs/imx23-evk.dts           | 4 ++--
 arch/arm/boot/dts/nxp/mxs/imx23-olinuxino.dts     | 4 ++--
 arch/arm/boot/dts/nxp/mxs/imx23-sansa.dts         | 4 ++--
 arch/arm/boot/dts/nxp/mxs/imx23-stmp378x_devb.dts | 4 ++--
 arch/arm/boot/dts/nxp/mxs/imx23-xfi3.dts          | 4 ++--
 arch/arm/boot/dts/nxp/mxs/imx23.dtsi              | 4 ++--
 arch/arm/boot/dts/nxp/mxs/imx28-cfa10037.dts      | 2 +-
 arch/arm/boot/dts/nxp/mxs/imx28.dtsi              | 4 ++--
 8 files changed, 15 insertions(+), 15 deletions(-)
arch/arm/boot/dts/nxp/mxs/imx23-evk.dts +2 -2
index 7365fe4581a3..33b36af1656f 100644
@@ -52,7 +52,7 @@ panel_in: endpoint {
 	};
 
 	apb@80000000 {
-		apbh@80000000 {
+		apbh-bus@80000000 {
 			nand-controller@8000c000 {
 				pinctrl-names = "default";
 				pinctrl-0 = <&gpmi_pins_a &gpmi_pins_fixup>;
@@ -99,7 +99,7 @@ display_out: endpoint {
 			};
 		};
 
-		apbx@80040000 {
+		apbx-bus@80040000 {
 			lradc@80050000 {
 				status = "okay";
 				fsl,lradc-touchscreen-wires = <4>;
arch/arm/boot/dts/nxp/mxs/imx23-olinuxino.dts +2 -2
index 229e727b222e..e372e9327a47 100644
@@ -19,7 +19,7 @@ memory@40000000 {
 	};
 
 	apb@80000000 {
-		apbh@80000000 {
+		apbh-bus@80000000 {
 			ssp0: spi@80010000 {
 				compatible = "fsl,imx23-mmc";
 				pinctrl-names = "default";
@@ -64,7 +64,7 @@ ssp1: spi@80034000 {
 			};
 		};
 
-		apbx@80040000 {
+		apbx-bus@80040000 {
 			lradc@80050000 {
 				status = "okay";
 			};
arch/arm/boot/dts/nxp/mxs/imx23-sansa.dts +2 -2
index b23e7ada9c80..cb661bf2d157 100644
@@ -55,7 +55,7 @@ memory@40000000 {
 	};
 
 	apb@80000000 {
-		apbh@80000000 {
+		apbh-bus@80000000 {
 			ssp0: spi@80010000 {
 				compatible = "fsl,imx23-mmc";
 				pinctrl-names = "default";
@@ -100,7 +100,7 @@ MX23_PAD_PWM3__GPIO_1_29
 			};
 		};
 
-		apbx@80040000 {
+		apbx-bus@80040000 {
 			pwm: pwm@80064000 {
 				pinctrl-names = "default";
 				pinctrl-0 = <&pwm2_pins_a>;
arch/arm/boot/dts/nxp/mxs/imx23-stmp378x_devb.dts +2 -2
index 69124ba6a666..b2b6f8514999 100644
@@ -16,7 +16,7 @@ memory@40000000 {
 	};
 
 	apb@80000000 {
-		apbh@80000000 {
+		apbh-bus@80000000 {
 			ssp0: spi@80010000 {
 				compatible = "fsl,imx23-mmc";
 				pinctrl-names = "default";
@@ -44,7 +44,7 @@ MX23_PAD_PWM4__GPIO_1_30
 			};
 		};
 
-		apbx@80040000 {
+		apbx-bus@80040000 {
 			auart0: serial@8006c000 {
 				pinctrl-names = "default";
 				pinctrl-0 = <&auart0_pins_a>;
arch/arm/boot/dts/nxp/mxs/imx23-xfi3.dts +2 -2
index 28341d8315c2..0b088c8ab6b6 100644
@@ -54,7 +54,7 @@ memory@40000000 {
 	};
 
 	apb@80000000 {
-		apbh@80000000 {
+		apbh-bus@80000000 {
 			ssp0: spi@80010000 {
 				compatible = "fsl,imx23-mmc";
 				pinctrl-names = "default";
@@ -101,7 +101,7 @@ MX23_PAD_ROTARYB__GPIO_2_8
 			};
 		};
 
-		apbx@80040000 {
+		apbx-bus@80040000 {
 			i2c: i2c@80058000 {
 				pinctrl-names = "default";
 				pinctrl-0 = <&i2c_pins_a>;
arch/arm/boot/dts/nxp/mxs/imx23.dtsi +2 -2
index 0309592af1e1..5e21252fb7c9 100644
@@ -45,7 +45,7 @@ apb@80000000 {
 		reg = <0x80000000 0x80000>;
 		ranges;
 
-		apbh@80000000 {
+		apbh-bus@80000000 {
 			compatible = "simple-bus";
 			#address-cells = <1>;
 			#size-cells = <1>;
@@ -476,7 +476,7 @@ tvenc@80038000 {
 			};
 		};
 
-		apbx@80040000 {
+		apbx-bus@80040000 {
 			compatible = "simple-bus";
 			#address-cells = <1>;
 			#size-cells = <1>;
arch/arm/boot/dts/nxp/mxs/imx28-cfa10037.dts +1 -1
index c72fe2d392f1..9053472ed6b9 100644
@@ -38,7 +38,7 @@ MX28_PAD_SSP2_SS2__GPIO_2_21
 			};
 		};
 
-		apbx@80040000 {
+		apbx-bus@80040000 {
 			usbphy1: usbphy@8007e000 {
 				status = "okay";
 			};
arch/arm/boot/dts/nxp/mxs/imx28.dtsi +2 -2
index 4817fba2d938..bbea8b77386f 100644
@@ -56,7 +56,7 @@ apb@80000000 {
 		reg = <0x80000000 0x80000>;
 		ranges;
 
-		apbh@80000000 {
+		apbh-bus@80000000 {
 			compatible = "simple-bus";
 			#address-cells = <1>;
 			#size-cells = <1>;
@@ -1092,7 +1092,7 @@ armjtag: armjtag@8003c800 {
 			};
 		};
 
-		apbx@80040000 {
+		apbx-bus@80040000 {
 			compatible = "simple-bus";
 			#address-cells = <1>;
 			#size-cells = <1>;
Signature · 1 line
2.34.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 183 lines · On Wed, 28 Aug 2024 16:49:19 -0300 Fabio Estevam <[email protected]> wrote:

From: Fabio Estevam <[email protected]>

According to simple-bus.yaml, apbh and apbx are not valid bus names.

Rename them to apbh-bus and apbx-bus to fix the following dt-schema warnings:

'apbh@80000000' does not match '^([a-z][a-z0-9\\-]+-bus|bus|localbus|soc|axi|ahb|apb)(@.+)?$' 'apbx@80040000' does not match '^([a-z][a-z0-9\\-]+-bus|bus|localbus|soc|axi|ahb|apb)(@.+)?$'

---
 arch/arm/boot/dts/nxp/mxs/imx23-evk.dts           | 4 ++--
 arch/arm/boot/dts/nxp/mxs/imx23-olinuxino.dts     | 4 ++--
 arch/arm/boot/dts/nxp/mxs/imx23-sansa.dts         | 4 ++--
 arch/arm/boot/dts/nxp/mxs/imx23-stmp378x_devb.dts | 4 ++--
 arch/arm/boot/dts/nxp/mxs/imx23-xfi3.dts          | 4 ++--
 arch/arm/boot/dts/nxp/mxs/imx23.dtsi              | 4 ++--
 arch/arm/boot/dts/nxp/mxs/imx28-cfa10037.dts      | 2 +-
 arch/arm/boot/dts/nxp/mxs/imx28.dtsi              | 4 ++--
 8 files changed, 15 insertions(+), 15 deletions(-)
(quoted diff) +0 -0

b/arch/arm/boot/dts/nxp/mxs/imx23-evk.dts index 7365fe4581a3..33b36af1656f 100644 --- a/arch/arm/boot/dts/nxp/mxs/imx23-evk.dts +++ b/arch/arm/boot/dts/nxp/mxs/imx23-evk.dts @@ -52,7 +52,7 @@ panel_in:
endpoint { };

arch/arm/boot/dts/nxp/mxs/imx23-evk.dts +1 -1
 	apb@80000000 {
-		apbh@80000000 {
+		apbh-bus@80000000 {
 			nand-controller@8000c000 {
 				pinctrl-names = "default";
 				pinctrl-0 = <&gpmi_pins_a

&gpmi_pins_fixup>; @@ -99,7 +99,7 @@ display_out: endpoint {

arch/arm/boot/dts/nxp/mxs/imx23-evk.dts +1 -1
 			};
 		};
 
-		apbx@80040000 {
+		apbx-bus@80040000 {
 			lradc@80050000 {
 				status = "okay";
 				fsl,lradc-touchscreen-wires = <4>;
(quoted diff) +0 -0

b/arch/arm/boot/dts/nxp/mxs/imx23-olinuxino.dts index 229e727b222e..e372e9327a47 100644 --- a/arch/arm/boot/dts/nxp/mxs/imx23-olinuxino.dts +++ b/arch/arm/boot/dts/nxp/mxs/imx23-olinuxino.dts @@ -19,7 +19,7 @@ memory@40000000 { };

arch/arm/boot/dts/nxp/mxs/imx23-olinuxino.dts +2 -2
 	apb@80000000 {
-		apbh@80000000 {
+		apbh-bus@80000000 {
 			ssp0: spi@80010000 {
 				compatible = "fsl,imx23-mmc";
 				pinctrl-names = "default";
@@ -64,7 +64,7 @@ ssp1: spi@80034000 {
 			};
 		};
 
-		apbx@80040000 {
+		apbx-bus@80040000 {
 			lradc@80050000 {
 				status = "okay";
 			};
(quoted diff) +0 -0

b/arch/arm/boot/dts/nxp/mxs/imx23-sansa.dts index b23e7ada9c80..cb661bf2d157 100644 --- a/arch/arm/boot/dts/nxp/mxs/imx23-sansa.dts +++ b/arch/arm/boot/dts/nxp/mxs/imx23-sansa.dts @@ -55,7 +55,7 @@ memory@40000000 { };

arch/arm/boot/dts/nxp/mxs/imx23-olinuxino.dts +2 -2
 	apb@80000000 {
-		apbh@80000000 {
+		apbh-bus@80000000 {
 			ssp0: spi@80010000 {
 				compatible = "fsl,imx23-mmc";
 				pinctrl-names = "default";
@@ -100,7 +100,7 @@ MX23_PAD_PWM3__GPIO_1_29
 			};
 		};
 
-		apbx@80040000 {
+		apbx-bus@80040000 {
 			pwm: pwm@80064000 {
 				pinctrl-names = "default";
 				pinctrl-0 = <&pwm2_pins_a>;
(quoted diff) +0 -0

b/arch/arm/boot/dts/nxp/mxs/imx23-stmp378x_devb.dts index 69124ba6a666..b2b6f8514999 100644 --- a/arch/arm/boot/dts/nxp/mxs/imx23-stmp378x_devb.dts +++ b/arch/arm/boot/dts/nxp/mxs/imx23-stmp378x_devb.dts @@ -16,7 +16,7 @@ memory@40000000 { };

arch/arm/boot/dts/nxp/mxs/imx23-olinuxino.dts +2 -2
 	apb@80000000 {
-		apbh@80000000 {
+		apbh-bus@80000000 {
 			ssp0: spi@80010000 {
 				compatible = "fsl,imx23-mmc";
 				pinctrl-names = "default";
@@ -44,7 +44,7 @@ MX23_PAD_PWM4__GPIO_1_30
 			};
 		};
 
-		apbx@80040000 {
+		apbx-bus@80040000 {
 			auart0: serial@8006c000 {
 				pinctrl-names = "default";
 				pinctrl-0 = <&auart0_pins_a>;
(quoted diff) +0 -0

b/arch/arm/boot/dts/nxp/mxs/imx23-xfi3.dts index 28341d8315c2..0b088c8ab6b6 100644 --- a/arch/arm/boot/dts/nxp/mxs/imx23-xfi3.dts +++ b/arch/arm/boot/dts/nxp/mxs/imx23-xfi3.dts @@ -54,7 +54,7 @@ memory@40000000 { };

arch/arm/boot/dts/nxp/mxs/imx23-olinuxino.dts +2 -2
 	apb@80000000 {
-		apbh@80000000 {
+		apbh-bus@80000000 {
 			ssp0: spi@80010000 {
 				compatible = "fsl,imx23-mmc";
 				pinctrl-names = "default";
@@ -101,7 +101,7 @@ MX23_PAD_ROTARYB__GPIO_2_8
 			};
 		};
 
-		apbx@80040000 {
+		apbx-bus@80040000 {
 			i2c: i2c@80058000 {
 				pinctrl-names = "default";
 				pinctrl-0 = <&i2c_pins_a>;
(quoted diff) +0 -0

b/arch/arm/boot/dts/nxp/mxs/imx23.dtsi index 0309592af1e1..5e21252fb7c9 100644 --- a/arch/arm/boot/dts/nxp/mxs/imx23.dtsi +++ b/arch/arm/boot/dts/nxp/mxs/imx23.dtsi @@ -45,7 +45,7 @@ apb@80000000 { reg = <0x80000000 0x80000>;

arch/arm/boot/dts/nxp/mxs/imx23.dtsi +2 -2
 		ranges;
 
-		apbh@80000000 {
+		apbh-bus@80000000 {
 			compatible = "simple-bus";
 			#address-cells = <1>;
 			#size-cells = <1>;
@@ -476,7 +476,7 @@ tvenc@80038000 {
 			};
 		};
 
-		apbx@80040000 {
+		apbx-bus@80040000 {
 			compatible = "simple-bus";
 			#address-cells = <1>;
 			#size-cells = <1>;
(quoted diff) +0 -0

b/arch/arm/boot/dts/nxp/mxs/imx28-cfa10037.dts index c72fe2d392f1..9053472ed6b9 100644 --- a/arch/arm/boot/dts/nxp/mxs/imx28-cfa10037.dts +++ b/arch/arm/boot/dts/nxp/mxs/imx28-cfa10037.dts @@ -38,7 +38,7 @@ MX28_PAD_SSP2_SS2__GPIO_2_21 };

arch/arm/boot/dts/nxp/mxs/imx28-cfa10037.dts +1 -1
 		};
 
-		apbx@80040000 {
+		apbx-bus@80040000 {
 			usbphy1: usbphy@8007e000 {
 				status = "okay";
 			};
(quoted diff) +0 -0

b/arch/arm/boot/dts/nxp/mxs/imx28.dtsi index 4817fba2d938..bbea8b77386f 100644 --- a/arch/arm/boot/dts/nxp/mxs/imx28.dtsi +++ b/arch/arm/boot/dts/nxp/mxs/imx28.dtsi @@ -56,7 +56,7 @@ apb@80000000 { reg = <0x80000000 0x80000>;

arch/arm/boot/dts/nxp/mxs/imx23.dtsi +1 -1
 		ranges;
 
-		apbh@80000000 {
+		apbh-bus@80000000 {
 			compatible = "simple-bus";
 			#address-cells = <1>;
 			#size-cells = <1>;

arch/arm/boot/dts/nxp/mxs/imx23.dtsi armjtag: armjtag@8003c800 { · line 1098

Quoted 8 lines
arch/arm/boot/dts/nxp/mxs/imx23.dtsi +1 -1
@@ -1092,7 +1092,7 @@ armjtag: armjtag@8003c800 {
 			};
 		};
 
-		apbx@80040000 {
+		apbx-bus@80040000 {
 			compatible = "simple-bus";
 			#address-cells = <1>;
 			#size-cells = <1>;

Best regards,

Lukasz Majewski

--

DENX Software Engineering GmbH, Managing Director: Erika Unter
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: [email protected]

Applied
#2 lore raw
In reply to Fabio Estevam
Quoted 11 lines · Fabio Estevam

From: Fabio Estevam <[email protected]>

According to simple-bus.yaml, apbh and apbx are not valid bus names.

Rename them to apbh-bus and apbx-bus to fix the following dt-schema warnings:

'apbh@80000000' does not match '^([a-z][a-z0-9\\-]+-bus|bus|localbus|soc|axi|ahb|apb)(@.+)?$'
'apbx@80040000' does not match '^([a-z][a-z0-9\\-]+-bus|bus|localbus|soc|axi|ahb|apb)(@.+)?$'

Applied, thanks!

#3 lore raw
In reply to Fabio Estevam
Quoted 11 lines · Fabio Estevam

From: Fabio Estevam <[email protected]>

According to simple-bus.yaml, apbh and apbx are not valid bus names.

Rename them to apbh-bus and apbx-bus to fix the following dt-schema warnings:

'apbh@80000000' does not match '^([a-z][a-z0-9\\-]+-bus|bus|localbus|soc|axi|ahb|apb)(@.+)?$'
'apbx@80040000' does not match '^([a-z][a-z0-9\\-]+-bus|bus|localbus|soc|axi|ahb|apb)(@.+)?$'
Quoted 8 lines
---
 arch/arm/boot/dts/nxp/mxs/imx23-evk.dts           | 4 ++--
 arch/arm/boot/dts/nxp/mxs/imx23-olinuxino.dts     | 4 ++--
 arch/arm/boot/dts/nxp/mxs/imx23-sansa.dts         | 4 ++--
 arch/arm/boot/dts/nxp/mxs/imx23-stmp378x_devb.dts | 4 ++--
 arch/arm/boot/dts/nxp/mxs/imx23-xfi3.dts          | 4 ++--
 arch/arm/boot/dts/nxp/mxs/imx23.dtsi              | 4 ++--
 arch/arm/boot/dts/nxp/mxs/imx28-cfa10037.dts      | 2 +-

I think imx28-cfa10037.dts missed the change below.

@@ -14,7 +14,7 @@ / {
        compatible = "crystalfontz,cfa10037", "crystalfontz,cfa10036", "fsl,imx28";
 
        apb@80000000 {
-               apbh@80000000 {
+               apbh-bus@80000000 {
                        pinctrl@80018000 {
                                usb_pins_cfa10037: usb-10037@0 {
                                        reg = <0>;

I fixed it up.

Shawn

Quoted 2 lines
 arch/arm/boot/dts/nxp/mxs/imx28.dtsi              | 4 ++--
 8 files changed, 15 insertions(+), 15 deletions(-)