]> git.baikalelectronics.ru Git - uboot.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)
commitb97ffaacef602acc33c12df8f76b9d21e1f29b7b
tree767bafbf2082494563e24f4961e58d3a78edd132
parent1e7885d0396ae12bb7443b91a743466d0c17993d
ARM: dts: stm32mp1: remove file stm32mp157-pinctrl.dtsi

Remove the unnecessary file stm32mp157-pinctrl.dtsi and
solve all issues introduced by the commit cc6048efd5f6d64e9 ("Merge branch
 'next'") after a conflict on the patch applied in the next branch in
commit 2c07b0a2819b ("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 a085dc2f237e ("ARM: dts: stm32: Add alternate pinmux for SDMMC1
 direction pins")'
- commit d43be080061e ("ARM: dts: stm32: Add alternate pinmux for SDMMC2
 pins 4-7")'
- commit 6e5eb890b400 ("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