2020-10-23 00:43:39

by Patrick Delaunay

[permalink] [raw]
Subject: [PATCH] ARM: dts: stm32: reorder spi4 within stm32mp15-pinctrl

Move spi4 at the right alphabetical place within stm32mp15-pinctrl

Fixes: 4fe663890ac5 ("ARM: dts: stm32: Fix spi4 pins in stm32mp15-pinctrl")
Signed-off-by: Patrick Delaunay <[email protected]>
---

arch/arm/boot/dts/stm32mp15-pinctrl.dtsi | 28 ++++++++++++------------
1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/arch/arm/boot/dts/stm32mp15-pinctrl.dtsi b/arch/arm/boot/dts/stm32mp15-pinctrl.dtsi
index d84686e00370..c9e514165672 100644
--- a/arch/arm/boot/dts/stm32mp15-pinctrl.dtsi
+++ b/arch/arm/boot/dts/stm32mp15-pinctrl.dtsi
@@ -1591,6 +1591,20 @@
};
};

+ spi4_pins_a: spi4-0 {
+ pins {
+ pinmux = <STM32_PINMUX('E', 12, AF5)>, /* SPI4_SCK */
+ <STM32_PINMUX('E', 6, AF5)>; /* SPI4_MOSI */
+ bias-disable;
+ drive-push-pull;
+ slew-rate = <1>;
+ };
+ pins2 {
+ pinmux = <STM32_PINMUX('E', 13, AF5)>; /* SPI4_MISO */
+ bias-disable;
+ };
+ };
+
uart4_pins_a: uart4-0 {
pins1 {
pinmux = <STM32_PINMUX('G', 11, AF6)>; /* UART4_TX */
@@ -1726,20 +1740,6 @@
};
};

- spi4_pins_a: spi4-0 {
- pins {
- pinmux = <STM32_PINMUX('E', 12, AF5)>, /* SPI4_SCK */
- <STM32_PINMUX('E', 6, AF5)>; /* SPI4_MOSI */
- bias-disable;
- drive-push-pull;
- slew-rate = <1>;
- };
- pins2 {
- pinmux = <STM32_PINMUX('E', 13, AF5)>; /* SPI4_MISO */
- bias-disable;
- };
- };
-
usart2_pins_a: usart2-0 {
pins1 {
pinmux = <STM32_PINMUX('F', 5, AF7)>, /* USART2_TX */
--
2.17.1


2020-11-09 11:38:49

by Alexandre Torgue

[permalink] [raw]
Subject: Re: [PATCH] ARM: dts: stm32: reorder spi4 within stm32mp15-pinctrl

Hi Patrick

On 10/22/20 7:38 PM, Patrick Delaunay wrote:
> Move spi4 at the right alphabetical place within stm32mp15-pinctrl
>
> Fixes: 4fe663890ac5 ("ARM: dts: stm32: Fix spi4 pins in stm32mp15-pinctrl")
> Signed-off-by: Patrick Delaunay <[email protected]>
> ---
>
> arch/arm/boot/dts/stm32mp15-pinctrl.dtsi | 28 ++++++++++++------------
> 1 file changed, 14 insertions(+), 14 deletions(-)
>
> diff --git a/arch/arm/boot/dts/stm32mp15-pinctrl.dtsi b/arch/arm/boot/dts/stm32mp15-pinctrl.dtsi
> index d84686e00370..c9e514165672 100644
> --- a/arch/arm/boot/dts/stm32mp15-pinctrl.dtsi
> +++ b/arch/arm/boot/dts/stm32mp15-pinctrl.dtsi
> @@ -1591,6 +1591,20 @@
> };
> };
>

Applied on stm32-next.

Thanks.
Alex

> + spi4_pins_a: spi4-0 {
> + pins {
> + pinmux = <STM32_PINMUX('E', 12, AF5)>, /* SPI4_SCK */
> + <STM32_PINMUX('E', 6, AF5)>; /* SPI4_MOSI */
> + bias-disable;
> + drive-push-pull;
> + slew-rate = <1>;
> + };
> + pins2 {
> + pinmux = <STM32_PINMUX('E', 13, AF5)>; /* SPI4_MISO */
> + bias-disable;
> + };
> + };
> +
> uart4_pins_a: uart4-0 {
> pins1 {
> pinmux = <STM32_PINMUX('G', 11, AF6)>; /* UART4_TX */
> @@ -1726,20 +1740,6 @@
> };
> };
>
> - spi4_pins_a: spi4-0 {
> - pins {
> - pinmux = <STM32_PINMUX('E', 12, AF5)>, /* SPI4_SCK */
> - <STM32_PINMUX('E', 6, AF5)>; /* SPI4_MOSI */
> - bias-disable;
> - drive-push-pull;
> - slew-rate = <1>;
> - };
> - pins2 {
> - pinmux = <STM32_PINMUX('E', 13, AF5)>; /* SPI4_MISO */
> - bias-disable;
> - };
> - };
> -
> usart2_pins_a: usart2-0 {
> pins1 {
> pinmux = <STM32_PINMUX('F', 5, AF7)>, /* USART2_TX */
>