mirror of
https://source.denx.de/u-boot/u-boot.git
synced 2026-06-13 15:03:58 +03:00
Remove the unnecessary file stm32mp157-pinctrl.dtsi and solve all issues introduced by the commit8914831860("Merge branch 'next'") after a conflict on the patch applied in the next branch in commit1a4f57c895("ARM: dts: stm32mp1: DT alignment with Linux 5.6-rc1") Need to reapplied on stm32mp15-pinctrl.dtsi the the 3 patches applied previously on file "stm32mp157-pinctrl.dtsi" in v2020.04 - commit4fdbe6487d("ARM: dts: stm32: Add alternate pinmux for SDMMC1 direction pins")' - commit5fdcba6402("ARM: dts: stm32: Add alternate pinmux for SDMMC2 pins 4-7")' - commit955de51111("ARM: dts: stm32: Add alternate pinmux for ethernet RGMII")' Cc: Marek Vasut <marex@denx.de> Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com> Reviewed-by: Patrice Chotard <patrice.chotard@st.com>