Extending upstream STM32MP1 pinctrl group nodes is a bad idea. They tend to be split and pinmux entries are moved between subnodes, which may induce subtle breakage and may have already happened for RGMII in Phycore DT. Upstream pinctrl nodes should either be used fully as-is or new fully-specified nodes be created that are safe from upstream changes. Signed-off-by: Ahmad Fatoum <a.fatoum@xxxxxxxxxxxxxx> --- arch/arm/dts/stm32mp151-prtt1c.dts | 5 +++++ arch/arm/dts/stm32mp151-prtt1l-net.dtsi | 5 +++++ arch/arm/dts/stm32mp151-prtt1l.dtsi | 6 ++++++ arch/arm/dts/stm32mp157c-phycore-stm32mp15-pinctrl.dtsi | 5 +++++ 4 files changed, 21 insertions(+) diff --git a/arch/arm/dts/stm32mp151-prtt1c.dts b/arch/arm/dts/stm32mp151-prtt1c.dts index 4eaf6712a5d6..f754deacf0e9 100644 --- a/arch/arm/dts/stm32mp151-prtt1c.dts +++ b/arch/arm/dts/stm32mp151-prtt1c.dts @@ -171,6 +171,11 @@ status = "okay"; }; +/* + * FIXME: Below nodes should be fleshed out into complete pinctrl groups in their + * own right. Otherwise, they will eventually be broken by upstream rework. + */ + ðernet0_rmii_pins_a { pins1 { pinmux = <STM32_PINMUX('B', 12, AF11)>, /* ETH1_RMII_TXD0 */ diff --git a/arch/arm/dts/stm32mp151-prtt1l-net.dtsi b/arch/arm/dts/stm32mp151-prtt1l-net.dtsi index 04f4d64aaaa5..a10e696e7d7e 100644 --- a/arch/arm/dts/stm32mp151-prtt1l-net.dtsi +++ b/arch/arm/dts/stm32mp151-prtt1l-net.dtsi @@ -2,6 +2,11 @@ // SPDX-FileCopyrightText: 2021 David Jander, Protonic Holland // SPDX-FileCopyrightText: 2021 Oleksij Rempel, Pengutronix +/* + * FIXME: Below nodes should be fleshed out into complete pinctrl groups in their + * own right. Otherwise, they will eventually be broken by upstream rework. + */ + ðernet0 { pinctrl-0 = <ðernet0_rmii_pins_a>; pinctrl-names = "default"; diff --git a/arch/arm/dts/stm32mp151-prtt1l.dtsi b/arch/arm/dts/stm32mp151-prtt1l.dtsi index 80ae72dee22a..6c67bb936def 100644 --- a/arch/arm/dts/stm32mp151-prtt1l.dtsi +++ b/arch/arm/dts/stm32mp151-prtt1l.dtsi @@ -80,6 +80,12 @@ status = "okay"; }; +/* + * FIXME: Below nodes should be fleshed out into complete pinctrl groups in their + * own right. Otherwise, they will eventually be broken by upstream rework. + */ + + &sdmmc1_b4_pins_a { pins1 { bias-pull-up; diff --git a/arch/arm/dts/stm32mp157c-phycore-stm32mp15-pinctrl.dtsi b/arch/arm/dts/stm32mp157c-phycore-stm32mp15-pinctrl.dtsi index 011d73ec3f1a..18fbecc906e4 100644 --- a/arch/arm/dts/stm32mp157c-phycore-stm32mp15-pinctrl.dtsi +++ b/arch/arm/dts/stm32mp157c-phycore-stm32mp15-pinctrl.dtsi @@ -5,6 +5,11 @@ */ #include <arm/stm32mp15-pinctrl.dtsi> +/* + * FIXME: Below nodes should be fleshed out into complete pinctrl groups in their + * own right. Otherwise, they will eventually be broken by upstream rework. + */ + ðernet0_rgmii_pins_a { pins1 { pinmux = <STM32_PINMUX('G', 4, AF11)>, /* ETH_RGMII_GTX_CLK */ -- 2.30.2