diff options
| author | Patrick Delaunay <patrick.delaunay@st.com> | 2020-04-21 12:27:35 +0200 |
|---|---|---|
| committer | Patrick Delaunay <patrick.delaunay@st.com> | 2020-04-24 15:50:15 +0200 |
| commit | e7a0251d50cb98eb76f49fc992d3c86f056a1ea2 (patch) | |
| tree | 767bafbf2082494563e24f4961e58d3a78edd132 /arch/arm/dts/stm32mp157a-avenger96.dts | |
| parent | dbfd9e0e61ff1f9c65703959ed8e3ceb410d1e7e (diff) | |
| download | u-boot-e7a0251d50cb98eb76f49fc992d3c86f056a1ea2.tar.gz | |
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>
Diffstat (limited to 'arch/arm/dts/stm32mp157a-avenger96.dts')
| -rw-r--r-- | arch/arm/dts/stm32mp157a-avenger96.dts | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/dts/stm32mp157a-avenger96.dts b/arch/arm/dts/stm32mp157a-avenger96.dts index 11e7e6367d..f9b79fada0 100644 --- a/arch/arm/dts/stm32mp157a-avenger96.dts +++ b/arch/arm/dts/stm32mp157a-avenger96.dts @@ -8,7 +8,6 @@ #include "stm32mp157.dtsi" #include "stm32mp15-pinctrl.dtsi" -#include "stm32mp157-pinctrl.dtsi" #include "stm32mp15xxac-pinctrl.dtsi" #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/mfd/st,stpmic1.h> |