diff mbox series

[1/3] ARM: dts: stm32: Fix DT dtc warnings for stm32h7

Message ID 1533639995-27047-2-git-send-email-patrice.chotard@st.com (mailing list archive)
State New, archived
Headers show
Series ARM: dts: stm32: Fix DT dtc warnings for STM32 MCU's | expand

Commit Message

Patrice CHOTARD Aug. 7, 2018, 11:06 a.m. UTC
From: Patrice Chotard <patrice.chotard@st.com>

Fix the following DT dtc warnings for stm32h743 boards:

Warning (node_name_chars_strict): /clocks/i2s_ckin: Character '_' not recommended in node name
Warning (unit_address_vs_reg): /memory: node has a reg or ranges property, but no unit name
Warning (unit_address_vs_reg): /soc/pin-controller: node has a reg or ranges property, but no unit name
Warning (unique_unit_address): /soc/pin-controller/i2c1@0: duplicate unit-address (also used in node /soc/pin-controller/usart1@0)
Warning (unique_unit_address): /soc/pin-controller/i2c1@0: duplicate unit-address (also used in node /soc/pin-controller/usart2@0)
Warning (unique_unit_address): /soc/pin-controller/usart1@0: duplicate unit-address (also used in node /soc/pin-controller/usart2@0)
Warning (unique_unit_address): /soc/pin-controller/i2c1@0: duplicate unit-address (also used in node /soc/pin-controller/usbotg-hs@0)
Warning (unique_unit_address): /soc/pin-controller/usart1@0: duplicate unit-address (also used in node /soc/pin-controller/usbotg-hs@0)
Warning (unique_unit_address): /soc/pin-controller/usart2@0: duplicate unit-address (also used in node /soc/pin-controller/usbotg-hs@0)
Warning (unit_address_vs_reg): /soc/pin-controller/usbotg-hs@0: node has a unit name, but no reg property
Warning (avoid_unnecessary_addr_size): /soc/timer@58002c00: unnecessary #address-cells/#size-cells without "ranges" or child "reg" property
Warning (avoid_unnecessary_addr_size): /soc/timer@58003000: unnecessary #address-cells/#size-cells without "ranges" or child "reg" property

Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
---
 arch/arm/boot/dts/stm32h743-pinctrl.dtsi | 10 +++++-----
 arch/arm/boot/dts/stm32h743.dtsi         |  8 ++++----
 arch/arm/boot/dts/stm32h743i-disco.dts   |  2 +-
 arch/arm/boot/dts/stm32h743i-eval.dts    |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

Comments

Alexandre TORGUE Aug. 7, 2018, 11:38 a.m. UTC | #1
Hi Patrice

On 08/07/2018 01:06 PM, patrice.chotard@st.com wrote:
> From: Patrice Chotard <patrice.chotard@st.com>
> 
> Fix the following DT dtc warnings for stm32h743 boards:
> 
> Warning (node_name_chars_strict): /clocks/i2s_ckin: Character '_' not recommended in node name
> Warning (unit_address_vs_reg): /memory: node has a reg or ranges property, but no unit name
> Warning (unit_address_vs_reg): /soc/pin-controller: node has a reg or ranges property, but no unit name
> Warning (unique_unit_address): /soc/pin-controller/i2c1@0: duplicate unit-address (also used in node /soc/pin-controller/usart1@0)
> Warning (unique_unit_address): /soc/pin-controller/i2c1@0: duplicate unit-address (also used in node /soc/pin-controller/usart2@0)
> Warning (unique_unit_address): /soc/pin-controller/usart1@0: duplicate unit-address (also used in node /soc/pin-controller/usart2@0)
> Warning (unique_unit_address): /soc/pin-controller/i2c1@0: duplicate unit-address (also used in node /soc/pin-controller/usbotg-hs@0)
> Warning (unique_unit_address): /soc/pin-controller/usart1@0: duplicate unit-address (also used in node /soc/pin-controller/usbotg-hs@0)
> Warning (unique_unit_address): /soc/pin-controller/usart2@0: duplicate unit-address (also used in node /soc/pin-controller/usbotg-hs@0)
> Warning (unit_address_vs_reg): /soc/pin-controller/usbotg-hs@0: node has a unit name, but no reg property
> Warning (avoid_unnecessary_addr_size): /soc/timer@58002c00: unnecessary #address-cells/#size-cells without "ranges" or child "reg" property
> Warning (avoid_unnecessary_addr_size): /soc/timer@58003000: unnecessary #address-cells/#size-cells without "ranges" or child "reg" property
> 
> Signed-off-by: Patrice Chotard <patrice.chotard@st.com>

Thanks for this change set! Some remarks bellow.

> ---
>   arch/arm/boot/dts/stm32h743-pinctrl.dtsi | 10 +++++-----
>   arch/arm/boot/dts/stm32h743.dtsi         |  8 ++++----
>   arch/arm/boot/dts/stm32h743i-disco.dts   |  2 +-
>   arch/arm/boot/dts/stm32h743i-eval.dts    |  2 +-
>   4 files changed, 11 insertions(+), 11 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/stm32h743-pinctrl.dtsi b/arch/arm/boot/dts/stm32h743-pinctrl.dtsi
> index 24be8e63dec8..9d3ad89a4833 100644
> --- a/arch/arm/boot/dts/stm32h743-pinctrl.dtsi
> +++ b/arch/arm/boot/dts/stm32h743-pinctrl.dtsi
> @@ -44,7 +44,7 @@
>   
>   / {
>   	soc {
> -		pin-controller {
> +		pin-controller@58020000 {
>   			#address-cells = <1>;
>   			#size-cells = <1>;
>   			compatible = "st,stm32h743-pinctrl";
> @@ -163,7 +163,7 @@
>   				#interrupt-cells = <2>;
>   			};
>   
> -			i2c1_pins_a: i2c1@0 {
> +			i2c1_pins_a: i2c1 {

IMO, you could used i2c1-0. It will avoid to rewrite this node if new 
i2c1 pins groups is added.

>   				pins {
>   					pinmux = <STM32_PINMUX('B', 6, AF4)>, /* I2C1_SCL */
>   						 <STM32_PINMUX('B', 7, AF4)>; /* I2C1_SDA */
> @@ -173,7 +173,7 @@
>   				};
>   			};
>   
> -			usart1_pins: usart1@0 {
> +			usart1_pins: usart1 {

ditto

>   				pins1 {
>   					pinmux = <STM32_PINMUX('B', 14, AF4)>; /* USART1_TX */
>   					bias-disable;
> @@ -186,7 +186,7 @@
>   				};
>   			};
>   
> -			usart2_pins: usart2@0 {
> +			usart2_pins: usart2 {

ditto

>   				pins1 {
>   					pinmux = <STM32_PINMUX('D', 5, AF7)>; /* USART2_TX */
>   					bias-disable;
> @@ -199,7 +199,7 @@
>   				};
>   			};
>   
> -			usbotg_hs_pins_a: usbotg-hs@0 {
> +			usbotg_hs_pins_a: usbotg-hs {

ditto

>   				pins {
>   					pinmux = <STM32_PINMUX('H', 4, AF10)>,	/* ULPI_NXT */
>   							 <STM32_PINMUX('I', 11, AF10)>, /* ULPI_DIR> */
> diff --git a/arch/arm/boot/dts/stm32h743.dtsi b/arch/arm/boot/dts/stm32h743.dtsi
> index 637beffe5067..b2d4e0b5a9c3 100644
> --- a/arch/arm/boot/dts/stm32h743.dtsi
> +++ b/arch/arm/boot/dts/stm32h743.dtsi
> @@ -40,13 +40,15 @@
>    *     OTHER DEALINGS IN THE SOFTWARE.
>    */
>   
> -#include "skeleton.dtsi"
>   #include "armv7-m.dtsi"
>   #include <dt-bindings/clock/stm32h7-clks.h>
>   #include <dt-bindings/mfd/stm32h7-rcc.h>
>   #include <dt-bindings/interrupt-controller/irq.h>
>   
>   / {
> +	#address-cells = <1>;
> +	#size-cells = <1>;
> +
>   	clocks {
>   		clk_hse: clk-hse {
>   			#clock-cells = <0>;
> @@ -60,7 +62,7 @@
>   			clock-frequency = <32768>;
>   		};
>   
> -		clk_i2s: i2s_ckin {
> +		clk_i2s: i2s-ckin {

clock driver deals with "i2s_ckin" for clock  source selection. I need 
to check deeper if this change could cause an issue.

thx
Alex


>   			#clock-cells = <0>;
>   			compatible = "fixed-clock";
>   			clock-frequency = <0>;
> @@ -422,7 +424,6 @@
>   		};
>   
>   		lptimer4: timer@58002c00 {
> -			#address-cells = <1>;
>   			#size-cells = <0>;
>   			compatible = "st,stm32-lptimer";
>   			reg = <0x58002c00 0x400>;
> @@ -438,7 +439,6 @@
>   		};
>   
>   		lptimer5: timer@58003000 {
> -			#address-cells = <1>;
>   			#size-cells = <0>;
>   			compatible = "st,stm32-lptimer";
>   			reg = <0x58003000 0x400>;
> diff --git a/arch/arm/boot/dts/stm32h743i-disco.dts b/arch/arm/boot/dts/stm32h743i-disco.dts
> index 45e088c55741..666b067e43b8 100644
> --- a/arch/arm/boot/dts/stm32h743i-disco.dts
> +++ b/arch/arm/boot/dts/stm32h743i-disco.dts
> @@ -53,7 +53,7 @@
>   		stdout-path = "serial0:115200n8";
>   	};
>   
> -	memory {
> +	memory@d0000000 {
>   		reg = <0xd0000000 0x2000000>;
>   	};
>   
> diff --git a/arch/arm/boot/dts/stm32h743i-eval.dts b/arch/arm/boot/dts/stm32h743i-eval.dts
> index 3f8e0c4a998d..caaa93b1bcc0 100644
> --- a/arch/arm/boot/dts/stm32h743i-eval.dts
> +++ b/arch/arm/boot/dts/stm32h743i-eval.dts
> @@ -53,7 +53,7 @@
>   		stdout-path = "serial0:115200n8";
>   	};
>   
> -	memory {
> +	memory@d0000000 {
>   		reg = <0xd0000000 0x2000000>;
>   	};
>   
>
Alexandre TORGUE Aug. 7, 2018, 11:56 a.m. UTC | #2
Hi Patrice

On 08/07/2018 01:38 PM, Alexandre Torgue wrote:
>> +    #address-cells = <1>;
>> +    #size-cells = <1>;
>> +
>>       clocks {
>>           clk_hse: clk-hse {
>>               #clock-cells = <0>;
>> @@ -60,7 +62,7 @@
>>               clock-frequency = <32768>;
>>           };
>> -        clk_i2s: i2s_ckin {
>> +        clk_i2s: i2s-ckin {
> 
> clock driver deals with "i2s_ckin" for clock  source selection. I need 
> to check deeper if this change could cause an issue.

Sorry I didn't check in the well driver. As far I can see it's ok for 
this part of patch.

cheers
Alex

> 
> thx
> Alex
Patrice CHOTARD Aug. 7, 2018, 12:01 p.m. UTC | #3
I will send a v2

Thanks for reviewing ;-)

Patrice

On 08/07/2018 01:56 PM, Alexandre Torgue wrote:
> Hi Patrice
> 
> On 08/07/2018 01:38 PM, Alexandre Torgue wrote:
>>> +    #address-cells = <1>;
>>> +    #size-cells = <1>;
>>> +
>>>       clocks {
>>>           clk_hse: clk-hse {
>>>               #clock-cells = <0>;
>>> @@ -60,7 +62,7 @@
>>>               clock-frequency = <32768>;
>>>           };
>>> -        clk_i2s: i2s_ckin {
>>> +        clk_i2s: i2s-ckin {
>>
>> clock driver deals with "i2s_ckin" for clock  source selection. I need 
>> to check deeper if this change could cause an issue.
> 
> Sorry I didn't check in the well driver. As far I can see it's ok for 
> this part of patch.
> 
> cheers
> Alex
> 
>>
>> thx
>> Alex
diff mbox series

Patch

diff --git a/arch/arm/boot/dts/stm32h743-pinctrl.dtsi b/arch/arm/boot/dts/stm32h743-pinctrl.dtsi
index 24be8e63dec8..9d3ad89a4833 100644
--- a/arch/arm/boot/dts/stm32h743-pinctrl.dtsi
+++ b/arch/arm/boot/dts/stm32h743-pinctrl.dtsi
@@ -44,7 +44,7 @@ 
 
 / {
 	soc {
-		pin-controller {
+		pin-controller@58020000 {
 			#address-cells = <1>;
 			#size-cells = <1>;
 			compatible = "st,stm32h743-pinctrl";
@@ -163,7 +163,7 @@ 
 				#interrupt-cells = <2>;
 			};
 
-			i2c1_pins_a: i2c1@0 {
+			i2c1_pins_a: i2c1 {
 				pins {
 					pinmux = <STM32_PINMUX('B', 6, AF4)>, /* I2C1_SCL */
 						 <STM32_PINMUX('B', 7, AF4)>; /* I2C1_SDA */
@@ -173,7 +173,7 @@ 
 				};
 			};
 
-			usart1_pins: usart1@0 {
+			usart1_pins: usart1 {
 				pins1 {
 					pinmux = <STM32_PINMUX('B', 14, AF4)>; /* USART1_TX */
 					bias-disable;
@@ -186,7 +186,7 @@ 
 				};
 			};
 
-			usart2_pins: usart2@0 {
+			usart2_pins: usart2 {
 				pins1 {
 					pinmux = <STM32_PINMUX('D', 5, AF7)>; /* USART2_TX */
 					bias-disable;
@@ -199,7 +199,7 @@ 
 				};
 			};
 
-			usbotg_hs_pins_a: usbotg-hs@0 {
+			usbotg_hs_pins_a: usbotg-hs {
 				pins {
 					pinmux = <STM32_PINMUX('H', 4, AF10)>,	/* ULPI_NXT */
 							 <STM32_PINMUX('I', 11, AF10)>, /* ULPI_DIR> */
diff --git a/arch/arm/boot/dts/stm32h743.dtsi b/arch/arm/boot/dts/stm32h743.dtsi
index 637beffe5067..b2d4e0b5a9c3 100644
--- a/arch/arm/boot/dts/stm32h743.dtsi
+++ b/arch/arm/boot/dts/stm32h743.dtsi
@@ -40,13 +40,15 @@ 
  *     OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "skeleton.dtsi"
 #include "armv7-m.dtsi"
 #include <dt-bindings/clock/stm32h7-clks.h>
 #include <dt-bindings/mfd/stm32h7-rcc.h>
 #include <dt-bindings/interrupt-controller/irq.h>
 
 / {
+	#address-cells = <1>;
+	#size-cells = <1>;
+
 	clocks {
 		clk_hse: clk-hse {
 			#clock-cells = <0>;
@@ -60,7 +62,7 @@ 
 			clock-frequency = <32768>;
 		};
 
-		clk_i2s: i2s_ckin {
+		clk_i2s: i2s-ckin {
 			#clock-cells = <0>;
 			compatible = "fixed-clock";
 			clock-frequency = <0>;
@@ -422,7 +424,6 @@ 
 		};
 
 		lptimer4: timer@58002c00 {
-			#address-cells = <1>;
 			#size-cells = <0>;
 			compatible = "st,stm32-lptimer";
 			reg = <0x58002c00 0x400>;
@@ -438,7 +439,6 @@ 
 		};
 
 		lptimer5: timer@58003000 {
-			#address-cells = <1>;
 			#size-cells = <0>;
 			compatible = "st,stm32-lptimer";
 			reg = <0x58003000 0x400>;
diff --git a/arch/arm/boot/dts/stm32h743i-disco.dts b/arch/arm/boot/dts/stm32h743i-disco.dts
index 45e088c55741..666b067e43b8 100644
--- a/arch/arm/boot/dts/stm32h743i-disco.dts
+++ b/arch/arm/boot/dts/stm32h743i-disco.dts
@@ -53,7 +53,7 @@ 
 		stdout-path = "serial0:115200n8";
 	};
 
-	memory {
+	memory@d0000000 {
 		reg = <0xd0000000 0x2000000>;
 	};
 
diff --git a/arch/arm/boot/dts/stm32h743i-eval.dts b/arch/arm/boot/dts/stm32h743i-eval.dts
index 3f8e0c4a998d..caaa93b1bcc0 100644
--- a/arch/arm/boot/dts/stm32h743i-eval.dts
+++ b/arch/arm/boot/dts/stm32h743i-eval.dts
@@ -53,7 +53,7 @@ 
 		stdout-path = "serial0:115200n8";
 	};
 
-	memory {
+	memory@d0000000 {
 		reg = <0xd0000000 0x2000000>;
 	};