* [PATCH] ARM: dts: stm32: remove "@" from stm32f7 pinmux groups
@ 2019-11-25 12:12 Benjamin Gaignard
2019-11-25 12:12 ` [PATCH] ARM: dts: stm32: remove "@" from stm32f4 " Benjamin Gaignard
2019-12-04 15:23 ` [PATCH] ARM: dts: stm32: remove "@" from stm32f7 " Alexandre Torgue
0 siblings, 2 replies; 4+ messages in thread
From: Benjamin Gaignard @ 2019-11-25 12:12 UTC (permalink / raw)
To: alexandre.torgue, robh+dt, mark.rutland
Cc: linux-stm32, linux-arm-kernel, devicetree, linux-kernel,
Benjamin Gaignard
Replace all "@" by "_" in pinmux groups for stm32f7 family.
This avoid errors when using yaml to check the bindings.
Signed-off-by: Benjamin Gaignard <benjamin.gaignard@st.com>
---
arch/arm/boot/dts/stm32f7-pinctrl.dtsi | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/arch/arm/boot/dts/stm32f7-pinctrl.dtsi b/arch/arm/boot/dts/stm32f7-pinctrl.dtsi
index 9314128df185..5271df1017cb 100644
--- a/arch/arm/boot/dts/stm32f7-pinctrl.dtsi
+++ b/arch/arm/boot/dts/stm32f7-pinctrl.dtsi
@@ -127,7 +127,7 @@
st,bank-name = "GPIOK";
};
- cec_pins_a: cec@0 {
+ cec_pins_a: cec_0 {
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_0 {
pins1 {
pinmux = <STM32_PINMUX('A', 9, AF7)>; /* USART1_TX */
bias-disable;
@@ -149,7 +149,7 @@
};
};
- usart1_pins_b: usart1@1 {
+ usart1_pins_b: usart1_1 {
pins1 {
pinmux = <STM32_PINMUX('A', 9, AF7)>; /* USART1_TX */
bias-disable;
@@ -162,7 +162,7 @@
};
};
- i2c1_pins_b: i2c1@0 {
+ i2c1_pins_b: i2c1_0 {
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_0 {
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_1 {
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_0 {
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_0 {
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_0 {
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_0 {
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_0 {
pins1 {
pinmux = <STM32_PINMUX('G', 9, AF11)>, /* SDMMC2 D0 */
<STM32_PINMUX('G', 10, AF11)>, /* SDMMC2 D1 */
--
2.15.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH] ARM: dts: stm32: remove "@" from stm32f4 pinmux groups
2019-11-25 12:12 [PATCH] ARM: dts: stm32: remove "@" from stm32f7 pinmux groups Benjamin Gaignard
@ 2019-11-25 12:12 ` Benjamin Gaignard
2019-12-04 15:24 ` Alexandre Torgue
2019-12-04 15:23 ` [PATCH] ARM: dts: stm32: remove "@" from stm32f7 " Alexandre Torgue
1 sibling, 1 reply; 4+ messages in thread
From: Benjamin Gaignard @ 2019-11-25 12:12 UTC (permalink / raw)
To: alexandre.torgue, robh+dt, mark.rutland
Cc: linux-stm32, linux-arm-kernel, devicetree, linux-kernel,
Benjamin Gaignard
Replace all "@" by "_" in pinmux groups for stm32f4 family.
This avoid errors when using yaml to check the bindings.
Signed-off-by: Benjamin Gaignard <benjamin.gaignard@st.com>
---
arch/arm/boot/dts/stm32f4-pinctrl.dtsi | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/arch/arm/boot/dts/stm32f4-pinctrl.dtsi b/arch/arm/boot/dts/stm32f4-pinctrl.dtsi
index 35202896c093..722598cdf3b7 100644
--- a/arch/arm/boot/dts/stm32f4-pinctrl.dtsi
+++ b/arch/arm/boot/dts/stm32f4-pinctrl.dtsi
@@ -163,7 +163,7 @@
st,bank-name = "GPIOK";
};
- usart1_pins_a: usart1@0 {
+ usart1_pins_a: usart1_0 {
pins1 {
pinmux = <STM32_PINMUX('A', 9, AF7)>; /* USART1_TX */
bias-disable;
@@ -176,7 +176,7 @@
};
};
- usart3_pins_a: usart3@0 {
+ usart3_pins_a: usart3_0 {
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_0 {
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_1 {
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_0 {
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_0 {
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_200 {
pins {
pinmux = <STM32_PINMUX('F', 10, ANALOG)>;
};
};
- pwm1_pins: pwm@1 {
+ pwm1_pins: pwm_1 {
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: pwm_3 {
pins {
pinmux = <STM32_PINMUX('B', 4, AF2)>, /* TIM3_CH1 */
<STM32_PINMUX('B', 5, AF2)>; /* TIM3_CH2 */
};
};
- i2c1_pins: i2c1@0 {
+ i2c1_pins: i2c1_0 {
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_0 {
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_0 {
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_0 {
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_0 {
pins1 {
pinmux = <STM32_PINMUX('C', 8, AF12)>, /* SDIO_D0 */
<STM32_PINMUX('C', 9, AF12)>, /* SDIO_D1 */
--
2.15.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] ARM: dts: stm32: remove "@" from stm32f7 pinmux groups
2019-11-25 12:12 [PATCH] ARM: dts: stm32: remove "@" from stm32f7 pinmux groups Benjamin Gaignard
2019-11-25 12:12 ` [PATCH] ARM: dts: stm32: remove "@" from stm32f4 " Benjamin Gaignard
@ 2019-12-04 15:23 ` Alexandre Torgue
1 sibling, 0 replies; 4+ messages in thread
From: Alexandre Torgue @ 2019-12-04 15:23 UTC (permalink / raw)
To: Benjamin Gaignard, robh+dt, mark.rutland
Cc: linux-stm32, linux-arm-kernel, devicetree, linux-kernel
Hi Benjamin
On 11/25/19 1:12 PM, Benjamin Gaignard wrote:
> Replace all "@" by "_" in pinmux groups for stm32f7 family.
> This avoid errors when using yaml to check the bindings.
>
> Signed-off-by: Benjamin Gaignard <benjamin.gaignard@st.com>
> ---
> arch/arm/boot/dts/stm32f7-pinctrl.dtsi | 22 +++++++++++-----------
> 1 file changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/arch/arm/boot/dts/stm32f7-pinctrl.dtsi b/arch/arm/boot/dts/stm32f7-pinctrl.dtsi
> index 9314128df185..5271df1017cb 100644
> --- a/arch/arm/boot/dts/stm32f7-pinctrl.dtsi
> +++ b/arch/arm/boot/dts/stm32f7-pinctrl.dtsi
> @@ -127,7 +127,7 @@
> st,bank-name = "GPIOK";
> };
>
> - cec_pins_a: cec@0 {
> + cec_pins_a: cec_0 {
You fix a warning by adding a new one. Please use "cec-0" instead of
"cec_0". To be done for all changes in this file.
regards
Alex
> 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_0 {
> pins1 {
> pinmux = <STM32_PINMUX('A', 9, AF7)>; /* USART1_TX */
> bias-disable;
> @@ -149,7 +149,7 @@
> };
> };
>
> - usart1_pins_b: usart1@1 {
> + usart1_pins_b: usart1_1 {
> pins1 {
> pinmux = <STM32_PINMUX('A', 9, AF7)>; /* USART1_TX */
> bias-disable;
> @@ -162,7 +162,7 @@
> };
> };
>
> - i2c1_pins_b: i2c1@0 {
> + i2c1_pins_b: i2c1_0 {
> 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_0 {
> 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_1 {
> 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_0 {
> 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_0 {
> 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_0 {
> 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_0 {
> 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_0 {
> pins1 {
> pinmux = <STM32_PINMUX('G', 9, AF11)>, /* SDMMC2 D0 */
> <STM32_PINMUX('G', 10, AF11)>, /* SDMMC2 D1 */
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] ARM: dts: stm32: remove "@" from stm32f4 pinmux groups
2019-11-25 12:12 ` [PATCH] ARM: dts: stm32: remove "@" from stm32f4 " Benjamin Gaignard
@ 2019-12-04 15:24 ` Alexandre Torgue
0 siblings, 0 replies; 4+ messages in thread
From: Alexandre Torgue @ 2019-12-04 15:24 UTC (permalink / raw)
To: Benjamin Gaignard, robh+dt, mark.rutland
Cc: linux-stm32, linux-arm-kernel, devicetree, linux-kernel
Hi benjamin
On 11/25/19 1:12 PM, Benjamin Gaignard wrote:
> Replace all "@" by "_" in pinmux groups for stm32f4 family.
> This avoid errors when using yaml to check the bindings.
>
> Signed-off-by: Benjamin Gaignard <benjamin.gaignard@st.com>
> ---
> arch/arm/boot/dts/stm32f4-pinctrl.dtsi | 28 ++++++++++++++--------------
> 1 file changed, 14 insertions(+), 14 deletions(-)
>
> diff --git a/arch/arm/boot/dts/stm32f4-pinctrl.dtsi b/arch/arm/boot/dts/stm32f4-pinctrl.dtsi
> index 35202896c093..722598cdf3b7 100644
> --- a/arch/arm/boot/dts/stm32f4-pinctrl.dtsi
> +++ b/arch/arm/boot/dts/stm32f4-pinctrl.dtsi
> @@ -163,7 +163,7 @@
> st,bank-name = "GPIOK";
> };
>
> - usart1_pins_a: usart1@0 {
> + usart1_pins_a: usart1_0 {
You fix a warning by adding a new one. Please use "usart1-0" instead of
"usart1_0". To be done for all changes in this file.
regards
Alex
> pins1 {
> pinmux = <STM32_PINMUX('A', 9, AF7)>; /* USART1_TX */
> bias-disable;
> @@ -176,7 +176,7 @@
> };
> };
>
> - usart3_pins_a: usart3@0 {
> + usart3_pins_a: usart3_0 {
> 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_0 {
> 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_1 {
> 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_0 {
> 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_0 {
> 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_200 {
> pins {
> pinmux = <STM32_PINMUX('F', 10, ANALOG)>;
> };
> };
>
> - pwm1_pins: pwm@1 {
> + pwm1_pins: pwm_1 {
> 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: pwm_3 {
> pins {
> pinmux = <STM32_PINMUX('B', 4, AF2)>, /* TIM3_CH1 */
> <STM32_PINMUX('B', 5, AF2)>; /* TIM3_CH2 */
> };
> };
>
> - i2c1_pins: i2c1@0 {
> + i2c1_pins: i2c1_0 {
> 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_0 {
> 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_0 {
> 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_0 {
> 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_0 {
> pins1 {
> pinmux = <STM32_PINMUX('C', 8, AF12)>, /* SDIO_D0 */
> <STM32_PINMUX('C', 9, AF12)>, /* SDIO_D1 */
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-12-04 15:24 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-25 12:12 [PATCH] ARM: dts: stm32: remove "@" from stm32f7 pinmux groups Benjamin Gaignard
2019-11-25 12:12 ` [PATCH] ARM: dts: stm32: remove "@" from stm32f4 " Benjamin Gaignard
2019-12-04 15:24 ` Alexandre Torgue
2019-12-04 15:23 ` [PATCH] ARM: dts: stm32: remove "@" from stm32f7 " Alexandre Torgue
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).