ARM: dts: stm32: update pinctrl node name on STM32 MCU to prevent warnings

Update node name to avoid a DT schema validation issue seen with
"make dtbs_check W=1". It also cleans picntrl dtsi files for f429/f469 MCU.

Signed-off-by: Alexandre Torgue <alexandre.torgue@foss.st.com>

diff --git a/arch/arm/boot/dts/stm32f4-pinctrl.dtsi b/arch/arm/boot/dts/stm32f4-pinctrl.dtsi
index 4774163af54bb1de42e1b0dabe5a5ce1422cf80b..155d9ffacc8341de18ec2dc9ccf7a5e11bdc86d9 100644 (file)
--- a/arch/arm/boot/dts/stm32f4-pinctrl.dtsi
+++ b/arch/arm/boot/dts/stm32f4-pinctrl.dtsi
@@ -45,7 +45,7 @@
 
 / {
        soc {
-               pinctrl: pin-controller {
+               pinctrl: pin-controller@40020000 {
                        #address-cells = <1>;
                        #size-cells = <1>;
                        ranges = <0 0x40020000 0x3000>;

diff --git a/arch/arm/boot/dts/stm32f429-pinctrl.dtsi b/arch/arm/boot/dts/stm32f429-pinctrl.dtsi
index 3e7a17d9112e1cf90d7284f6f048a99bc88e0994..e10d7a1f320797cdab017519b57ce19d93e1a40b 100644 (file)
--- a/arch/arm/boot/dts/stm32f429-pinctrl.dtsi
+++ b/arch/arm/boot/dts/stm32f429-pinctrl.dtsi
@@ -42,54 +42,50 @@
 
 #include "stm32f4-pinctrl.dtsi"
 
-/ {
-       soc {
-               pinctrl: pin-controller {
-                       compatible = "st,stm32f429-pinctrl";
+&pinctrl {
+       compatible = "st,stm32f429-pinctrl";
 
-                       gpioa: gpio@40020000 {
-                               gpio-ranges = <&pinctrl 0 0 16>;
-                       };
+       gpioa: gpio@40020000 {
+               gpio-ranges = <&pinctrl 0 0 16>;
+       };
 
-                       gpiob: gpio@40020400 {
-                               gpio-ranges = <&pinctrl 0 16 16>;
-                       };
+       gpiob: gpio@40020400 {
+               gpio-ranges = <&pinctrl 0 16 16>;
+       };
 
-                       gpioc: gpio@40020800 {
-                               gpio-ranges = <&pinctrl 0 32 16>;
-                       };
+       gpioc: gpio@40020800 {
+               gpio-ranges = <&pinctrl 0 32 16>;
+       };
 
-                       gpiod: gpio@40020c00 {
-                               gpio-ranges = <&pinctrl 0 48 16>;
-                       };
+       gpiod: gpio@40020c00 {
+               gpio-ranges = <&pinctrl 0 48 16>;
+       };
 
-                       gpioe: gpio@40021000 {
-                               gpio-ranges = <&pinctrl 0 64 16>;
-                       };
+       gpioe: gpio@40021000 {
+               gpio-ranges = <&pinctrl 0 64 16>;
+       };
 
-                       gpiof: gpio@40021400 {
-                               gpio-ranges = <&pinctrl 0 80 16>;
-                       };
+       gpiof: gpio@40021400 {
+               gpio-ranges = <&pinctrl 0 80 16>;
+       };
 
-                       gpiog: gpio@40021800 {
-                               gpio-ranges = <&pinctrl 0 96 16>;
-                       };
+       gpiog: gpio@40021800 {
+               gpio-ranges = <&pinctrl 0 96 16>;
+       };
 
-                       gpioh: gpio@40021c00 {
-                               gpio-ranges = <&pinctrl 0 112 16>;
-                       };
+       gpioh: gpio@40021c00 {
+               gpio-ranges = <&pinctrl 0 112 16>;
+       };
 
-                       gpioi: gpio@40022000 {
-                               gpio-ranges = <&pinctrl 0 128 16>;
-                       };
+       gpioi: gpio@40022000 {
+               gpio-ranges = <&pinctrl 0 128 16>;
+       };
 
-                       gpioj: gpio@40022400 {
-                               gpio-ranges = <&pinctrl 0 144 16>;
-                       };
+       gpioj: gpio@40022400 {
+               gpio-ranges = <&pinctrl 0 144 16>;
+       };
 
-                       gpiok: gpio@40022800 {
-                               gpio-ranges = <&pinctrl 0 160 8>;
-                       };
-               };
+       gpiok: gpio@40022800 {
+               gpio-ranges = <&pinctrl 0 160 8>;
        };
 };

diff --git a/arch/arm/boot/dts/stm32f469-pinctrl.dtsi b/arch/arm/boot/dts/stm32f469-pinctrl.dtsi
index fff542662eeaa3a917e95b628a58af0e39f81f0c..6bf60263dff8951b671b347f6f1b1394891af3de 100644 (file)
--- a/arch/arm/boot/dts/stm32f469-pinctrl.dtsi
+++ b/arch/arm/boot/dts/stm32f469-pinctrl.dtsi
@@ -42,55 +42,51 @@
 
 #include "stm32f4-pinctrl.dtsi"
 
-/ {
-       soc {
-               pinctrl: pin-controller {
-                       compatible = "st,stm32f469-pinctrl";
+&pinctrl {
+       compatible = "st,stm32f469-pinctrl";
 
-                       gpioa: gpio@40020000 {
-                               gpio-ranges = <&pinctrl 0 0 16>;
-                       };
+       gpioa: gpio@40020000 {
+               gpio-ranges = <&pinctrl 0 0 16>;
+       };
 
-                       gpiob: gpio@40020400 {
-                               gpio-ranges = <&pinctrl 0 16 16>;
-                       };
+       gpiob: gpio@40020400 {
+               gpio-ranges = <&pinctrl 0 16 16>;
+       };
 
-                       gpioc: gpio@40020800 {
-                               gpio-ranges = <&pinctrl 0 32 16>;
-                       };
+       gpioc: gpio@40020800 {
+               gpio-ranges = <&pinctrl 0 32 16>;
+       };
 
-                       gpiod: gpio@40020c00 {
-                               gpio-ranges = <&pinctrl 0 48 16>;
-                       };
+       gpiod: gpio@40020c00 {
+               gpio-ranges = <&pinctrl 0 48 16>;
+       };
 
-                       gpioe: gpio@40021000 {
-                               gpio-ranges = <&pinctrl 0 64 16>;
-                       };
+       gpioe: gpio@40021000 {
+               gpio-ranges = <&pinctrl 0 64 16>;
+       };
 
-                       gpiof: gpio@40021400 {
-                               gpio-ranges = <&pinctrl 0 80 16>;
-                       };
+       gpiof: gpio@40021400 {
+               gpio-ranges = <&pinctrl 0 80 16>;
+       };
 
-                       gpiog: gpio@40021800 {
-                               gpio-ranges = <&pinctrl 0 96 16>;
-                       };
+       gpiog: gpio@40021800 {
+               gpio-ranges = <&pinctrl 0 96 16>;
+       };
 
-                       gpioh: gpio@40021c00 {
-                               gpio-ranges = <&pinctrl 0 112 16>;
-                       };
+       gpioh: gpio@40021c00 {
+               gpio-ranges = <&pinctrl 0 112 16>;
+       };
 
-                       gpioi: gpio@40022000 {
-                               gpio-ranges = <&pinctrl 0 128 16>;
-                       };
+       gpioi: gpio@40022000 {
+               gpio-ranges = <&pinctrl 0 128 16>;
+       };
 
-                       gpioj: gpio@40022400 {
-                               gpio-ranges = <&pinctrl 0 144 6>,
-                                             <&pinctrl 12 156 4>;
-                       };
+       gpioj: gpio@40022400 {
+               gpio-ranges = <&pinctrl 0 144 6>,
+                             <&pinctrl 12 156 4>;
+       };
 
-                       gpiok: gpio@40022800 {
-                               gpio-ranges = <&pinctrl 3 163 5>;
-                       };
-               };
+       gpiok: gpio@40022800 {
+               gpio-ranges = <&pinctrl 3 163 5>;
        };
 };

diff --git a/arch/arm/boot/dts/stm32f7-pinctrl.dtsi b/arch/arm/boot/dts/stm32f7-pinctrl.dtsi
index fe4cfda72a4766735b3a3c99b47e3646e2a3290c..1cf8a23c2644821979657a26c4aa0613bf4f95b2 100644 (file)
--- a/arch/arm/boot/dts/stm32f7-pinctrl.dtsi
+++ b/arch/arm/boot/dts/stm32f7-pinctrl.dtsi
@@ -9,7 +9,7 @@
 
 / {
        soc {
-               pinctrl: pin-controller {
+               pinctrl: pin-controller@40020000 {
                        #address-cells = <1>;
                        #size-cells = <1>;
                        ranges = <0 0x40020000 0x3000>;