mail archive of the barebox mailing list
 help / color / mirror / Atom feed
* [PATCH 0/8] Fix/avoid dtc warnings
@ 2023-03-02 10:39 Sascha Hauer
  2023-03-02 10:39 ` [PATCH 1/8] scripts: dtc: disable interrupt_provider warnings Sascha Hauer
                   ` (7 more replies)
  0 siblings, 8 replies; 12+ messages in thread
From: Sascha Hauer @ 2023-03-02 10:39 UTC (permalink / raw)
  To: Barebox List

This series fixes some dtc warnings. Also we disable some warnings that
are also not enabled in the Kernel where we get the upstream device
trees from.

Sascha Hauer (8):
  scripts: dtc: disable interrupt_provider warnings
  ARM: dts: digic4: Fix dtc warnings
  ARM: dts: ep7212-clep7212: Fix dtc warnings
  ARM: dts: Fix dtc warnings in state nodes
  ARM: dts: Fix dtc warnings in barebox,environment nodes
  ARM: dts: imx7d-peb-av-02: Fix dtc warning
  ARM: dts: imx7d-peb-eval-02: Fix dtc warnings
  ARM: dts: imx6ull-jozacp: Move regulators out of subnode

 arch/arm/dts/digic4.dtsi               |  4 +-
 arch/arm/dts/ep7212-clep7212.dts       |  2 +-
 arch/arm/dts/imx6dl-prtvt7.dts         |  4 +-
 arch/arm/dts/imx6qdl-prti6q-emmc.dtsi  | 16 +++---
 arch/arm/dts/imx6qdl-skov-imx6.dtsi    |  2 +-
 arch/arm/dts/imx6ul-phytec-state.dtsi  | 16 +++---
 arch/arm/dts/imx6ul-prti6g.dts         |  2 +-
 arch/arm/dts/imx6ul-webasto-ccbv2.dts  |  2 -
 arch/arm/dts/imx6ul-webasto-marvel.dts |  2 -
 arch/arm/dts/imx6ull-jozacp.dts        |  2 +-
 arch/arm/dts/imx6ull-jozacp.dtsi       | 72 ++++++++++++--------------
 arch/arm/dts/imx7d-peb-av-02.dtsi      |  2 +-
 arch/arm/dts/imx7d-peb-eval-02.dtsi    | 12 ++---
 scripts/Makefile.lib                   |  4 +-
 14 files changed, 65 insertions(+), 77 deletions(-)

-- 
2.30.2




^ permalink raw reply	[flat|nested] 12+ messages in thread

* [PATCH 1/8] scripts: dtc: disable interrupt_provider warnings
  2023-03-02 10:39 [PATCH 0/8] Fix/avoid dtc warnings Sascha Hauer
@ 2023-03-02 10:39 ` Sascha Hauer
  2023-03-02 10:39 ` [PATCH 2/8] ARM: dts: digic4: Fix dtc warnings Sascha Hauer
                   ` (6 subsequent siblings)
  7 siblings, 0 replies; 12+ messages in thread
From: Sascha Hauer @ 2023-03-02 10:39 UTC (permalink / raw)
  To: Barebox List

The kernel disabled interrupt provider warnings with
-Wno-interrupt_provide. Do likewise to avoid generating warnings that
we would have to fix in the imported kernel dts files.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 scripts/Makefile.lib | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 6e0d92cf75..4da5bb4ee7 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -345,11 +345,11 @@ DTC_FLAGS += -Wno-unit_address_vs_reg \
 	 -Wno-unit_address_format \
 	 -Wno-avoid_unnecessary_addr_size \
 	 -Wno-alias_paths \
-	 -Wno-alias_paths \
 	 -Wno-graph_child_address \
 	 -Wno-simple_bus_reg \
 	 -Wno-unique_unit_address \
-	 -Wno-pci_device_reg
+	 -Wno-pci_device_reg \
+	 -Wno-interrupt_provider
 
 ifeq ($(CONFIG_OF_OVERLAY_LIVE), y)
 DTC_FLAGS += -@
-- 
2.30.2




^ permalink raw reply	[flat|nested] 12+ messages in thread

* [PATCH 2/8] ARM: dts: digic4: Fix dtc warnings
  2023-03-02 10:39 [PATCH 0/8] Fix/avoid dtc warnings Sascha Hauer
  2023-03-02 10:39 ` [PATCH 1/8] scripts: dtc: disable interrupt_provider warnings Sascha Hauer
@ 2023-03-02 10:39 ` Sascha Hauer
  2023-03-02 10:39 ` [PATCH 3/8] ARM: dts: ep7212-clep7212: " Sascha Hauer
                   ` (5 subsequent siblings)
  7 siblings, 0 replies; 12+ messages in thread
From: Sascha Hauer @ 2023-03-02 10:39 UTC (permalink / raw)
  To: Barebox List

Fixes:

arch/arm/dts/digic4.dtsi:34.13-39.4: Warning (unit_address_vs_reg):
/gpio: node has a reg or ranges property, but no unit name
arch/arm/dts/digic4.dtsi:41.13-44.4: Warning (unit_address_vs_reg):
/uart: node has a reg or ranges property, but no unit name
arch/arm/dts/canon-a1100.dts:9.9-12.4: Warning (unit_address_vs_reg):
/memory: node has a reg or ranges property, but no unit name

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/arm/dts/digic4.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/dts/digic4.dtsi b/arch/arm/dts/digic4.dtsi
index 2db9393b33..051d8aad44 100644
--- a/arch/arm/dts/digic4.dtsi
+++ b/arch/arm/dts/digic4.dtsi
@@ -31,14 +31,14 @@
 	 * Assume that DIGIC4 has at least 96 pins.
 	 * So resource size is 96 * 4 = 0x180.
 	 */
-	gpio: gpio {
+	gpio: gpio@c0220000 {
 		compatible = "canon,digic-gpio";
 		reg = <0xc0220000 0x180>;
 		#gpio-cells = <2>;
 		gpio-controller;
 	};
 
-	uart: uart {
+	uart: uart@c0800000 {
 		compatible = "canon,digic-uart";
 		reg = <0xc0800000 0x1c>;
 	};
-- 
2.30.2




^ permalink raw reply	[flat|nested] 12+ messages in thread

* [PATCH 3/8] ARM: dts: ep7212-clep7212: Fix dtc warnings
  2023-03-02 10:39 [PATCH 0/8] Fix/avoid dtc warnings Sascha Hauer
  2023-03-02 10:39 ` [PATCH 1/8] scripts: dtc: disable interrupt_provider warnings Sascha Hauer
  2023-03-02 10:39 ` [PATCH 2/8] ARM: dts: digic4: Fix dtc warnings Sascha Hauer
@ 2023-03-02 10:39 ` Sascha Hauer
  2023-03-02 10:39 ` [PATCH 4/8] ARM: dts: Fix dtc warnings in state nodes Sascha Hauer
                   ` (4 subsequent siblings)
  7 siblings, 0 replies; 12+ messages in thread
From: Sascha Hauer @ 2023-03-02 10:39 UTC (permalink / raw)
  To: Barebox List

Fixes:

arch/arm/dts/ep7212-clep7212.dts:33.17-63.4: Warning (simple_bus_reg):
/soc/bus@80000180/nor@0,0: simple-bus unit address format error,
expected "0"

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/arm/dts/ep7212-clep7212.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/dts/ep7212-clep7212.dts b/arch/arm/dts/ep7212-clep7212.dts
index 701bc20bd8..a4f43d13da 100644
--- a/arch/arm/dts/ep7212-clep7212.dts
+++ b/arch/arm/dts/ep7212-clep7212.dts
@@ -30,7 +30,7 @@
 	/* CS3 = WAITSTATE_7_1 | BUS_WIDTH_32 */
 	barebox,ep7209-memcfg1 = <0x25802b28>;
 
-	flash: nor@0,0 {
+	flash: nor@0 {
 		compatible = "cfi-flash";
 		reg = <0 0x00000000 0x02000000>;
 		bank-width = <2>;
-- 
2.30.2




^ permalink raw reply	[flat|nested] 12+ messages in thread

* [PATCH 4/8] ARM: dts: Fix dtc warnings in state nodes
  2023-03-02 10:39 [PATCH 0/8] Fix/avoid dtc warnings Sascha Hauer
                   ` (2 preceding siblings ...)
  2023-03-02 10:39 ` [PATCH 3/8] ARM: dts: ep7212-clep7212: " Sascha Hauer
@ 2023-03-02 10:39 ` Sascha Hauer
  2023-03-02 10:39 ` [PATCH 5/8] ARM: dts: Fix dtc warnings in barebox,environment nodes Sascha Hauer
                   ` (3 subsequent siblings)
  7 siblings, 0 replies; 12+ messages in thread
From: Sascha Hauer @ 2023-03-02 10:39 UTC (permalink / raw)
  To: Barebox List

Many state variables have a reg property, but no unit name. Also some
unnecessary #size-cells and #address-cells are removed.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/arm/dts/imx6dl-prtvt7.dts         |  4 +++-
 arch/arm/dts/imx6qdl-prti6q-emmc.dtsi  | 14 ++++++--------
 arch/arm/dts/imx6qdl-skov-imx6.dtsi    |  2 +-
 arch/arm/dts/imx6ul-phytec-state.dtsi  | 16 +++++++---------
 arch/arm/dts/imx6ul-webasto-ccbv2.dts  |  2 --
 arch/arm/dts/imx6ul-webasto-marvel.dts |  2 --
 6 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/arch/arm/dts/imx6dl-prtvt7.dts b/arch/arm/dts/imx6dl-prtvt7.dts
index 19794add17..dcfde2c8c6 100644
--- a/arch/arm/dts/imx6dl-prtvt7.dts
+++ b/arch/arm/dts/imx6dl-prtvt7.dts
@@ -6,8 +6,10 @@
 
 &state_emmc {
 	magic = <0x72766467>;
+	#address-cells = <1>;
+	#size-cells = <1>;
 
-	brand {
+	brand@1b0 {
 		reg = <0x1b0 0x4>;
 		type = "enum32";
 		names = "unbranded", "agco", "vermeer";
diff --git a/arch/arm/dts/imx6qdl-prti6q-emmc.dtsi b/arch/arm/dts/imx6qdl-prti6q-emmc.dtsi
index 8ad41174d4..581ff349a4 100644
--- a/arch/arm/dts/imx6qdl-prti6q-emmc.dtsi
+++ b/arch/arm/dts/imx6qdl-prti6q-emmc.dtsi
@@ -20,8 +20,6 @@
 		backend-type = "raw";
 		backend = <&state_backend_emmc>;
 		backend-stridesize = <0x400>;
-		#address-cells = <1>;
-		#size-cells = <1>;
 
 		bootstate {
 			#address-cells = <1>;
@@ -31,13 +29,13 @@
 				#address-cells = <1>;
 				#size-cells = <1>;
 
-				remaining_attempts {
+				remaining_attempts@0 {
 					reg = <0x0 0x4>;
 					type = "uint32";
 					default = <3>;
 				};
 
-				priority {
+				priority@4 {
 					reg = <0x4 0x4>;
 					type = "uint32";
 					default = <21>;
@@ -48,20 +46,20 @@
 				#address-cells = <1>;
 				#size-cells = <1>;
 
-				remaining_attempts {
+				remaining_attempts@10 {
 					reg = <0x10 0x4>;
 					type = "uint32";
 					default = <3>;
 				};
 
-				priority {
+				priority@14 {
 					reg = <0x14 0x4>;
 					type = "uint32";
 					default = <20>;
 				};
 			};
 
-			last_chosen {
+			last_chosen@20 {
 				reg = <0x20 0x4>;
 				type = "uint32";
 			};
@@ -71,7 +69,7 @@
 			#address-cells = <1>;
 			#size-cells = <1>;
 
-			data_partitions {
+			data_partitions@26 {
 				reg = <0x26 0x100>;
 				type = "string";
 			};
diff --git a/arch/arm/dts/imx6qdl-skov-imx6.dtsi b/arch/arm/dts/imx6qdl-skov-imx6.dtsi
index cb4224f1b4..12be8ee4f7 100644
--- a/arch/arm/dts/imx6qdl-skov-imx6.dtsi
+++ b/arch/arm/dts/imx6qdl-skov-imx6.dtsi
@@ -113,7 +113,7 @@
 			#address-cells = <1>;
 			#size-cells = <1>;
 
-			eth2 {
+			eth2@1e {
 				reg = <0x1E 0x6>;
 				type = "mac";
 				default = [00 11 22 33 44 55];
diff --git a/arch/arm/dts/imx6ul-phytec-state.dtsi b/arch/arm/dts/imx6ul-phytec-state.dtsi
index 78a32ed96b..d0cad1b516 100644
--- a/arch/arm/dts/imx6ul-phytec-state.dtsi
+++ b/arch/arm/dts/imx6ul-phytec-state.dtsi
@@ -18,29 +18,27 @@
 		backend-stridesize = <54>;
 		status = "disabled";
 
-		#address-cells = <1>;
-		#size-cells = <1>;
 		bootstate {
 			#address-cells = <1>;
 			#size-cells = <1>;
-			last_chosen {
+			last_chosen@0 {
 				reg = <0x0 0x4>;
 				type = "uint32";
 			};
 			system0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				remaining_attempts {
+				remaining_attempts@4 {
 					reg = <0x4 0x4>;
 					type = "uint32";
 					default = <3>;
 				};
-				priority {
+				priority@8 {
 					reg = <0x8 0x4>;
 					type = "uint32";
 					default = <21>;
 				};
-				ok {
+				ok@c {
 					reg = <0xc 0x4>;
 					type = "uint32";
 					default = <0>;
@@ -49,17 +47,17 @@
 			system1 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				remaining_attempts {
+				remaining_attempts@10 {
 					reg = <0x10 0x4>;
 					type = "uint32";
 					default = <3>;
 				};
-				priority {
+				priority@14 {
 					reg = <0x14 0x4>;
 					type = "uint32";
 					default = <20>;
 				};
-				ok {
+				ok@18 {
 					reg = <0x18 0x4>;
 					type = "uint32";
 					default = <0>;
diff --git a/arch/arm/dts/imx6ul-webasto-ccbv2.dts b/arch/arm/dts/imx6ul-webasto-ccbv2.dts
index 93e9445b48..198088bd44 100644
--- a/arch/arm/dts/imx6ul-webasto-ccbv2.dts
+++ b/arch/arm/dts/imx6ul-webasto-ccbv2.dts
@@ -32,8 +32,6 @@
 	};
 
 	state_emmc: state {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "barebox,state";
 		magic = <0x290cf8c6>;
 		backend-type = "raw";
diff --git a/arch/arm/dts/imx6ul-webasto-marvel.dts b/arch/arm/dts/imx6ul-webasto-marvel.dts
index b8ecb00c8c..300cd5cf4b 100644
--- a/arch/arm/dts/imx6ul-webasto-marvel.dts
+++ b/arch/arm/dts/imx6ul-webasto-marvel.dts
@@ -38,8 +38,6 @@
 	};
 
 	state_emmc: state {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "barebox,state";
 		magic = <0x290cf8c6>;
 		backend-type = "raw";
-- 
2.30.2




^ permalink raw reply	[flat|nested] 12+ messages in thread

* [PATCH 5/8] ARM: dts: Fix dtc warnings in barebox,environment nodes
  2023-03-02 10:39 [PATCH 0/8] Fix/avoid dtc warnings Sascha Hauer
                   ` (3 preceding siblings ...)
  2023-03-02 10:39 ` [PATCH 4/8] ARM: dts: Fix dtc warnings in state nodes Sascha Hauer
@ 2023-03-02 10:39 ` Sascha Hauer
  2023-03-02 10:39 ` [PATCH 6/8] ARM: dts: imx7d-peb-av-02: Fix dtc warning Sascha Hauer
                   ` (2 subsequent siblings)
  7 siblings, 0 replies; 12+ messages in thread
From: Sascha Hauer @ 2023-03-02 10:39 UTC (permalink / raw)
  To: Barebox List

Some environment nodes have a unit name, but no reg property. Remove
the unit name.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/arm/dts/imx6qdl-prti6q-emmc.dtsi | 2 +-
 arch/arm/dts/imx6ul-prti6g.dts        | 2 +-
 arch/arm/dts/imx6ull-jozacp.dts       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/dts/imx6qdl-prti6q-emmc.dtsi b/arch/arm/dts/imx6qdl-prti6q-emmc.dtsi
index 581ff349a4..c9c75a9ade 100644
--- a/arch/arm/dts/imx6qdl-prti6q-emmc.dtsi
+++ b/arch/arm/dts/imx6qdl-prti6q-emmc.dtsi
@@ -8,7 +8,7 @@
 	chosen {
 		stdout-path = &uart4;
 
-		environment@0 {
+		environment {
 			compatible = "barebox,environment";
 			device-path = &env_sd3;
 		};
diff --git a/arch/arm/dts/imx6ul-prti6g.dts b/arch/arm/dts/imx6ul-prti6g.dts
index 3efbf357f1..23fafa0dce 100644
--- a/arch/arm/dts/imx6ul-prti6g.dts
+++ b/arch/arm/dts/imx6ul-prti6g.dts
@@ -7,7 +7,7 @@
 	chosen {
 		stdout-path = &uart4;
 
-		environment@0 {
+		environment {
 			compatible = "barebox,environment";
 			device-path = &env_sd2;
 		};
diff --git a/arch/arm/dts/imx6ull-jozacp.dts b/arch/arm/dts/imx6ull-jozacp.dts
index c30ba759ee..612dac67ca 100644
--- a/arch/arm/dts/imx6ull-jozacp.dts
+++ b/arch/arm/dts/imx6ull-jozacp.dts
@@ -7,7 +7,7 @@
 	chosen {
 		stdout-path = &uart1;
 
-		environment@0 {
+		environment {
 			compatible = "barebox,environment";
 			device-path = &env_sd1;
 		};
-- 
2.30.2




^ permalink raw reply	[flat|nested] 12+ messages in thread

* [PATCH 6/8] ARM: dts: imx7d-peb-av-02: Fix dtc warning
  2023-03-02 10:39 [PATCH 0/8] Fix/avoid dtc warnings Sascha Hauer
                   ` (4 preceding siblings ...)
  2023-03-02 10:39 ` [PATCH 5/8] ARM: dts: Fix dtc warnings in barebox,environment nodes Sascha Hauer
@ 2023-03-02 10:39 ` Sascha Hauer
  2023-03-02 10:39 ` [PATCH 7/8] ARM: dts: imx7d-peb-eval-02: Fix dtc warnings Sascha Hauer
  2023-03-02 10:39 ` [PATCH 8/8] ARM: dts: imx6ull-jozacp: Move regulators out of subnode Sascha Hauer
  7 siblings, 0 replies; 12+ messages in thread
From: Sascha Hauer @ 2023-03-02 10:39 UTC (permalink / raw)
  To: Barebox List

"display" is both a property and a node name. Rename the node to avoid
dtc warnings.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/arm/dts/imx7d-peb-av-02.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/dts/imx7d-peb-av-02.dtsi b/arch/arm/dts/imx7d-peb-av-02.dtsi
index dcf117c71a..2e5af755bb 100644
--- a/arch/arm/dts/imx7d-peb-av-02.dtsi
+++ b/arch/arm/dts/imx7d-peb-av-02.dtsi
@@ -72,7 +72,7 @@
 	lcd-supply = <&lcd_3v3>;
 	status = "disabled";
 
-	display0: display {
+	display0: display0 {
 		bits-per-pixel = <32>;
 		bus-width = <24>;
 
-- 
2.30.2




^ permalink raw reply	[flat|nested] 12+ messages in thread

* [PATCH 7/8] ARM: dts: imx7d-peb-eval-02: Fix dtc warnings
  2023-03-02 10:39 [PATCH 0/8] Fix/avoid dtc warnings Sascha Hauer
                   ` (5 preceding siblings ...)
  2023-03-02 10:39 ` [PATCH 6/8] ARM: dts: imx7d-peb-av-02: Fix dtc warning Sascha Hauer
@ 2023-03-02 10:39 ` Sascha Hauer
  2023-03-02 10:49   ` Marco Felsch
  2023-03-02 10:39 ` [PATCH 8/8] ARM: dts: imx6ull-jozacp: Move regulators out of subnode Sascha Hauer
  7 siblings, 1 reply; 12+ messages in thread
From: Sascha Hauer @ 2023-03-02 10:39 UTC (permalink / raw)
  To: Barebox List

Some nodes have a unit name, but no reg property. Drop the unit name
to avoid dtc warnings.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/arm/dts/imx7d-peb-eval-02.dtsi | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/arm/dts/imx7d-peb-eval-02.dtsi b/arch/arm/dts/imx7d-peb-eval-02.dtsi
index 8bde5b13e7..5c2c302d54 100644
--- a/arch/arm/dts/imx7d-peb-eval-02.dtsi
+++ b/arch/arm/dts/imx7d-peb-eval-02.dtsi
@@ -13,21 +13,21 @@
 		pinctrl-0 = <&pinctrl_leds_eval>;
 		status = "disabled";
 
-		led@0 {
+		led0 {
 			label = "eval_led_1";
 			gpios = <&gpio2 8 GPIO_ACTIVE_HIGH>;
 			linux,default-trigger = "gpio";
 			default-state = "on";
 		};
 
-		led@1 {
+		led1 {
 			label = "eval_led_2";
 			gpios = <&gpio4 4 GPIO_ACTIVE_HIGH>;
 			linux,default-trigger = "gpio";
 			default-state = "on";
 		};
 
-		led@2 {
+		led2 {
 			label = "eval_led_3";
 			gpios = <&gpio2 15 GPIO_ACTIVE_HIGH>;
 			linux,default-trigger = "gpio";
@@ -41,18 +41,18 @@
 		pinctrl-0 = <&pinctrl_btns_eval>;
 		status = "disabled";
 
-		userbtn@0 {
+		userbtn0 {
 			label = "eval_button_1";
 			gpios = <&gpio2 9 GPIO_ACTIVE_HIGH>;
 			linux,code = <0x100>;	/* BTN_MISC */
 		};
-		userbtn@1 {
+		userbtn1 {
 			label = "eval_button_2";
 			gpios = <&gpio4 5 GPIO_ACTIVE_HIGH>;
 			linux,code = <0x100>;   /* BTN_MISC */
 		};
 
-		userbtn@2 {
+		userbtn2 {
 			label = "eval_button_3";
 			gpios = <&gpio5 2 GPIO_ACTIVE_HIGH>;
 			linux,code = <0x100>;	/* BTN_MISC */
-- 
2.30.2




^ permalink raw reply	[flat|nested] 12+ messages in thread

* [PATCH 8/8] ARM: dts: imx6ull-jozacp: Move regulators out of subnode
  2023-03-02 10:39 [PATCH 0/8] Fix/avoid dtc warnings Sascha Hauer
                   ` (6 preceding siblings ...)
  2023-03-02 10:39 ` [PATCH 7/8] ARM: dts: imx7d-peb-eval-02: Fix dtc warnings Sascha Hauer
@ 2023-03-02 10:39 ` Sascha Hauer
  7 siblings, 0 replies; 12+ messages in thread
From: Sascha Hauer @ 2023-03-02 10:39 UTC (permalink / raw)
  To: Barebox List

regulators shall no longer be collected in an extra subnode. Move them
up one level.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/arm/dts/imx6ull-jozacp.dtsi | 72 +++++++++++++++-----------------
 1 file changed, 33 insertions(+), 39 deletions(-)

diff --git a/arch/arm/dts/imx6ull-jozacp.dtsi b/arch/arm/dts/imx6ull-jozacp.dtsi
index f7d35684f8..53f617d4f8 100644
--- a/arch/arm/dts/imx6ull-jozacp.dtsi
+++ b/arch/arm/dts/imx6ull-jozacp.dtsi
@@ -30,48 +30,42 @@
 		reg = <0x80000000 0x10000000>;
 	};
 
-	regulators {
-		compatible = "simple-bus";
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		reg_5v: 5v-regulator {
-			compatible = "regulator-fixed";
-			regulator-name = "regulator-5V";
-			regulator-min-microvolt = <5000000>;
-			regulator-max-microvolt = <5000000>;
-			regulator-always-on;
-		};
+	reg_5v: 5v-regulator {
+		compatible = "regulator-fixed";
+		regulator-name = "regulator-5V";
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		regulator-always-on;
+	};
 
-		reg_3p3v: 3p3-regulator {
-			compatible = "regulator-fixed";
-			regulator-name = "regulator-3P3V";
-			regulator-min-microvolt = <3300000>;
-			regulator-max-microvolt = <3300000>;
-			vin-supply = <&reg_5v>;
-			regulator-always-on;
-		};
+	reg_3p3v: 3p3-regulator {
+		compatible = "regulator-fixed";
+		regulator-name = "regulator-3P3V";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		vin-supply = <&reg_5v>;
+		regulator-always-on;
+	};
 
-		reg_1p4v: 1p4-regulator {
-			compatible = "regulator-fixed";
-			regulator-name = "regulator-1P4V";
-			regulator-min-microvolt = <1400000>;
-			regulator-max-microvolt = <1400000>;
-			vin-supply = <&reg_5v>;
-			regulator-always-on;
-		};
+	reg_1p4v: 1p4-regulator {
+		compatible = "regulator-fixed";
+		regulator-name = "regulator-1P4V";
+		regulator-min-microvolt = <1400000>;
+		regulator-max-microvolt = <1400000>;
+		vin-supply = <&reg_5v>;
+		regulator-always-on;
+	};
 
-		reg_vbus: vbus-regulator {
-			pinctrl-names = "default";
-			pinctrl-0 = <&pinctrl_vbus>;
-			compatible = "regulator-fixed";
-			regulator-name = "regulator-vbus";
-			regulator-min-microvolt = <5000000>;
-			regulator-max-microvolt = <5000000>;
-			vin-supply = <&reg_5v>;
-			gpio = <&gpio1 2 GPIO_ACTIVE_HIGH>;
-			enable-active-high;
-		};
+	reg_vbus: vbus-regulator {
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_vbus>;
+		compatible = "regulator-fixed";
+		regulator-name = "regulator-vbus";
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		vin-supply = <&reg_5v>;
+		gpio = <&gpio1 2 GPIO_ACTIVE_HIGH>;
+		enable-active-high;
 	};
 
 	usdhc2_pwrseq: usdhc2-pwrseq {
-- 
2.30.2




^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH 7/8] ARM: dts: imx7d-peb-eval-02: Fix dtc warnings
  2023-03-02 10:39 ` [PATCH 7/8] ARM: dts: imx7d-peb-eval-02: Fix dtc warnings Sascha Hauer
@ 2023-03-02 10:49   ` Marco Felsch
  2023-03-02 10:57     ` Sascha Hauer
  0 siblings, 1 reply; 12+ messages in thread
From: Marco Felsch @ 2023-03-02 10:49 UTC (permalink / raw)
  To: Sascha Hauer; +Cc: Barebox List

Hi Sascha,

On 23-03-02, Sascha Hauer wrote:
> Some nodes have a unit name, but no reg property. Drop the unit name
> to avoid dtc warnings.
> 
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> ---
>  arch/arm/dts/imx7d-peb-eval-02.dtsi | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/arch/arm/dts/imx7d-peb-eval-02.dtsi b/arch/arm/dts/imx7d-peb-eval-02.dtsi
> index 8bde5b13e7..5c2c302d54 100644
> --- a/arch/arm/dts/imx7d-peb-eval-02.dtsi
> +++ b/arch/arm/dts/imx7d-peb-eval-02.dtsi
> @@ -13,21 +13,21 @@
>  		pinctrl-0 = <&pinctrl_leds_eval>;
>  		status = "disabled";
>  
> -		led@0 {
> +		led0 {

To follow the binding doc the name should be led-0. For the below nodes
as well.

Regards,
  Marco

>  			label = "eval_led_1";
>  			gpios = <&gpio2 8 GPIO_ACTIVE_HIGH>;
>  			linux,default-trigger = "gpio";
>  			default-state = "on";
>  		};
>  
> -		led@1 {
> +		led1 {
>  			label = "eval_led_2";
>  			gpios = <&gpio4 4 GPIO_ACTIVE_HIGH>;
>  			linux,default-trigger = "gpio";
>  			default-state = "on";
>  		};
>  
> -		led@2 {
> +		led2 {
>  			label = "eval_led_3";
>  			gpios = <&gpio2 15 GPIO_ACTIVE_HIGH>;
>  			linux,default-trigger = "gpio";
> @@ -41,18 +41,18 @@
>  		pinctrl-0 = <&pinctrl_btns_eval>;
>  		status = "disabled";
>  
> -		userbtn@0 {
> +		userbtn0 {
>  			label = "eval_button_1";
>  			gpios = <&gpio2 9 GPIO_ACTIVE_HIGH>;
>  			linux,code = <0x100>;	/* BTN_MISC */
>  		};
> -		userbtn@1 {
> +		userbtn1 {
>  			label = "eval_button_2";
>  			gpios = <&gpio4 5 GPIO_ACTIVE_HIGH>;
>  			linux,code = <0x100>;   /* BTN_MISC */
>  		};
>  
> -		userbtn@2 {
> +		userbtn2 {
>  			label = "eval_button_3";
>  			gpios = <&gpio5 2 GPIO_ACTIVE_HIGH>;
>  			linux,code = <0x100>;	/* BTN_MISC */
> -- 
> 2.30.2
> 
> 
> 



^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH 7/8] ARM: dts: imx7d-peb-eval-02: Fix dtc warnings
  2023-03-02 10:49   ` Marco Felsch
@ 2023-03-02 10:57     ` Sascha Hauer
  2023-03-02 11:17       ` Marco Felsch
  0 siblings, 1 reply; 12+ messages in thread
From: Sascha Hauer @ 2023-03-02 10:57 UTC (permalink / raw)
  To: Marco Felsch; +Cc: Barebox List

On Thu, Mar 02, 2023 at 11:49:53AM +0100, Marco Felsch wrote:
> Hi Sascha,
> 
> On 23-03-02, Sascha Hauer wrote:
> > Some nodes have a unit name, but no reg property. Drop the unit name
> > to avoid dtc warnings.
> > 
> > Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> > ---
> >  arch/arm/dts/imx7d-peb-eval-02.dtsi | 12 ++++++------
> >  1 file changed, 6 insertions(+), 6 deletions(-)
> > 
> > diff --git a/arch/arm/dts/imx7d-peb-eval-02.dtsi b/arch/arm/dts/imx7d-peb-eval-02.dtsi
> > index 8bde5b13e7..5c2c302d54 100644
> > --- a/arch/arm/dts/imx7d-peb-eval-02.dtsi
> > +++ b/arch/arm/dts/imx7d-peb-eval-02.dtsi
> > @@ -13,21 +13,21 @@
> >  		pinctrl-0 = <&pinctrl_leds_eval>;
> >  		status = "disabled";
> >  
> > -		led@0 {
> > +		led0 {
> 
> To follow the binding doc the name should be led-0. For the below nodes
> as well.

Fixed, thanks

Sascha


-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |



^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH 7/8] ARM: dts: imx7d-peb-eval-02: Fix dtc warnings
  2023-03-02 10:57     ` Sascha Hauer
@ 2023-03-02 11:17       ` Marco Felsch
  0 siblings, 0 replies; 12+ messages in thread
From: Marco Felsch @ 2023-03-02 11:17 UTC (permalink / raw)
  To: Sascha Hauer; +Cc: Barebox List

On 23-03-02, Sascha Hauer wrote:
> On Thu, Mar 02, 2023 at 11:49:53AM +0100, Marco Felsch wrote:
> > Hi Sascha,
> > 
> > On 23-03-02, Sascha Hauer wrote:
> > > Some nodes have a unit name, but no reg property. Drop the unit name
> > > to avoid dtc warnings.
> > > 
> > > Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> > > ---
> > >  arch/arm/dts/imx7d-peb-eval-02.dtsi | 12 ++++++------
> > >  1 file changed, 6 insertions(+), 6 deletions(-)
> > > 
> > > diff --git a/arch/arm/dts/imx7d-peb-eval-02.dtsi b/arch/arm/dts/imx7d-peb-eval-02.dtsi
> > > index 8bde5b13e7..5c2c302d54 100644
> > > --- a/arch/arm/dts/imx7d-peb-eval-02.dtsi
> > > +++ b/arch/arm/dts/imx7d-peb-eval-02.dtsi
> > > @@ -13,21 +13,21 @@
> > >  		pinctrl-0 = <&pinctrl_leds_eval>;
> > >  		status = "disabled";
> > >  
> > > -		led@0 {
> > > +		led0 {
> > 
> > To follow the binding doc the name should be led-0. For the below nodes
> > as well.
> 
> Fixed, thanks

The rest of the series lgtm, feel free to add my:

Reviewed-by: Marco Felsch <m.felsch@pengutronix.de>

> 
> Sascha
> 
> 
> -- 
> Pengutronix e.K.                           |                             |
> Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
> 31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
> Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |
> 



^ permalink raw reply	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2023-03-02 11:18 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-03-02 10:39 [PATCH 0/8] Fix/avoid dtc warnings Sascha Hauer
2023-03-02 10:39 ` [PATCH 1/8] scripts: dtc: disable interrupt_provider warnings Sascha Hauer
2023-03-02 10:39 ` [PATCH 2/8] ARM: dts: digic4: Fix dtc warnings Sascha Hauer
2023-03-02 10:39 ` [PATCH 3/8] ARM: dts: ep7212-clep7212: " Sascha Hauer
2023-03-02 10:39 ` [PATCH 4/8] ARM: dts: Fix dtc warnings in state nodes Sascha Hauer
2023-03-02 10:39 ` [PATCH 5/8] ARM: dts: Fix dtc warnings in barebox,environment nodes Sascha Hauer
2023-03-02 10:39 ` [PATCH 6/8] ARM: dts: imx7d-peb-av-02: Fix dtc warning Sascha Hauer
2023-03-02 10:39 ` [PATCH 7/8] ARM: dts: imx7d-peb-eval-02: Fix dtc warnings Sascha Hauer
2023-03-02 10:49   ` Marco Felsch
2023-03-02 10:57     ` Sascha Hauer
2023-03-02 11:17       ` Marco Felsch
2023-03-02 10:39 ` [PATCH 8/8] ARM: dts: imx6ull-jozacp: Move regulators out of subnode Sascha Hauer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox