From: Patrice Chotard <[email protected]>
This series fixes DT dtc warnings for following STM32 MCU's boards:
- stm32f429i evaluation
- stm32f429 discovery
- stm32f469 discovery
- stm32746g evaluation
- stm32f746 discovery
- stm32h743i discovery
- stm32h743i evaluation
Patrice Chotard (3):
ARM: dts: stm32: Fix DT dtc warnings for stm32h7
ARM: dts: stm32: Fix DT dtc warnings for stm32f7
ARM: dts: stm32: Fix DT dtc warnings for stm32f4
arch/arm/boot/dts/stm32429i-eval.dts | 11 +++--
arch/arm/boot/dts/stm32746g-eval.dts | 9 ++--
arch/arm/boot/dts/stm32f4-pinctrl.dtsi | 30 ++++++-------
arch/arm/boot/dts/stm32f429-disco.dts | 7 ++-
arch/arm/boot/dts/stm32f429-pinctrl.dtsi | 74 +++++++++++++++----------------
arch/arm/boot/dts/stm32f429.dtsi | 8 ++--
arch/arm/boot/dts/stm32f469-disco.dts | 11 +++--
arch/arm/boot/dts/stm32f469-pinctrl.dtsi | 76 +++++++++++++++-----------------
arch/arm/boot/dts/stm32f7-pinctrl.dtsi | 24 +++++-----
arch/arm/boot/dts/stm32f746-disco.dts | 6 +--
arch/arm/boot/dts/stm32f746.dtsi | 8 ++--
arch/arm/boot/dts/stm32f769-disco.dts | 11 +++--
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 +-
16 files changed, 140 insertions(+), 157 deletions(-)
--
1.9.1
From: Patrice Chotard <[email protected]>
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 <[email protected]>
---
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 {
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>;
};
--
1.9.1
From: Patrice Chotard <[email protected]>
Fix the following DT dtc warnings for stm32f429 and
stm32f469 boards:
Warning (node_name_chars_strict): /soc/pin-controller/usbotg_fs@0: Character '_' not recommended in node name
Warning (node_name_chars_strict): /soc/pin-controller/usbotg_fs@1: Character '_' not recommended in node name
Warning (node_name_chars_strict): /soc/pin-controller/usbotg_hs@0: Character '_' not recommended in node name
Warning (node_name_chars_strict): /soc/pin-controller/sdio_pins@0: Character '_' not recommended in node name
Warning (node_name_chars_strict): /soc/pin-controller/sdio_pins_od@0: Character '_' not recommended in node name
Warning (node_name_chars_strict): /gpio_keys: 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 (unit_address_vs_reg): /soc/pin-controller/usart1@0: node has a unit name, but no reg property
Warning (unit_address_vs_reg): /soc/pin-controller/usart3@0: node has a unit name, but no reg property
Warning (unit_address_vs_reg): /soc/pin-controller/usbotg_fs@0: node has a unit name, but no reg property
Warning (unit_address_vs_reg): /soc/pin-controller/usbotg_fs@1: node has a unit name, but no reg property
Warning (unit_address_vs_reg): /soc/pin-controller/usbotg_hs@0: node has a unit name, but no reg property
Warning (unit_address_vs_reg): /soc/pin-controller/mii@0: node has a unit name, but no reg property
Warning (unit_address_vs_reg): /soc/pin-controller/adc@200: node has a unit name, but no reg property
Warning (unit_address_vs_reg): /soc/pin-controller/pwm@1: node has a unit name, but no reg property
Warning (unit_address_vs_reg): /soc/pin-controller/pwm@3: node has a unit name, but no reg property
Warning (unit_address_vs_reg): /soc/pin-controller/i2c1@0: node has a unit name, but no reg property
Warning (unit_address_vs_reg): /soc/pin-controller/ltdc@0: node has a unit name, but no reg property
Warning (unit_address_vs_reg): /soc/pin-controller/dcmi@0: node has a unit name, but no reg property
Warning (unit_address_vs_reg): /soc/pin-controller/sdio_pins@0: node has a unit name, but no reg property
Warning (unit_address_vs_reg): /soc/pin-controller/sdio_pins_od@0: node has a unit name, but no reg property
Warning (unit_address_vs_reg): /gpio_keys/button@0: node has a unit name, but no reg property
Warning (avoid_unnecessary_addr_size): /gpio_keys: unnecessary #address-cells/#size-cells without "ranges" or child "reg" property
Signed-off-by: Patrice Chotard <[email protected]>
---
arch/arm/boot/dts/stm32429i-eval.dts | 11 +++--
arch/arm/boot/dts/stm32f4-pinctrl.dtsi | 30 ++++++-------
arch/arm/boot/dts/stm32f429-disco.dts | 7 ++-
arch/arm/boot/dts/stm32f429-pinctrl.dtsi | 74 +++++++++++++++----------------
arch/arm/boot/dts/stm32f429.dtsi | 8 ++--
arch/arm/boot/dts/stm32f469-disco.dts | 11 +++--
arch/arm/boot/dts/stm32f469-pinctrl.dtsi | 76 +++++++++++++++-----------------
7 files changed, 102 insertions(+), 115 deletions(-)
diff --git a/arch/arm/boot/dts/stm32429i-eval.dts b/arch/arm/boot/dts/stm32429i-eval.dts
index 7eb786a2d624..b5af6feb95a4 100644
--- a/arch/arm/boot/dts/stm32429i-eval.dts
+++ b/arch/arm/boot/dts/stm32429i-eval.dts
@@ -60,7 +60,7 @@
stdout-path = "serial0:115200n8";
};
- memory {
+ memory@0 {
reg = <0x00000000 0x2000000>;
};
@@ -111,17 +111,16 @@
};
};
- gpio_keys {
+ gpio-keys {
compatible = "gpio-keys";
- #address-cells = <1>;
#size-cells = <0>;
autorepeat;
- button@0 {
+ button0 {
label = "Wake up";
linux,code = <KEY_WAKEUP>;
gpios = <&gpioa 0 0>;
};
- button@1 {
+ button1 {
label = "Tamper";
linux,code = <KEY_RESTART>;
gpios = <&gpioc 13 0>;
@@ -145,7 +144,7 @@
};
};
- mmc_vcard: mmc_vcard {
+ mmc_vcard: mmc-vcard {
compatible = "regulator-fixed";
regulator-name = "mmc_vcard";
regulator-min-microvolt = <3300000>;
diff --git a/arch/arm/boot/dts/stm32f4-pinctrl.dtsi b/arch/arm/boot/dts/stm32f4-pinctrl.dtsi
index 35202896c093..73061fee60f6 100644
--- 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>;
@@ -163,7 +163,7 @@
st,bank-name = "GPIOK";
};
- usart1_pins_a: usart1@0 {
+ usart1_pins_a: usart1 {
pins1 {
pinmux = <STM32_PINMUX('A', 9, AF7)>; /* USART1_TX */
bias-disable;
@@ -176,7 +176,7 @@
};
};
- usart3_pins_a: usart3@0 {
+ usart3_pins_a: usart3 {
pins1 {
pinmux = <STM32_PINMUX('B', 10, AF7)>; /* USART3_TX */
bias-disable;
@@ -189,7 +189,7 @@
};
};
- usbotg_fs_pins_a: usbotg_fs@0 {
+ usbotg_fs_pins_a: usbotg-fs-a {
pins {
pinmux = <STM32_PINMUX('A', 10, AF10)>, /* OTG_FS_ID */
<STM32_PINMUX('A', 11, AF10)>, /* OTG_FS_DM */
@@ -200,7 +200,7 @@
};
};
- usbotg_fs_pins_b: usbotg_fs@1 {
+ usbotg_fs_pins_b: usbotg-fs-b {
pins {
pinmux = <STM32_PINMUX('B', 12, AF12)>, /* OTG_HS_ID */
<STM32_PINMUX('B', 14, AF12)>, /* OTG_HS_DM */
@@ -211,7 +211,7 @@
};
};
- usbotg_hs_pins_a: usbotg_hs@0 {
+ usbotg_hs_pins_a: usbotg-hs {
pins {
pinmux = <STM32_PINMUX('H', 4, AF10)>, /* OTG_HS_ULPI_NXT*/
<STM32_PINMUX('I', 11, AF10)>, /* OTG_HS_ULPI_DIR */
@@ -231,7 +231,7 @@
};
};
- ethernet_mii: mii@0 {
+ ethernet_mii: mii {
pins {
pinmux = <STM32_PINMUX('G', 13, AF11)>, /* ETH_MII_TXD0_ETH_RMII_TXD0 */
<STM32_PINMUX('G', 14, AF11)>, /* ETH_MII_TXD1_ETH_RMII_TXD1 */
@@ -251,13 +251,13 @@
};
};
- adc3_in8_pin: adc@200 {
+ adc3_in8_pin: adc {
pins {
pinmux = <STM32_PINMUX('F', 10, ANALOG)>;
};
};
- pwm1_pins: pwm@1 {
+ pwm1_pins: pwm1 {
pins {
pinmux = <STM32_PINMUX('A', 8, AF1)>, /* TIM1_CH1 */
<STM32_PINMUX('B', 13, AF1)>, /* TIM1_CH1N */
@@ -265,14 +265,14 @@
};
};
- pwm3_pins: pwm@3 {
+ pwm3_pins: pwm3 {
pins {
pinmux = <STM32_PINMUX('B', 4, AF2)>, /* TIM3_CH1 */
<STM32_PINMUX('B', 5, AF2)>; /* TIM3_CH2 */
};
};
- i2c1_pins: i2c1@0 {
+ i2c1_pins: i2c1 {
pins {
pinmux = <STM32_PINMUX('B', 9, AF4)>, /* I2C1_SDA */
<STM32_PINMUX('B', 6, AF4)>; /* I2C1_SCL */
@@ -282,7 +282,7 @@
};
};
- ltdc_pins: ltdc@0 {
+ ltdc_pins: ltdc {
pins {
pinmux = <STM32_PINMUX('I', 12, AF14)>, /* LCD_HSYNC */
<STM32_PINMUX('I', 13, AF14)>, /* LCD_VSYNC */
@@ -316,7 +316,7 @@
};
};
- dcmi_pins: dcmi@0 {
+ dcmi_pins: dcmi {
pins {
pinmux = <STM32_PINMUX('A', 4, AF13)>, /* DCMI_HSYNC */
<STM32_PINMUX('B', 7, AF13)>, /* DCMI_VSYNC */
@@ -339,7 +339,7 @@
};
};
- sdio_pins: sdio_pins@0 {
+ sdio_pins: sdio-pins {
pins {
pinmux = <STM32_PINMUX('C', 8, AF12)>, /* SDIO_D0 */
<STM32_PINMUX('C', 9, AF12)>, /* SDIO_D1 */
@@ -352,7 +352,7 @@
};
};
- sdio_pins_od: sdio_pins_od@0 {
+ sdio_pins_od: sdio-pins-od {
pins1 {
pinmux = <STM32_PINMUX('C', 8, AF12)>, /* SDIO_D0 */
<STM32_PINMUX('C', 9, AF12)>, /* SDIO_D1 */
diff --git a/arch/arm/boot/dts/stm32f429-disco.dts b/arch/arm/boot/dts/stm32f429-disco.dts
index 5ceb2cf3777f..93baee7b5f61 100644
--- a/arch/arm/boot/dts/stm32f429-disco.dts
+++ b/arch/arm/boot/dts/stm32f429-disco.dts
@@ -59,7 +59,7 @@
stdout-path = "serial0:115200n8";
};
- memory {
+ memory@90000000 {
reg = <0x90000000 0x800000>;
};
@@ -78,12 +78,11 @@
};
};
- gpio_keys {
+ gpio-keys {
compatible = "gpio-keys";
- #address-cells = <1>;
#size-cells = <0>;
autorepeat;
- button@0 {
+ button {
label = "User";
linux,code = <KEY_HOME>;
gpios = <&gpioa 0 0>;
diff --git a/arch/arm/boot/dts/stm32f429-pinctrl.dtsi b/arch/arm/boot/dts/stm32f429-pinctrl.dtsi
index 3e7a17d9112e..426e4ab64e1b 100644
--- 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-ranges = <&pinctrl 0 0 16>;
+};
- gpiob: gpio@40020400 {
- gpio-ranges = <&pinctrl 0 16 16>;
- };
+&gpiob {
+ gpio-ranges = <&pinctrl 0 16 16>;
+};
- gpioc: gpio@40020800 {
- gpio-ranges = <&pinctrl 0 32 16>;
- };
+&gpioc {
+ gpio-ranges = <&pinctrl 0 32 16>;
+};
- gpiod: gpio@40020c00 {
- gpio-ranges = <&pinctrl 0 48 16>;
- };
+&gpiod {
+ gpio-ranges = <&pinctrl 0 48 16>;
+};
- gpioe: gpio@40021000 {
- gpio-ranges = <&pinctrl 0 64 16>;
- };
+&gpioe {
+ gpio-ranges = <&pinctrl 0 64 16>;
+};
- gpiof: gpio@40021400 {
- gpio-ranges = <&pinctrl 0 80 16>;
- };
+&gpiof {
+ gpio-ranges = <&pinctrl 0 80 16>;
+};
- gpiog: gpio@40021800 {
- gpio-ranges = <&pinctrl 0 96 16>;
- };
+&gpiog {
+ gpio-ranges = <&pinctrl 0 96 16>;
+};
- gpioh: gpio@40021c00 {
- gpio-ranges = <&pinctrl 0 112 16>;
- };
+&gpioh {
+ gpio-ranges = <&pinctrl 0 112 16>;
+};
- gpioi: gpio@40022000 {
- gpio-ranges = <&pinctrl 0 128 16>;
- };
+&gpioi {
+ gpio-ranges = <&pinctrl 0 128 16>;
+};
- gpioj: gpio@40022400 {
- gpio-ranges = <&pinctrl 0 144 16>;
- };
+&gpioj {
+ gpio-ranges = <&pinctrl 0 144 16>;
+};
- gpiok: gpio@40022800 {
- gpio-ranges = <&pinctrl 0 160 8>;
- };
- };
- };
+&gpiok {
+ gpio-ranges = <&pinctrl 0 160 8>;
};
diff --git a/arch/arm/boot/dts/stm32f429.dtsi b/arch/arm/boot/dts/stm32f429.dtsi
index 64278e81bc08..d6f736024422 100644
--- a/arch/arm/boot/dts/stm32f429.dtsi
+++ b/arch/arm/boot/dts/stm32f429.dtsi
@@ -45,12 +45,14 @@
* OTHER DEALINGS IN THE SOFTWARE.
*/
-#include "skeleton.dtsi"
#include "armv7-m.dtsi"
#include <dt-bindings/clock/stm32fx-clock.h>
#include <dt-bindings/mfd/stm32f4-rcc.h>
/ {
+ #address-cells = <1>;
+ #size-cells = <1>;
+
clocks {
clk_hse: clk-hse {
#clock-cells = <0>;
@@ -263,7 +265,6 @@
};
timers13: timers@40001c00 {
- #address-cells = <1>;
#size-cells = <0>;
compatible = "st,stm32-timers";
reg = <0x40001C00 0x400>;
@@ -278,7 +279,6 @@
};
timers14: timers@40002000 {
- #address-cells = <1>;
#size-cells = <0>;
compatible = "st,stm32-timers";
reg = <0x40002000 0x400>;
@@ -557,7 +557,6 @@
};
timers10: timers@40014400 {
- #address-cells = <1>;
#size-cells = <0>;
compatible = "st,stm32-timers";
reg = <0x40014400 0x400>;
@@ -572,7 +571,6 @@
};
timers11: timers@40014800 {
- #address-cells = <1>;
#size-cells = <0>;
compatible = "st,stm32-timers";
reg = <0x40014800 0x400>;
diff --git a/arch/arm/boot/dts/stm32f469-disco.dts b/arch/arm/boot/dts/stm32f469-disco.dts
index 3ee768cb86fc..44f092307de3 100644
--- a/arch/arm/boot/dts/stm32f469-disco.dts
+++ b/arch/arm/boot/dts/stm32f469-disco.dts
@@ -60,7 +60,7 @@
stdout-path = "serial0:115200n8";
};
- memory {
+ memory@0 {
reg = <0x00000000 0x1000000>;
};
@@ -68,7 +68,7 @@
serial0 = &usart3;
};
- mmc_vcard: mmc_vcard {
+ mmc_vcard: mmc-vcard {
compatible = "regulator-fixed";
regulator-name = "mmc_vcard";
regulator-min-microvolt = <3300000>;
@@ -96,12 +96,11 @@
};
};
- gpio_keys {
+ gpio-keys {
compatible = "gpio-keys";
- #address-cells = <1>;
#size-cells = <0>;
autorepeat;
- button@0 {
+ button {
label = "User";
linux,code = <KEY_WAKEUP>;
gpios = <&gpioa 0 GPIO_ACTIVE_HIGH>;
@@ -169,7 +168,7 @@
status = "okay";
port {
- ltdc_out_dsi: endpoint@0 {
+ ltdc_out_dsi: endpoint {
remote-endpoint = <&dsi_in>;
};
};
diff --git a/arch/arm/boot/dts/stm32f469-pinctrl.dtsi b/arch/arm/boot/dts/stm32f469-pinctrl.dtsi
index fff542662eea..2e7718a919a3 100644
--- 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-ranges = <&pinctrl 0 0 16>;
+};
- gpiob: gpio@40020400 {
- gpio-ranges = <&pinctrl 0 16 16>;
- };
+&gpiob {
+ gpio-ranges = <&pinctrl 0 16 16>;
+};
- gpioc: gpio@40020800 {
- gpio-ranges = <&pinctrl 0 32 16>;
- };
+&gpioc {
+ gpio-ranges = <&pinctrl 0 32 16>;
+};
- gpiod: gpio@40020c00 {
- gpio-ranges = <&pinctrl 0 48 16>;
- };
+&gpiod {
+ gpio-ranges = <&pinctrl 0 48 16>;
+};
- gpioe: gpio@40021000 {
- gpio-ranges = <&pinctrl 0 64 16>;
- };
+&gpioe {
+ gpio-ranges = <&pinctrl 0 64 16>;
+};
- gpiof: gpio@40021400 {
- gpio-ranges = <&pinctrl 0 80 16>;
- };
+&gpiof {
+ gpio-ranges = <&pinctrl 0 80 16>;
+};
- gpiog: gpio@40021800 {
- gpio-ranges = <&pinctrl 0 96 16>;
- };
+&gpiog {
+ gpio-ranges = <&pinctrl 0 96 16>;
+};
- gpioh: gpio@40021c00 {
- gpio-ranges = <&pinctrl 0 112 16>;
- };
+&gpioh {
+ gpio-ranges = <&pinctrl 0 112 16>;
+};
- gpioi: gpio@40022000 {
- gpio-ranges = <&pinctrl 0 128 16>;
- };
+&gpioi {
+ gpio-ranges = <&pinctrl 0 128 16>;
+};
- gpioj: gpio@40022400 {
- gpio-ranges = <&pinctrl 0 144 6>,
- <&pinctrl 12 156 4>;
- };
+&gpioj {
+ gpio-ranges = <&pinctrl 0 144 6>,
+ <&pinctrl 12 156 4>;
+};
- gpiok: gpio@40022800 {
- gpio-ranges = <&pinctrl 3 163 5>;
- };
- };
- };
+&gpiok {
+ gpio-ranges = <&pinctrl 3 163 5>;
};
--
1.9.1
From: Patrice Chotard <[email protected]>
Fix the following DT dtc warnings for stm32f746 and stm32f769
boards:
Warning (node_name_chars_strict): /soc/pin-controller/sdio_pins_a@0: Character '_' not recommended in node name
Warning (node_name_chars_strict): /soc/pin-controller/sdio_pins_od_a@0: Character '_' not recommended in node name
Warning (node_name_chars_strict): /soc/pin-controller/sdio_pins_b@0: Character '_' not recommended in node name
Warning (node_name_chars_strict): /soc/pin-controller/sdio_pins_od_b@0: Character '_' not recommended in node name
Warning (node_name_chars_strict): /gpio_keys: Character '_' not recommended in node name
Warning (node_name_chars_strict): /mmc_vcard: 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 (unit_address_vs_reg): /soc/pin-controller/cec@0: node has a unit name, but no reg property
Warning (unit_address_vs_reg): /soc/pin-controller/usart1@0: node has a unit name, but no reg property
Warning (unit_address_vs_reg): /soc/pin-controller/i2c1@0: node has a unit name, but no reg property
Warning (unit_address_vs_reg): /soc/pin-controller/usbotg-hs@0: node has a unit name, but no reg property
Warning (unit_address_vs_reg): /soc/pin-controller/usbotg-hs@1: node has a unit name, but no reg property
Warning (unit_address_vs_reg): /soc/pin-controller/usbotg-fs@0: node has a unit name, but no reg property
Warning (unit_address_vs_reg): /soc/pin-controller/sdio_pins_a@0: node has a unit name, but no reg property
Warning (unit_address_vs_reg): /soc/pin-controller/sdio_pins_od_a@0: node has a unit name, but no reg property
Warning (unit_address_vs_reg): /soc/pin-controller/sdio_pins_b@0: node has a unit name, but no reg property
Warning (unit_address_vs_reg): /soc/pin-controller/sdio_pins_od_b@0: node has a unit name, but no reg property
Warning (unit_address_vs_reg): /gpio_keys/button@0: node has a unit name, but no reg property
Warning (avoid_unnecessary_addr_size): /soc/timers@40001c00: unnecessary #address-cells/#size-cells without "ranges" or child "reg" property
Warning (avoid_unnecessary_addr_size): /soc/timers@40002000: unnecessary #address-cells/#size-cells without "ranges" or child "reg" property
Warning (avoid_unnecessary_addr_size): /soc/timers@40014400: unnecessary #address-cells/#size-cells without "ranges" or child "reg" property
Warning (avoid_unnecessary_addr_size): /soc/timers@40014800: unnecessary #address-cells/#size-cells without "ranges" or child "reg" property
Signed-off-by: Patrice Chotard <[email protected]>
---
arch/arm/boot/dts/stm32746g-eval.dts | 9 ++++-----
arch/arm/boot/dts/stm32f7-pinctrl.dtsi | 24 ++++++++++++------------
arch/arm/boot/dts/stm32f746-disco.dts | 6 +++---
arch/arm/boot/dts/stm32f746.dtsi | 8 +++-----
arch/arm/boot/dts/stm32f769-disco.dts | 11 +++++------
5 files changed, 27 insertions(+), 31 deletions(-)
diff --git a/arch/arm/boot/dts/stm32746g-eval.dts b/arch/arm/boot/dts/stm32746g-eval.dts
index 8c081eaf20fe..a2edf6fccc2c 100644
--- a/arch/arm/boot/dts/stm32746g-eval.dts
+++ b/arch/arm/boot/dts/stm32746g-eval.dts
@@ -54,7 +54,7 @@
stdout-path = "serial0:115200n8";
};
- memory {
+ memory@c0000000 {
reg = <0xc0000000 0x2000000>;
};
@@ -73,12 +73,11 @@
};
};
- gpio_keys {
+ gpio-keys {
compatible = "gpio-keys";
- #address-cells = <1>;
#size-cells = <0>;
autorepeat;
- button@0 {
+ button {
label = "Wake up";
linux,code = <KEY_WAKEUP>;
gpios = <&gpioc 13 0>;
@@ -92,7 +91,7 @@
clock-names = "main_clk";
};
- mmc_vcard: mmc_vcard {
+ mmc_vcard: mmc-vcard {
compatible = "regulator-fixed";
regulator-name = "mmc_vcard";
regulator-min-microvolt = <3300000>;
diff --git a/arch/arm/boot/dts/stm32f7-pinctrl.dtsi b/arch/arm/boot/dts/stm32f7-pinctrl.dtsi
index 9314128df185..702f1c12c22b 100644
--- 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>;
@@ -127,7 +127,7 @@
st,bank-name = "GPIOK";
};
- cec_pins_a: cec@0 {
+ cec_pins_a: cec {
pins {
pinmux = <STM32_PINMUX('A', 15, AF4)>; /* HDMI CEC */
slew-rate = <0>;
@@ -136,7 +136,7 @@
};
};
- usart1_pins_a: usart1@0 {
+ usart1_pins_a: usart1-a {
pins1 {
pinmux = <STM32_PINMUX('A', 9, AF7)>; /* USART1_TX */
bias-disable;
@@ -149,7 +149,7 @@
};
};
- usart1_pins_b: usart1@1 {
+ usart1_pins_b: usart1-b {
pins1 {
pinmux = <STM32_PINMUX('A', 9, AF7)>; /* USART1_TX */
bias-disable;
@@ -162,7 +162,7 @@
};
};
- i2c1_pins_b: i2c1@0 {
+ i2c1_pins_b: i2c1 {
pins {
pinmux = <STM32_PINMUX('B', 9, AF4)>, /* I2C1 SDA */
<STM32_PINMUX('B', 8, AF4)>; /* I2C1 SCL */
@@ -172,7 +172,7 @@
};
};
- usbotg_hs_pins_a: usbotg-hs@0 {
+ usbotg_hs_pins_a: usbotg-hs-a {
pins {
pinmux = <STM32_PINMUX('H', 4, AF10)>, /* OTG_HS_ULPI_NXT */
<STM32_PINMUX('I', 11, AF10)>, /* OTG_HS_ULPI_DIR */
@@ -192,7 +192,7 @@
};
};
- usbotg_hs_pins_b: usbotg-hs@1 {
+ usbotg_hs_pins_b: usbotg-hs-b {
pins {
pinmux = <STM32_PINMUX('H', 4, AF10)>, /* OTG_HS_ULPI_NXT */
<STM32_PINMUX('C', 2, AF10)>, /* OTG_HS_ULPI_DIR */
@@ -212,7 +212,7 @@
};
};
- usbotg_fs_pins_a: usbotg-fs@0 {
+ usbotg_fs_pins_a: usbotg-fs {
pins {
pinmux = <STM32_PINMUX('A', 10, AF10)>, /* OTG_FS_ID */
<STM32_PINMUX('A', 11, AF10)>, /* OTG_FS_DM */
@@ -223,7 +223,7 @@
};
};
- sdio_pins_a: sdio_pins_a@0 {
+ sdio_pins_a: sdio-pins-a {
pins {
pinmux = <STM32_PINMUX('C', 8, AF12)>, /* SDMMC1 D0 */
<STM32_PINMUX('C', 9, AF12)>, /* SDMMC1 D1 */
@@ -236,7 +236,7 @@
};
};
- sdio_pins_od_a: sdio_pins_od_a@0 {
+ sdio_pins_od_a: sdio-pins-od-a {
pins1 {
pinmux = <STM32_PINMUX('C', 8, AF12)>, /* SDMMC1 D0 */
<STM32_PINMUX('C', 9, AF12)>, /* SDMMC1 D1 */
@@ -254,7 +254,7 @@
};
};
- sdio_pins_b: sdio_pins_b@0 {
+ sdio_pins_b: sdio-pins-b {
pins {
pinmux = <STM32_PINMUX('G', 9, AF11)>, /* SDMMC2 D0 */
<STM32_PINMUX('G', 10, AF11)>, /* SDMMC2 D1 */
@@ -267,7 +267,7 @@
};
};
- sdio_pins_od_b: sdio_pins_od_b@0 {
+ sdio_pins_od_b: sdio-pins-od-b {
pins1 {
pinmux = <STM32_PINMUX('G', 9, AF11)>, /* SDMMC2 D0 */
<STM32_PINMUX('G', 10, AF11)>, /* SDMMC2 D1 */
diff --git a/arch/arm/boot/dts/stm32f746-disco.dts b/arch/arm/boot/dts/stm32f746-disco.dts
index f9ad71f7c807..ccf9321926a4 100644
--- a/arch/arm/boot/dts/stm32f746-disco.dts
+++ b/arch/arm/boot/dts/stm32f746-disco.dts
@@ -55,8 +55,8 @@
stdout-path = "serial0:115200n8";
};
- memory {
- reg = <0xC0000000 0x800000>;
+ memory@c0000000 {
+ reg = <0xc0000000 0x800000>;
};
aliases {
@@ -78,7 +78,7 @@
regulator-always-on;
};
- mmc_vcard: mmc_vcard {
+ mmc_vcard: mmc-vcard {
compatible = "regulator-fixed";
regulator-name = "mmc_vcard";
regulator-min-microvolt = <3300000>;
diff --git a/arch/arm/boot/dts/stm32f746.dtsi b/arch/arm/boot/dts/stm32f746.dtsi
index 1479e3eb05fa..18272dc4e2ca 100644
--- a/arch/arm/boot/dts/stm32f746.dtsi
+++ b/arch/arm/boot/dts/stm32f746.dtsi
@@ -40,12 +40,14 @@
* OTHER DEALINGS IN THE SOFTWARE.
*/
-#include "skeleton.dtsi"
#include "armv7-m.dtsi"
#include <dt-bindings/clock/stm32fx-clock.h>
#include <dt-bindings/mfd/stm32f7-rcc.h>
/ {
+ #address-cells = <1>;
+ #size-cells = <1>;
+
clocks {
clk_hse: clk-hse {
#clock-cells = <0>;
@@ -258,7 +260,6 @@
};
timers13: timers@40001c00 {
- #address-cells = <1>;
#size-cells = <0>;
compatible = "st,stm32-timers";
reg = <0x40001C00 0x400>;
@@ -273,7 +274,6 @@
};
timers14: timers@40002000 {
- #address-cells = <1>;
#size-cells = <0>;
compatible = "st,stm32-timers";
reg = <0x40002000 0x400>;
@@ -521,7 +521,6 @@
};
timers10: timers@40014400 {
- #address-cells = <1>;
#size-cells = <0>;
compatible = "st,stm32-timers";
reg = <0x40014400 0x400>;
@@ -536,7 +535,6 @@
};
timers11: timers@40014800 {
- #address-cells = <1>;
#size-cells = <0>;
compatible = "st,stm32-timers";
reg = <0x40014800 0x400>;
diff --git a/arch/arm/boot/dts/stm32f769-disco.dts b/arch/arm/boot/dts/stm32f769-disco.dts
index 677276ba4dbe..d77300101e09 100644
--- a/arch/arm/boot/dts/stm32f769-disco.dts
+++ b/arch/arm/boot/dts/stm32f769-disco.dts
@@ -55,8 +55,8 @@
stdout-path = "serial0:115200n8";
};
- memory {
- reg = <0xC0000000 0x1000000>;
+ memory@c0000000 {
+ reg = <0xc0000000 0x1000000>;
};
aliases {
@@ -74,12 +74,11 @@
};
};
- gpio_keys {
+ gpio-keys {
compatible = "gpio-keys";
- #address-cells = <1>;
#size-cells = <0>;
autorepeat;
- button@0 {
+ button {
label = "User";
linux,code = <KEY_HOME>;
gpios = <&gpioa 0 GPIO_ACTIVE_HIGH>;
@@ -93,7 +92,7 @@
clock-names = "main_clk";
};
- mmc_vcard: mmc_vcard {
+ mmc_vcard: mmc-vcard {
compatible = "regulator-fixed";
regulator-name = "mmc_vcard";
regulator-min-microvolt = <3300000>;
--
1.9.1
Hi Patrice
On 08/07/2018 01:06 PM, [email protected] wrote:
> From: Patrice Chotard <[email protected]>
>
> 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 <[email protected]>
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>;
> };
>
>
On 08/07/2018 01:06 PM, [email protected] wrote:
> From: Patrice Chotard <[email protected]>
>
> Fix the following DT dtc warnings for stm32f746 and stm32f769
> boards:
>
> Warning (node_name_chars_strict): /soc/pin-controller/sdio_pins_a@0: Character '_' not recommended in node name
> Warning (node_name_chars_strict): /soc/pin-controller/sdio_pins_od_a@0: Character '_' not recommended in node name
> Warning (node_name_chars_strict): /soc/pin-controller/sdio_pins_b@0: Character '_' not recommended in node name
> Warning (node_name_chars_strict): /soc/pin-controller/sdio_pins_od_b@0: Character '_' not recommended in node name
> Warning (node_name_chars_strict): /gpio_keys: Character '_' not recommended in node name
> Warning (node_name_chars_strict): /mmc_vcard: 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 (unit_address_vs_reg): /soc/pin-controller/cec@0: node has a unit name, but no reg property
> Warning (unit_address_vs_reg): /soc/pin-controller/usart1@0: node has a unit name, but no reg property
> Warning (unit_address_vs_reg): /soc/pin-controller/i2c1@0: node has a unit name, but no reg property
> Warning (unit_address_vs_reg): /soc/pin-controller/usbotg-hs@0: node has a unit name, but no reg property
> Warning (unit_address_vs_reg): /soc/pin-controller/usbotg-hs@1: node has a unit name, but no reg property
> Warning (unit_address_vs_reg): /soc/pin-controller/usbotg-fs@0: node has a unit name, but no reg property
> Warning (unit_address_vs_reg): /soc/pin-controller/sdio_pins_a@0: node has a unit name, but no reg property
> Warning (unit_address_vs_reg): /soc/pin-controller/sdio_pins_od_a@0: node has a unit name, but no reg property
> Warning (unit_address_vs_reg): /soc/pin-controller/sdio_pins_b@0: node has a unit name, but no reg property
> Warning (unit_address_vs_reg): /soc/pin-controller/sdio_pins_od_b@0: node has a unit name, but no reg property
> Warning (unit_address_vs_reg): /gpio_keys/button@0: node has a unit name, but no reg property
> Warning (avoid_unnecessary_addr_size): /soc/timers@40001c00: unnecessary #address-cells/#size-cells without "ranges" or child "reg" property
> Warning (avoid_unnecessary_addr_size): /soc/timers@40002000: unnecessary #address-cells/#size-cells without "ranges" or child "reg" property
> Warning (avoid_unnecessary_addr_size): /soc/timers@40014400: unnecessary #address-cells/#size-cells without "ranges" or child "reg" property
> Warning (avoid_unnecessary_addr_size): /soc/timers@40014800: unnecessary #address-cells/#size-cells without "ranges" or child "reg" property
>
> Signed-off-by: Patrice Chotard <[email protected]>
> ---
> arch/arm/boot/dts/stm32746g-eval.dts | 9 ++++-----
> arch/arm/boot/dts/stm32f7-pinctrl.dtsi | 24 ++++++++++++------------
> arch/arm/boot/dts/stm32f746-disco.dts | 6 +++---
> arch/arm/boot/dts/stm32f746.dtsi | 8 +++-----
> arch/arm/boot/dts/stm32f769-disco.dts | 11 +++++------
> 5 files changed, 27 insertions(+), 31 deletions(-)
>
> diff --git a/arch/arm/boot/dts/stm32746g-eval.dts b/arch/arm/boot/dts/stm32746g-eval.dts
> index 8c081eaf20fe..a2edf6fccc2c 100644
> --- a/arch/arm/boot/dts/stm32746g-eval.dts
> +++ b/arch/arm/boot/dts/stm32746g-eval.dts
> @@ -54,7 +54,7 @@
> stdout-path = "serial0:115200n8";
> };
>
> - memory {
> + memory@c0000000 {
> reg = <0xc0000000 0x2000000>;
> };
>
> @@ -73,12 +73,11 @@
> };
> };
>
> - gpio_keys {
> + gpio-keys {
> compatible = "gpio-keys";
> - #address-cells = <1>;
> #size-cells = <0>;
> autorepeat;
> - button@0 {
> + button {
> label = "Wake up";
> linux,code = <KEY_WAKEUP>;
> gpios = <&gpioc 13 0>;
> @@ -92,7 +91,7 @@
> clock-names = "main_clk";
> };
>
> - mmc_vcard: mmc_vcard {
> + mmc_vcard: mmc-vcard {
> compatible = "regulator-fixed";
> regulator-name = "mmc_vcard";
> regulator-min-microvolt = <3300000>;
> diff --git a/arch/arm/boot/dts/stm32f7-pinctrl.dtsi b/arch/arm/boot/dts/stm32f7-pinctrl.dtsi
> index 9314128df185..702f1c12c22b 100644
> --- 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>;
> @@ -127,7 +127,7 @@
> st,bank-name = "GPIOK";
> };
>
> - cec_pins_a: cec@0 {
> + cec_pins_a: cec {
IMO, you could used cec-0. It will avoid to rewrite this node if new cec
pins groups is added.
> pins {
> pinmux = <STM32_PINMUX('A', 15, AF4)>; /* HDMI CEC */
> slew-rate = <0>;
> @@ -136,7 +136,7 @@
> };
> };
>
> - usart1_pins_a: usart1@0 {
You could use usart1-0
> + usart1_pins_a: usart1-a {
> pins1 {
> pinmux = <STM32_PINMUX('A', 9, AF7)>; /* USART1_TX */
> bias-disable;
> @@ -149,7 +149,7 @@
> };
> };
>
> - usart1_pins_b: usart1@1 {
You could use usart1-1
> + usart1_pins_b: usart1-b {
> pins1 {
> pinmux = <STM32_PINMUX('A', 9, AF7)>; /* USART1_TX */
> bias-disable;
> @@ -162,7 +162,7 @@
> };
> };
>
> - i2c1_pins_b: i2c1@0 {
ditto
> + i2c1_pins_b: i2c1 {
> pins {
> pinmux = <STM32_PINMUX('B', 9, AF4)>, /* I2C1 SDA */
> <STM32_PINMUX('B', 8, AF4)>; /* I2C1 SCL */
> @@ -172,7 +172,7 @@
> };
> };
>
> - usbotg_hs_pins_a: usbotg-hs@0 {
ditto
> + usbotg_hs_pins_a: usbotg-hs-a {
> pins {
> pinmux = <STM32_PINMUX('H', 4, AF10)>, /* OTG_HS_ULPI_NXT */
> <STM32_PINMUX('I', 11, AF10)>, /* OTG_HS_ULPI_DIR */
> @@ -192,7 +192,7 @@
> };
> };
>
> - usbotg_hs_pins_b: usbotg-hs@1 {
ditto
> + usbotg_hs_pins_b: usbotg-hs-b {
> pins {
> pinmux = <STM32_PINMUX('H', 4, AF10)>, /* OTG_HS_ULPI_NXT */
> <STM32_PINMUX('C', 2, AF10)>, /* OTG_HS_ULPI_DIR */
> @@ -212,7 +212,7 @@
> };
> };
>
> - usbotg_fs_pins_a: usbotg-fs@0 {
ditto
> + usbotg_fs_pins_a: usbotg-fs {
> pins {
> pinmux = <STM32_PINMUX('A', 10, AF10)>, /* OTG_FS_ID */
> <STM32_PINMUX('A', 11, AF10)>, /* OTG_FS_DM */
> @@ -223,7 +223,7 @@
> };
> };
>
> - sdio_pins_a: sdio_pins_a@0 {
ditto
> + sdio_pins_a: sdio-pins-a {
> pins {
> pinmux = <STM32_PINMUX('C', 8, AF12)>, /* SDMMC1 D0 */
> <STM32_PINMUX('C', 9, AF12)>, /* SDMMC1 D1 */
> @@ -236,7 +236,7 @@
> };
> };
>
> - sdio_pins_od_a: sdio_pins_od_a@0 {
ditto
> + sdio_pins_od_a: sdio-pins-od-a {
> pins1 {
> pinmux = <STM32_PINMUX('C', 8, AF12)>, /* SDMMC1 D0 */
> <STM32_PINMUX('C', 9, AF12)>, /* SDMMC1 D1 */
> @@ -254,7 +254,7 @@
> };
> };
>
> - sdio_pins_b: sdio_pins_b@0 {
ditto
> + sdio_pins_b: sdio-pins-b {
> pins {
> pinmux = <STM32_PINMUX('G', 9, AF11)>, /* SDMMC2 D0 */
> <STM32_PINMUX('G', 10, AF11)>, /* SDMMC2 D1 */
> @@ -267,7 +267,7 @@
> };
> };
>
> - sdio_pins_od_b: sdio_pins_od_b@0 {
you could use sdio_pins_od-0
> + sdio_pins_od_b: sdio-pins-od-b {
> pins1 {
> pinmux = <STM32_PINMUX('G', 9, AF11)>, /* SDMMC2 D0 */
> <STM32_PINMUX('G', 10, AF11)>, /* SDMMC2 D1 */
> diff --git a/arch/arm/boot/dts/stm32f746-disco.dts b/arch/arm/boot/dts/stm32f746-disco.dts
> index f9ad71f7c807..ccf9321926a4 100644
> --- a/arch/arm/boot/dts/stm32f746-disco.dts
> +++ b/arch/arm/boot/dts/stm32f746-disco.dts
> @@ -55,8 +55,8 @@
> stdout-path = "serial0:115200n8";
> };
>
> - memory {
> - reg = <0xC0000000 0x800000>;
> + memory@c0000000 {
> + reg = <0xc0000000 0x800000>;
> };
>
> aliases {
> @@ -78,7 +78,7 @@
> regulator-always-on;
> };
>
> - mmc_vcard: mmc_vcard {
> + mmc_vcard: mmc-vcard {
> compatible = "regulator-fixed";
> regulator-name = "mmc_vcard";
> regulator-min-microvolt = <3300000>;
> diff --git a/arch/arm/boot/dts/stm32f746.dtsi b/arch/arm/boot/dts/stm32f746.dtsi
> index 1479e3eb05fa..18272dc4e2ca 100644
> --- a/arch/arm/boot/dts/stm32f746.dtsi
> +++ b/arch/arm/boot/dts/stm32f746.dtsi
> @@ -40,12 +40,14 @@
> * OTHER DEALINGS IN THE SOFTWARE.
> */
>
> -#include "skeleton.dtsi"
> #include "armv7-m.dtsi"
> #include <dt-bindings/clock/stm32fx-clock.h>
> #include <dt-bindings/mfd/stm32f7-rcc.h>
>
> / {
> + #address-cells = <1>;
> + #size-cells = <1>;
> +
> clocks {
> clk_hse: clk-hse {
> #clock-cells = <0>;
> @@ -258,7 +260,6 @@
> };
>
> timers13: timers@40001c00 {
> - #address-cells = <1>;
> #size-cells = <0>;
> compatible = "st,stm32-timers";
> reg = <0x40001C00 0x400>;
> @@ -273,7 +274,6 @@
> };
>
> timers14: timers@40002000 {
> - #address-cells = <1>;
> #size-cells = <0>;
> compatible = "st,stm32-timers";
> reg = <0x40002000 0x400>;
> @@ -521,7 +521,6 @@
> };
>
> timers10: timers@40014400 {
> - #address-cells = <1>;
> #size-cells = <0>;
> compatible = "st,stm32-timers";
> reg = <0x40014400 0x400>;
> @@ -536,7 +535,6 @@
> };
>
> timers11: timers@40014800 {
> - #address-cells = <1>;
> #size-cells = <0>;
> compatible = "st,stm32-timers";
> reg = <0x40014800 0x400>;
> diff --git a/arch/arm/boot/dts/stm32f769-disco.dts b/arch/arm/boot/dts/stm32f769-disco.dts
> index 677276ba4dbe..d77300101e09 100644
> --- a/arch/arm/boot/dts/stm32f769-disco.dts
> +++ b/arch/arm/boot/dts/stm32f769-disco.dts
> @@ -55,8 +55,8 @@
> stdout-path = "serial0:115200n8";
> };
>
> - memory {
> - reg = <0xC0000000 0x1000000>;
> + memory@c0000000 {
> + reg = <0xc0000000 0x1000000>;
> };
>
> aliases {
> @@ -74,12 +74,11 @@
> };
> };
>
> - gpio_keys {
> + gpio-keys {
> compatible = "gpio-keys";
> - #address-cells = <1>;
> #size-cells = <0>;
> autorepeat;
> - button@0 {
> + button {
> label = "User";
> linux,code = <KEY_HOME>;
> gpios = <&gpioa 0 GPIO_ACTIVE_HIGH>;
> @@ -93,7 +92,7 @@
> clock-names = "main_clk";
> };
>
> - mmc_vcard: mmc_vcard {
> + mmc_vcard: mmc-vcard {
> compatible = "regulator-fixed";
> regulator-name = "mmc_vcard";
> regulator-min-microvolt = <3300000>;
>
Hi Patrice
On 08/07/2018 01:06 PM, [email protected] wrote:
> From: Patrice Chotard <[email protected]>
>
> Fix the following DT dtc warnings for stm32f429 and
> stm32f469 boards:
>
> Warning (node_name_chars_strict): /soc/pin-controller/usbotg_fs@0: Character '_' not recommended in node name
> Warning (node_name_chars_strict): /soc/pin-controller/usbotg_fs@1: Character '_' not recommended in node name
> Warning (node_name_chars_strict): /soc/pin-controller/usbotg_hs@0: Character '_' not recommended in node name
> Warning (node_name_chars_strict): /soc/pin-controller/sdio_pins@0: Character '_' not recommended in node name
> Warning (node_name_chars_strict): /soc/pin-controller/sdio_pins_od@0: Character '_' not recommended in node name
> Warning (node_name_chars_strict): /gpio_keys: 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 (unit_address_vs_reg): /soc/pin-controller/usart1@0: node has a unit name, but no reg property
> Warning (unit_address_vs_reg): /soc/pin-controller/usart3@0: node has a unit name, but no reg property
> Warning (unit_address_vs_reg): /soc/pin-controller/usbotg_fs@0: node has a unit name, but no reg property
> Warning (unit_address_vs_reg): /soc/pin-controller/usbotg_fs@1: node has a unit name, but no reg property
> Warning (unit_address_vs_reg): /soc/pin-controller/usbotg_hs@0: node has a unit name, but no reg property
> Warning (unit_address_vs_reg): /soc/pin-controller/mii@0: node has a unit name, but no reg property
> Warning (unit_address_vs_reg): /soc/pin-controller/adc@200: node has a unit name, but no reg property
> Warning (unit_address_vs_reg): /soc/pin-controller/pwm@1: node has a unit name, but no reg property
> Warning (unit_address_vs_reg): /soc/pin-controller/pwm@3: node has a unit name, but no reg property
> Warning (unit_address_vs_reg): /soc/pin-controller/i2c1@0: node has a unit name, but no reg property
> Warning (unit_address_vs_reg): /soc/pin-controller/ltdc@0: node has a unit name, but no reg property
> Warning (unit_address_vs_reg): /soc/pin-controller/dcmi@0: node has a unit name, but no reg property
> Warning (unit_address_vs_reg): /soc/pin-controller/sdio_pins@0: node has a unit name, but no reg property
> Warning (unit_address_vs_reg): /soc/pin-controller/sdio_pins_od@0: node has a unit name, but no reg property
> Warning (unit_address_vs_reg): /gpio_keys/button@0: node has a unit name, but no reg property
> Warning (avoid_unnecessary_addr_size): /gpio_keys: unnecessary #address-cells/#size-cells without "ranges" or child "reg" property
>
> Signed-off-by: Patrice Chotard <[email protected]>
Same remarks than fot other patches of this series
thx
Alex
> ---
> arch/arm/boot/dts/stm32429i-eval.dts | 11 +++--
> arch/arm/boot/dts/stm32f4-pinctrl.dtsi | 30 ++++++-------
> arch/arm/boot/dts/stm32f429-disco.dts | 7 ++-
> arch/arm/boot/dts/stm32f429-pinctrl.dtsi | 74 +++++++++++++++----------------
> arch/arm/boot/dts/stm32f429.dtsi | 8 ++--
> arch/arm/boot/dts/stm32f469-disco.dts | 11 +++--
> arch/arm/boot/dts/stm32f469-pinctrl.dtsi | 76 +++++++++++++++-----------------
> 7 files changed, 102 insertions(+), 115 deletions(-)
>
> diff --git a/arch/arm/boot/dts/stm32429i-eval.dts b/arch/arm/boot/dts/stm32429i-eval.dts
> index 7eb786a2d624..b5af6feb95a4 100644
> --- a/arch/arm/boot/dts/stm32429i-eval.dts
> +++ b/arch/arm/boot/dts/stm32429i-eval.dts
> @@ -60,7 +60,7 @@
> stdout-path = "serial0:115200n8";
> };
>
> - memory {
> + memory@0 {
> reg = <0x00000000 0x2000000>;
> };
>
> @@ -111,17 +111,16 @@
> };
> };
>
> - gpio_keys {
> + gpio-keys {
> compatible = "gpio-keys";
> - #address-cells = <1>;
> #size-cells = <0>;
> autorepeat;
> - button@0 {
> + button0 {
> label = "Wake up";
> linux,code = <KEY_WAKEUP>;
> gpios = <&gpioa 0 0>;
> };
> - button@1 {
> + button1 {
> label = "Tamper";
> linux,code = <KEY_RESTART>;
> gpios = <&gpioc 13 0>;
> @@ -145,7 +144,7 @@
> };
> };
>
> - mmc_vcard: mmc_vcard {
> + mmc_vcard: mmc-vcard {
> compatible = "regulator-fixed";
> regulator-name = "mmc_vcard";
> regulator-min-microvolt = <3300000>;
> diff --git a/arch/arm/boot/dts/stm32f4-pinctrl.dtsi b/arch/arm/boot/dts/stm32f4-pinctrl.dtsi
> index 35202896c093..73061fee60f6 100644
> --- 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>;
> @@ -163,7 +163,7 @@
> st,bank-name = "GPIOK";
> };
>
> - usart1_pins_a: usart1@0 {
> + usart1_pins_a: usart1 {
> pins1 {
> pinmux = <STM32_PINMUX('A', 9, AF7)>; /* USART1_TX */
> bias-disable;
> @@ -176,7 +176,7 @@
> };
> };
>
> - usart3_pins_a: usart3@0 {
> + usart3_pins_a: usart3 {
> pins1 {
> pinmux = <STM32_PINMUX('B', 10, AF7)>; /* USART3_TX */
> bias-disable;
> @@ -189,7 +189,7 @@
> };
> };
>
> - usbotg_fs_pins_a: usbotg_fs@0 {
> + usbotg_fs_pins_a: usbotg-fs-a {
> pins {
> pinmux = <STM32_PINMUX('A', 10, AF10)>, /* OTG_FS_ID */
> <STM32_PINMUX('A', 11, AF10)>, /* OTG_FS_DM */
> @@ -200,7 +200,7 @@
> };
> };
>
> - usbotg_fs_pins_b: usbotg_fs@1 {
> + usbotg_fs_pins_b: usbotg-fs-b {
> pins {
> pinmux = <STM32_PINMUX('B', 12, AF12)>, /* OTG_HS_ID */
> <STM32_PINMUX('B', 14, AF12)>, /* OTG_HS_DM */
> @@ -211,7 +211,7 @@
> };
> };
>
> - usbotg_hs_pins_a: usbotg_hs@0 {
> + usbotg_hs_pins_a: usbotg-hs {
> pins {
> pinmux = <STM32_PINMUX('H', 4, AF10)>, /* OTG_HS_ULPI_NXT*/
> <STM32_PINMUX('I', 11, AF10)>, /* OTG_HS_ULPI_DIR */
> @@ -231,7 +231,7 @@
> };
> };
>
> - ethernet_mii: mii@0 {
> + ethernet_mii: mii {
> pins {
> pinmux = <STM32_PINMUX('G', 13, AF11)>, /* ETH_MII_TXD0_ETH_RMII_TXD0 */
> <STM32_PINMUX('G', 14, AF11)>, /* ETH_MII_TXD1_ETH_RMII_TXD1 */
> @@ -251,13 +251,13 @@
> };
> };
>
> - adc3_in8_pin: adc@200 {
> + adc3_in8_pin: adc {
> pins {
> pinmux = <STM32_PINMUX('F', 10, ANALOG)>;
> };
> };
>
> - pwm1_pins: pwm@1 {
> + pwm1_pins: pwm1 {
> pins {
> pinmux = <STM32_PINMUX('A', 8, AF1)>, /* TIM1_CH1 */
> <STM32_PINMUX('B', 13, AF1)>, /* TIM1_CH1N */
> @@ -265,14 +265,14 @@
> };
> };
>
> - pwm3_pins: pwm@3 {
> + pwm3_pins: pwm3 {
> pins {
> pinmux = <STM32_PINMUX('B', 4, AF2)>, /* TIM3_CH1 */
> <STM32_PINMUX('B', 5, AF2)>; /* TIM3_CH2 */
> };
> };
>
> - i2c1_pins: i2c1@0 {
> + i2c1_pins: i2c1 {
> pins {
> pinmux = <STM32_PINMUX('B', 9, AF4)>, /* I2C1_SDA */
> <STM32_PINMUX('B', 6, AF4)>; /* I2C1_SCL */
> @@ -282,7 +282,7 @@
> };
> };
>
> - ltdc_pins: ltdc@0 {
> + ltdc_pins: ltdc {
> pins {
> pinmux = <STM32_PINMUX('I', 12, AF14)>, /* LCD_HSYNC */
> <STM32_PINMUX('I', 13, AF14)>, /* LCD_VSYNC */
> @@ -316,7 +316,7 @@
> };
> };
>
> - dcmi_pins: dcmi@0 {
> + dcmi_pins: dcmi {
> pins {
> pinmux = <STM32_PINMUX('A', 4, AF13)>, /* DCMI_HSYNC */
> <STM32_PINMUX('B', 7, AF13)>, /* DCMI_VSYNC */
> @@ -339,7 +339,7 @@
> };
> };
>
> - sdio_pins: sdio_pins@0 {
> + sdio_pins: sdio-pins {
> pins {
> pinmux = <STM32_PINMUX('C', 8, AF12)>, /* SDIO_D0 */
> <STM32_PINMUX('C', 9, AF12)>, /* SDIO_D1 */
> @@ -352,7 +352,7 @@
> };
> };
>
> - sdio_pins_od: sdio_pins_od@0 {
> + sdio_pins_od: sdio-pins-od {
> pins1 {
> pinmux = <STM32_PINMUX('C', 8, AF12)>, /* SDIO_D0 */
> <STM32_PINMUX('C', 9, AF12)>, /* SDIO_D1 */
> diff --git a/arch/arm/boot/dts/stm32f429-disco.dts b/arch/arm/boot/dts/stm32f429-disco.dts
> index 5ceb2cf3777f..93baee7b5f61 100644
> --- a/arch/arm/boot/dts/stm32f429-disco.dts
> +++ b/arch/arm/boot/dts/stm32f429-disco.dts
> @@ -59,7 +59,7 @@
> stdout-path = "serial0:115200n8";
> };
>
> - memory {
> + memory@90000000 {
> reg = <0x90000000 0x800000>;
> };
>
> @@ -78,12 +78,11 @@
> };
> };
>
> - gpio_keys {
> + gpio-keys {
> compatible = "gpio-keys";
> - #address-cells = <1>;
> #size-cells = <0>;
> autorepeat;
> - button@0 {
> + button {
> label = "User";
> linux,code = <KEY_HOME>;
> gpios = <&gpioa 0 0>;
> diff --git a/arch/arm/boot/dts/stm32f429-pinctrl.dtsi b/arch/arm/boot/dts/stm32f429-pinctrl.dtsi
> index 3e7a17d9112e..426e4ab64e1b 100644
> --- 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-ranges = <&pinctrl 0 0 16>;
> +};
>
> - gpiob: gpio@40020400 {
> - gpio-ranges = <&pinctrl 0 16 16>;
> - };
> +&gpiob {
> + gpio-ranges = <&pinctrl 0 16 16>;
> +};
>
> - gpioc: gpio@40020800 {
> - gpio-ranges = <&pinctrl 0 32 16>;
> - };
> +&gpioc {
> + gpio-ranges = <&pinctrl 0 32 16>;
> +};
>
> - gpiod: gpio@40020c00 {
> - gpio-ranges = <&pinctrl 0 48 16>;
> - };
> +&gpiod {
> + gpio-ranges = <&pinctrl 0 48 16>;
> +};
>
> - gpioe: gpio@40021000 {
> - gpio-ranges = <&pinctrl 0 64 16>;
> - };
> +&gpioe {
> + gpio-ranges = <&pinctrl 0 64 16>;
> +};
>
> - gpiof: gpio@40021400 {
> - gpio-ranges = <&pinctrl 0 80 16>;
> - };
> +&gpiof {
> + gpio-ranges = <&pinctrl 0 80 16>;
> +};
>
> - gpiog: gpio@40021800 {
> - gpio-ranges = <&pinctrl 0 96 16>;
> - };
> +&gpiog {
> + gpio-ranges = <&pinctrl 0 96 16>;
> +};
>
> - gpioh: gpio@40021c00 {
> - gpio-ranges = <&pinctrl 0 112 16>;
> - };
> +&gpioh {
> + gpio-ranges = <&pinctrl 0 112 16>;
> +};
>
> - gpioi: gpio@40022000 {
> - gpio-ranges = <&pinctrl 0 128 16>;
> - };
> +&gpioi {
> + gpio-ranges = <&pinctrl 0 128 16>;
> +};
>
> - gpioj: gpio@40022400 {
> - gpio-ranges = <&pinctrl 0 144 16>;
> - };
> +&gpioj {
> + gpio-ranges = <&pinctrl 0 144 16>;
> +};
>
> - gpiok: gpio@40022800 {
> - gpio-ranges = <&pinctrl 0 160 8>;
> - };
> - };
> - };
> +&gpiok {
> + gpio-ranges = <&pinctrl 0 160 8>;
> };
> diff --git a/arch/arm/boot/dts/stm32f429.dtsi b/arch/arm/boot/dts/stm32f429.dtsi
> index 64278e81bc08..d6f736024422 100644
> --- a/arch/arm/boot/dts/stm32f429.dtsi
> +++ b/arch/arm/boot/dts/stm32f429.dtsi
> @@ -45,12 +45,14 @@
> * OTHER DEALINGS IN THE SOFTWARE.
> */
>
> -#include "skeleton.dtsi"
> #include "armv7-m.dtsi"
> #include <dt-bindings/clock/stm32fx-clock.h>
> #include <dt-bindings/mfd/stm32f4-rcc.h>
>
> / {
> + #address-cells = <1>;
> + #size-cells = <1>;
> +
> clocks {
> clk_hse: clk-hse {
> #clock-cells = <0>;
> @@ -263,7 +265,6 @@
> };
>
> timers13: timers@40001c00 {
> - #address-cells = <1>;
> #size-cells = <0>;
> compatible = "st,stm32-timers";
> reg = <0x40001C00 0x400>;
> @@ -278,7 +279,6 @@
> };
>
> timers14: timers@40002000 {
> - #address-cells = <1>;
> #size-cells = <0>;
> compatible = "st,stm32-timers";
> reg = <0x40002000 0x400>;
> @@ -557,7 +557,6 @@
> };
>
> timers10: timers@40014400 {
> - #address-cells = <1>;
> #size-cells = <0>;
> compatible = "st,stm32-timers";
> reg = <0x40014400 0x400>;
> @@ -572,7 +571,6 @@
> };
>
> timers11: timers@40014800 {
> - #address-cells = <1>;
> #size-cells = <0>;
> compatible = "st,stm32-timers";
> reg = <0x40014800 0x400>;
> diff --git a/arch/arm/boot/dts/stm32f469-disco.dts b/arch/arm/boot/dts/stm32f469-disco.dts
> index 3ee768cb86fc..44f092307de3 100644
> --- a/arch/arm/boot/dts/stm32f469-disco.dts
> +++ b/arch/arm/boot/dts/stm32f469-disco.dts
> @@ -60,7 +60,7 @@
> stdout-path = "serial0:115200n8";
> };
>
> - memory {
> + memory@0 {
> reg = <0x00000000 0x1000000>;
> };
>
> @@ -68,7 +68,7 @@
> serial0 = &usart3;
> };
>
> - mmc_vcard: mmc_vcard {
> + mmc_vcard: mmc-vcard {
> compatible = "regulator-fixed";
> regulator-name = "mmc_vcard";
> regulator-min-microvolt = <3300000>;
> @@ -96,12 +96,11 @@
> };
> };
>
> - gpio_keys {
> + gpio-keys {
> compatible = "gpio-keys";
> - #address-cells = <1>;
> #size-cells = <0>;
> autorepeat;
> - button@0 {
> + button {
> label = "User";
> linux,code = <KEY_WAKEUP>;
> gpios = <&gpioa 0 GPIO_ACTIVE_HIGH>;
> @@ -169,7 +168,7 @@
> status = "okay";
>
> port {
> - ltdc_out_dsi: endpoint@0 {
> + ltdc_out_dsi: endpoint {
> remote-endpoint = <&dsi_in>;
> };
> };
> diff --git a/arch/arm/boot/dts/stm32f469-pinctrl.dtsi b/arch/arm/boot/dts/stm32f469-pinctrl.dtsi
> index fff542662eea..2e7718a919a3 100644
> --- 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-ranges = <&pinctrl 0 0 16>;
> +};
>
> - gpiob: gpio@40020400 {
> - gpio-ranges = <&pinctrl 0 16 16>;
> - };
> +&gpiob {
> + gpio-ranges = <&pinctrl 0 16 16>;
> +};
>
> - gpioc: gpio@40020800 {
> - gpio-ranges = <&pinctrl 0 32 16>;
> - };
> +&gpioc {
> + gpio-ranges = <&pinctrl 0 32 16>;
> +};
>
> - gpiod: gpio@40020c00 {
> - gpio-ranges = <&pinctrl 0 48 16>;
> - };
> +&gpiod {
> + gpio-ranges = <&pinctrl 0 48 16>;
> +};
>
> - gpioe: gpio@40021000 {
> - gpio-ranges = <&pinctrl 0 64 16>;
> - };
> +&gpioe {
> + gpio-ranges = <&pinctrl 0 64 16>;
> +};
>
> - gpiof: gpio@40021400 {
> - gpio-ranges = <&pinctrl 0 80 16>;
> - };
> +&gpiof {
> + gpio-ranges = <&pinctrl 0 80 16>;
> +};
>
> - gpiog: gpio@40021800 {
> - gpio-ranges = <&pinctrl 0 96 16>;
> - };
> +&gpiog {
> + gpio-ranges = <&pinctrl 0 96 16>;
> +};
>
> - gpioh: gpio@40021c00 {
> - gpio-ranges = <&pinctrl 0 112 16>;
> - };
> +&gpioh {
> + gpio-ranges = <&pinctrl 0 112 16>;
> +};
>
> - gpioi: gpio@40022000 {
> - gpio-ranges = <&pinctrl 0 128 16>;
> - };
> +&gpioi {
> + gpio-ranges = <&pinctrl 0 128 16>;
> +};
>
> - gpioj: gpio@40022400 {
> - gpio-ranges = <&pinctrl 0 144 6>,
> - <&pinctrl 12 156 4>;
> - };
> +&gpioj {
> + gpio-ranges = <&pinctrl 0 144 6>,
> + <&pinctrl 12 156 4>;
> +};
>
> - gpiok: gpio@40022800 {
> - gpio-ranges = <&pinctrl 3 163 5>;
> - };
> - };
> - };
> +&gpiok {
> + gpio-ranges = <&pinctrl 3 163 5>;
> };
>
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
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