Message ID | 20240626030736.512113-1-marex@denx.de (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | ARM: dts: stm32: Fix STM32MP13xx pinmux node eth2-rgmii-sleep-0 copy-paste error | expand |
Hi Marek On 6/26/24 05:07, Marek Vasut wrote: > Fix pin copy-paste error in STM32MP13xx eth2-rgmii-sleep-0 pinmux > node. Clearly the pins like PG11 are not supposed to be duplicated > in the node pinmux property, fix them up to match the hardware pin > assignment. > > Fixes: d1193e65647e ("ARM: dts: stm32: Add pinmux nodes for DH electronics STM32MP13xx DHCOR SoM and DHSBC board") > Signed-off-by: Marek Vasut <marex@denx.de> > --- > Cc: Alexandre Torgue <alexandre.torgue@foss.st.com> > Cc: Christophe Roullier <christophe.roullier@foss.st.com> > Cc: Conor Dooley <conor+dt@kernel.org> > Cc: Krzysztof Kozlowski <krzk+dt@kernel.org> > Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com> > Cc: Rob Herring <robh@kernel.org> > Cc: devicetree@vger.kernel.org > Cc: kernel@dh-electronics.com > Cc: linux-arm-kernel@lists.infradead.org > Cc: linux-stm32@st-md-mailman.stormreply.com > --- > arch/arm/boot/dts/st/stm32mp13-pinctrl.dtsi | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > > diff --git a/arch/arm/boot/dts/st/stm32mp13-pinctrl.dtsi b/arch/arm/boot/dts/st/stm32mp13-pinctrl.dtsi > index 42995a8f5034c..9c7cf8f3c3e8b 100644 > --- a/arch/arm/boot/dts/st/stm32mp13-pinctrl.dtsi > +++ b/arch/arm/boot/dts/st/stm32mp13-pinctrl.dtsi > @@ -157,16 +157,16 @@ eth2_rgmii_sleep_pins_a: eth2-rgmii-sleep-0 { > pins1 { > pinmux = <STM32_PINMUX('F', 7, ANALOG)>, /* ETH_RGMII_TXD0 */ > <STM32_PINMUX('G', 11, ANALOG)>, /* ETH_RGMII_TXD1 */ > - <STM32_PINMUX('G', 11, ANALOG)>, /* ETH_RGMII_TXD2 */ > - <STM32_PINMUX('G', 11, ANALOG)>, /* ETH_RGMII_TXD3 */ > - <STM32_PINMUX('G', 8, ANALOG)>, /* ETH_RGMII_TX_CTL */ > - <STM32_PINMUX('F', 6, ANALOG)>, /* ETH_RGMII_GTX_CLK */ > - <STM32_PINMUX('B', 2, ANALOG)>, /* ETH_MDIO */ > + <STM32_PINMUX('G', 1, ANALOG)>, /* ETH_RGMII_TXD2 */ > + <STM32_PINMUX('E', 6, ANALOG)>, /* ETH_RGMII_TXD3 */ > + <STM32_PINMUX('F', 6, ANALOG)>, /* ETH_RGMII_TX_CTL */ > + <STM32_PINMUX('G', 3, ANALOG)>, /* ETH_RGMII_GTX_CLK */ > + <STM32_PINMUX('B', 6, ANALOG)>, /* ETH_MDIO */ > <STM32_PINMUX('G', 5, ANALOG)>, /* ETH_MDC */ > <STM32_PINMUX('F', 4, ANALOG)>, /* ETH_RGMII_RXD0 */ > <STM32_PINMUX('E', 2, ANALOG)>, /* ETH_RGMII_RXD1 */ > - <STM32_PINMUX('E', 2, ANALOG)>, /* ETH_RGMII_RXD2 */ > - <STM32_PINMUX('E', 2, ANALOG)>, /* ETH_RGMII_RXD3 */ > + <STM32_PINMUX('H', 6, ANALOG)>, /* ETH_RGMII_RXD2 */ > + <STM32_PINMUX('A', 8, ANALOG)>, /* ETH_RGMII_RXD3 */ > <STM32_PINMUX('A', 12, ANALOG)>, /* ETH_RGMII_RX_CTL */ > <STM32_PINMUX('H', 11, ANALOG)>; /* ETH_RGMII_RX_CLK */ > }; Applied on stm32-next. I think I'll squash the two fixes (this patch and the other one for the makefile) onto the initial patch when I create my PR vor v6.11. Regards Alex
On 6/27/24 10:22 AM, Alexandre TORGUE wrote: > Hi Marek > > On 6/26/24 05:07, Marek Vasut wrote: >> Fix pin copy-paste error in STM32MP13xx eth2-rgmii-sleep-0 pinmux >> node. Clearly the pins like PG11 are not supposed to be duplicated >> in the node pinmux property, fix them up to match the hardware pin >> assignment. >> >> Fixes: d1193e65647e ("ARM: dts: stm32: Add pinmux nodes for DH >> electronics STM32MP13xx DHCOR SoM and DHSBC board") >> Signed-off-by: Marek Vasut <marex@denx.de> >> --- >> Cc: Alexandre Torgue <alexandre.torgue@foss.st.com> >> Cc: Christophe Roullier <christophe.roullier@foss.st.com> >> Cc: Conor Dooley <conor+dt@kernel.org> >> Cc: Krzysztof Kozlowski <krzk+dt@kernel.org> >> Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com> >> Cc: Rob Herring <robh@kernel.org> >> Cc: devicetree@vger.kernel.org >> Cc: kernel@dh-electronics.com >> Cc: linux-arm-kernel@lists.infradead.org >> Cc: linux-stm32@st-md-mailman.stormreply.com >> --- >> arch/arm/boot/dts/st/stm32mp13-pinctrl.dtsi | 14 +++++++------- >> 1 file changed, 7 insertions(+), 7 deletions(-) >> >> diff --git a/arch/arm/boot/dts/st/stm32mp13-pinctrl.dtsi >> b/arch/arm/boot/dts/st/stm32mp13-pinctrl.dtsi >> index 42995a8f5034c..9c7cf8f3c3e8b 100644 >> --- a/arch/arm/boot/dts/st/stm32mp13-pinctrl.dtsi >> +++ b/arch/arm/boot/dts/st/stm32mp13-pinctrl.dtsi >> @@ -157,16 +157,16 @@ eth2_rgmii_sleep_pins_a: eth2-rgmii-sleep-0 { >> pins1 { >> pinmux = <STM32_PINMUX('F', 7, ANALOG)>, /* >> ETH_RGMII_TXD0 */ >> <STM32_PINMUX('G', 11, ANALOG)>, /* ETH_RGMII_TXD1 */ >> - <STM32_PINMUX('G', 11, ANALOG)>, /* ETH_RGMII_TXD2 */ >> - <STM32_PINMUX('G', 11, ANALOG)>, /* ETH_RGMII_TXD3 */ >> - <STM32_PINMUX('G', 8, ANALOG)>, /* ETH_RGMII_TX_CTL */ >> - <STM32_PINMUX('F', 6, ANALOG)>, /* ETH_RGMII_GTX_CLK */ >> - <STM32_PINMUX('B', 2, ANALOG)>, /* ETH_MDIO */ >> + <STM32_PINMUX('G', 1, ANALOG)>, /* ETH_RGMII_TXD2 */ >> + <STM32_PINMUX('E', 6, ANALOG)>, /* ETH_RGMII_TXD3 */ >> + <STM32_PINMUX('F', 6, ANALOG)>, /* ETH_RGMII_TX_CTL */ >> + <STM32_PINMUX('G', 3, ANALOG)>, /* ETH_RGMII_GTX_CLK */ >> + <STM32_PINMUX('B', 6, ANALOG)>, /* ETH_MDIO */ >> <STM32_PINMUX('G', 5, ANALOG)>, /* ETH_MDC */ >> <STM32_PINMUX('F', 4, ANALOG)>, /* ETH_RGMII_RXD0 */ >> <STM32_PINMUX('E', 2, ANALOG)>, /* ETH_RGMII_RXD1 */ >> - <STM32_PINMUX('E', 2, ANALOG)>, /* ETH_RGMII_RXD2 */ >> - <STM32_PINMUX('E', 2, ANALOG)>, /* ETH_RGMII_RXD3 */ >> + <STM32_PINMUX('H', 6, ANALOG)>, /* ETH_RGMII_RXD2 */ >> + <STM32_PINMUX('A', 8, ANALOG)>, /* ETH_RGMII_RXD3 */ >> <STM32_PINMUX('A', 12, ANALOG)>, /* >> ETH_RGMII_RX_CTL */ >> <STM32_PINMUX('H', 11, ANALOG)>; /* >> ETH_RGMII_RX_CLK */ >> }; > > Applied on stm32-next. I think I'll squash the two fixes (this patch and > the other one for the makefile) onto the initial patch when I create my > PR vor v6.11. Fine by me, thanks !
diff --git a/arch/arm/boot/dts/st/stm32mp13-pinctrl.dtsi b/arch/arm/boot/dts/st/stm32mp13-pinctrl.dtsi index 42995a8f5034c..9c7cf8f3c3e8b 100644 --- a/arch/arm/boot/dts/st/stm32mp13-pinctrl.dtsi +++ b/arch/arm/boot/dts/st/stm32mp13-pinctrl.dtsi @@ -157,16 +157,16 @@ eth2_rgmii_sleep_pins_a: eth2-rgmii-sleep-0 { pins1 { pinmux = <STM32_PINMUX('F', 7, ANALOG)>, /* ETH_RGMII_TXD0 */ <STM32_PINMUX('G', 11, ANALOG)>, /* ETH_RGMII_TXD1 */ - <STM32_PINMUX('G', 11, ANALOG)>, /* ETH_RGMII_TXD2 */ - <STM32_PINMUX('G', 11, ANALOG)>, /* ETH_RGMII_TXD3 */ - <STM32_PINMUX('G', 8, ANALOG)>, /* ETH_RGMII_TX_CTL */ - <STM32_PINMUX('F', 6, ANALOG)>, /* ETH_RGMII_GTX_CLK */ - <STM32_PINMUX('B', 2, ANALOG)>, /* ETH_MDIO */ + <STM32_PINMUX('G', 1, ANALOG)>, /* ETH_RGMII_TXD2 */ + <STM32_PINMUX('E', 6, ANALOG)>, /* ETH_RGMII_TXD3 */ + <STM32_PINMUX('F', 6, ANALOG)>, /* ETH_RGMII_TX_CTL */ + <STM32_PINMUX('G', 3, ANALOG)>, /* ETH_RGMII_GTX_CLK */ + <STM32_PINMUX('B', 6, ANALOG)>, /* ETH_MDIO */ <STM32_PINMUX('G', 5, ANALOG)>, /* ETH_MDC */ <STM32_PINMUX('F', 4, ANALOG)>, /* ETH_RGMII_RXD0 */ <STM32_PINMUX('E', 2, ANALOG)>, /* ETH_RGMII_RXD1 */ - <STM32_PINMUX('E', 2, ANALOG)>, /* ETH_RGMII_RXD2 */ - <STM32_PINMUX('E', 2, ANALOG)>, /* ETH_RGMII_RXD3 */ + <STM32_PINMUX('H', 6, ANALOG)>, /* ETH_RGMII_RXD2 */ + <STM32_PINMUX('A', 8, ANALOG)>, /* ETH_RGMII_RXD3 */ <STM32_PINMUX('A', 12, ANALOG)>, /* ETH_RGMII_RX_CTL */ <STM32_PINMUX('H', 11, ANALOG)>; /* ETH_RGMII_RX_CLK */ };
Fix pin copy-paste error in STM32MP13xx eth2-rgmii-sleep-0 pinmux node. Clearly the pins like PG11 are not supposed to be duplicated in the node pinmux property, fix them up to match the hardware pin assignment. Fixes: d1193e65647e ("ARM: dts: stm32: Add pinmux nodes for DH electronics STM32MP13xx DHCOR SoM and DHSBC board") Signed-off-by: Marek Vasut <marex@denx.de> --- Cc: Alexandre Torgue <alexandre.torgue@foss.st.com> Cc: Christophe Roullier <christophe.roullier@foss.st.com> Cc: Conor Dooley <conor+dt@kernel.org> Cc: Krzysztof Kozlowski <krzk+dt@kernel.org> Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com> Cc: Rob Herring <robh@kernel.org> Cc: devicetree@vger.kernel.org Cc: kernel@dh-electronics.com Cc: linux-arm-kernel@lists.infradead.org Cc: linux-stm32@st-md-mailman.stormreply.com --- arch/arm/boot/dts/st/stm32mp13-pinctrl.dtsi | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)