]> git.dujemihanovic.xyz Git - u-boot.git/commit
ARM: dts: stm32mp1: remove file stm32mp157-pinctrl.dtsi
authorPatrick Delaunay <patrick.delaunay@st.com>
Tue, 21 Apr 2020 10:27:35 +0000 (12:27 +0200)
committerPatrick Delaunay <patrick.delaunay@st.com>
Fri, 24 Apr 2020 13:50:15 +0000 (15:50 +0200)
commite7a0251d50cb98eb76f49fc992d3c86f056a1ea2
tree767bafbf2082494563e24f4961e58d3a78edd132
parentdbfd9e0e61ff1f9c65703959ed8e3ceb410d1e7e
ARM: dts: stm32mp1: remove file stm32mp157-pinctrl.dtsi

Remove the unnecessary file stm32mp157-pinctrl.dtsi and
solve all issues introduced by the commit 891483186052b2598 ("Merge branch
 'next'") after a conflict on the patch applied in the next branch in
commit 1a4f57c895cc ("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
- commit 4fdbe6487daa ("ARM: dts: stm32: Add alternate pinmux for SDMMC1
 direction pins")'
- commit 5fdcba64027f ("ARM: dts: stm32: Add alternate pinmux for SDMMC2
 pins 4-7")'
- commit 955de5111112 ("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>
arch/arm/dts/stm32mp15-pinctrl.dtsi
arch/arm/dts/stm32mp157-pinctrl.dtsi [deleted file]
arch/arm/dts/stm32mp157a-avenger96.dts