Hi Dario, On Sat, Jun 07, 2025 at 11:37:09AM +0200, Dario Binacchi wrote: > Allow expanding possible configurations for the same peripheral, > consistent with the scheme adopted in Linux. > > Signed-off-by: Dario Binacchi <[email protected]> > Link: > https://lore.kernel.org/r/[email protected] > Signed-off-by: Alexandre Torgue <[email protected]> > > [ upstream commit: 6a36dca4375fce51b627f5a985a79fc8b8bd7f55 ] >
This doesn't show as a proper cherry-pick from devicetree-rebasing tree, following fails for me: $ ./tools/update-subtree.sh pick dts 6a36dca4375fce51b627f5a985a79fc8b8bd7f55 >From >https://git.kernel.org/pub/scm/linux/kernel/git/devicetree/devicetree-rebasing * branch master -> FETCH_HEAD fatal: bad object 6a36dca4375fce51b627f5a985a79fc8b8bd7f55 Has this patch landed in Linux mainline? Ditto for all the subsequent patches in this series. -Sumit > --- > > dts/upstream/src/arm/st/stm32h7-pinctrl.dtsi | 8 ++++---- > dts/upstream/src/arm/st/stm32h743i-disco.dts | 2 +- > dts/upstream/src/arm/st/stm32h743i-eval.dts | 2 +- > dts/upstream/src/arm/st/stm32h750i-art-pi.dts | 6 +++--- > 4 files changed, 9 insertions(+), 9 deletions(-) > > diff --git a/dts/upstream/src/arm/st/stm32h7-pinctrl.dtsi > b/dts/upstream/src/arm/st/stm32h7-pinctrl.dtsi > index 7f1d234e1024..ad00c1080a96 100644 > --- a/dts/upstream/src/arm/st/stm32h7-pinctrl.dtsi > +++ b/dts/upstream/src/arm/st/stm32h7-pinctrl.dtsi > @@ -198,7 +198,7 @@ > }; > }; > > - uart4_pins: uart4-0 { > + uart4_pins_a: uart4-0 { > pins1 { > pinmux = <STM32_PINMUX('A', 0, AF8)>; /* UART4_TX */ > bias-disable; > @@ -211,7 +211,7 @@ > }; > }; > > - usart1_pins: usart1-0 { > + usart1_pins_a: usart1-0 { > pins1 { > pinmux = <STM32_PINMUX('B', 14, AF4)>; /* USART1_TX */ > bias-disable; > @@ -224,7 +224,7 @@ > }; > }; > > - usart2_pins: usart2-0 { > + usart2_pins_a: usart2-0 { > pins1 { > pinmux = <STM32_PINMUX('D', 5, AF7)>; /* USART2_TX */ > bias-disable; > @@ -237,7 +237,7 @@ > }; > }; > > - usart3_pins: usart3-0 { > + usart3_pins_a: usart3-0 { > pins1 { > pinmux = <STM32_PINMUX('B', 10, AF7)>, /* USART3_TX */ > <STM32_PINMUX('D', 12, AF7)>; /* USART3_RTS_DE > */ > diff --git a/dts/upstream/src/arm/st/stm32h743i-disco.dts > b/dts/upstream/src/arm/st/stm32h743i-disco.dts > index 2b452883a708..8451a54a9a08 100644 > --- a/dts/upstream/src/arm/st/stm32h743i-disco.dts > +++ b/dts/upstream/src/arm/st/stm32h743i-disco.dts > @@ -105,7 +105,7 @@ > }; > > &usart2 { > - pinctrl-0 = <&usart2_pins>; > + pinctrl-0 = <&usart2_pins_a>; > pinctrl-names = "default"; > status = "okay"; > }; > diff --git a/dts/upstream/src/arm/st/stm32h743i-eval.dts > b/dts/upstream/src/arm/st/stm32h743i-eval.dts > index 5c5d8059bdc7..4b0ced27b80e 100644 > --- a/dts/upstream/src/arm/st/stm32h743i-eval.dts > +++ b/dts/upstream/src/arm/st/stm32h743i-eval.dts > @@ -145,7 +145,7 @@ > }; > > &usart1 { > - pinctrl-0 = <&usart1_pins>; > + pinctrl-0 = <&usart1_pins_a>; > pinctrl-names = "default"; > status = "okay"; > }; > diff --git a/dts/upstream/src/arm/st/stm32h750i-art-pi.dts > b/dts/upstream/src/arm/st/stm32h750i-art-pi.dts > index 44c307f8b09c..00d195d52a45 100644 > --- a/dts/upstream/src/arm/st/stm32h750i-art-pi.dts > +++ b/dts/upstream/src/arm/st/stm32h750i-art-pi.dts > @@ -197,14 +197,14 @@ > }; > > &usart2 { > - pinctrl-0 = <&usart2_pins>; > + pinctrl-0 = <&usart2_pins_a>; > pinctrl-names = "default"; > status = "disabled"; > }; > > &usart3 { > pinctrl-names = "default"; > - pinctrl-0 = <&usart3_pins>; > + pinctrl-0 = <&usart3_pins_a>; > dmas = <&dmamux1 45 0x400 0x05>, > <&dmamux1 46 0x400 0x05>; > dma-names = "rx", "tx"; > @@ -221,7 +221,7 @@ > }; > > &uart4 { > - pinctrl-0 = <&uart4_pins>; > + pinctrl-0 = <&uart4_pins_a>; > pinctrl-names = "default"; > status = "okay"; > }; > -- > 2.43.0 >
