| Message ID | 20200708114324.7309-1-patrick.delaunay@st.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 4fe663890ac5b3b099f458b20cce13fe8efec12b |
| Headers | show |
| Series | ARM: dts: stm32: Correct spi4 pins in stm32mp15-pinctrl.dtsi | expand |
On Wed, Jul 08, 2020 at 01:43:24PM +0200, Patrick Delaunay wrote: > Move spi4_pins_a nodes from pinctrl_z to pinctrl > as the associated pins are not in BANK Z. > Yikes, that's a nasty misplacement! Thanks for fixing. > Fixes: 498a7014989dfdd9a47864b55704dc829ed0dc90 Fixes tag should be of below: Fixes: 498a7014989d ("ARM: dts: stm32: Add missing pinctrl entries for STM32MP15") > Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com> Reviewed-by: Manivannan Sadhasivam <mani@kernel.org> Thanks, Mani > --- > > 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 7eb858732d6d..6aedbd7077ff 100644 > --- a/arch/arm/boot/dts/stm32mp15-pinctrl.dtsi > +++ b/arch/arm/boot/dts/stm32mp15-pinctrl.dtsi > @@ -1574,6 +1574,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; > + }; > + }; > + > usart2_pins_a: usart2-0 { > pins1 { > pinmux = <STM32_PINMUX('F', 5, AF7)>, /* USART2_TX */ > @@ -1776,18 +1790,4 @@ > bias-disable; > }; > }; > - > - 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; > - }; > - }; > }; > -- > 2.17.1 >
Hi Patrick On 7/8/20 1:43 PM, Patrick Delaunay wrote: > Move spi4_pins_a nodes from pinctrl_z to pinctrl > as the associated pins are not in BANK Z. > > Fixes: 498a7014989dfdd9a47864b55704dc829ed0dc90 > Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com> > --- > Applied on stm32-next by updating Fixes tag. Thanks Alex > 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 7eb858732d6d..6aedbd7077ff 100644 > --- a/arch/arm/boot/dts/stm32mp15-pinctrl.dtsi > +++ b/arch/arm/boot/dts/stm32mp15-pinctrl.dtsi > @@ -1574,6 +1574,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; > + }; > + }; > + > usart2_pins_a: usart2-0 { > pins1 { > pinmux = <STM32_PINMUX('F', 5, AF7)>, /* USART2_TX */ > @@ -1776,18 +1790,4 @@ > bias-disable; > }; > }; > - > - 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; > - }; > - }; > }; >
diff --git a/arch/arm/boot/dts/stm32mp15-pinctrl.dtsi b/arch/arm/boot/dts/stm32mp15-pinctrl.dtsi index 7eb858732d6d..6aedbd7077ff 100644 --- a/arch/arm/boot/dts/stm32mp15-pinctrl.dtsi +++ b/arch/arm/boot/dts/stm32mp15-pinctrl.dtsi @@ -1574,6 +1574,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; + }; + }; + usart2_pins_a: usart2-0 { pins1 { pinmux = <STM32_PINMUX('F', 5, AF7)>, /* USART2_TX */ @@ -1776,18 +1790,4 @@ bias-disable; }; }; - - 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; - }; - }; };
Move spi4_pins_a nodes from pinctrl_z to pinctrl as the associated pins are not in BANK Z. Fixes: 498a7014989dfdd9a47864b55704dc829ed0dc90 Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com> --- arch/arm/boot/dts/stm32mp15-pinctrl.dtsi | 28 ++++++++++++------------ 1 file changed, 14 insertions(+), 14 deletions(-)