u-boot/arch/arm
Patrick Delaunay e7a0251d50 ARM: dts: stm32mp1: remove file stm32mp157-pinctrl.dtsi
Remove the unnecessary file stm32mp157-pinctrl.dtsi and
solve all issues introduced by the commit 8914831860 ("Merge branch
 'next'") after a conflict on the patch applied in the next branch in
commit 1a4f57c895 ("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 4fdbe6487d ("ARM: dts: stm32: Add alternate pinmux for SDMMC1
 direction pins")'
- commit 5fdcba6402 ("ARM: dts: stm32: Add alternate pinmux for SDMMC2
 pins 4-7")'
- commit 955de51111 ("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>
2020-04-24 15:50:15 +02:00
..
cpu phy: add support for backplane kr mode 2020-04-20 13:35:11 +05:30
dts ARM: dts: stm32mp1: remove file stm32mp157-pinctrl.dtsi 2020-04-24 15:50:15 +02:00
include Merge https://gitlab.denx.de/u-boot/custodians/u-boot-fsl-qoriq 2020-04-21 15:20:42 -04:00
lib ARM: bootm: take into account gd->ram_top 2020-04-17 12:29:43 -04:00
mach-aspeed dm: core: Require users of devres to include the header 2020-02-05 19:33:46 -07:00
mach-at91 common: Move hang() to the same header as panic() 2020-01-24 23:06:49 +05:30
mach-bcm283x rpi4: Update memory map to accommodate scb devices 2020-01-29 18:30:33 +01:00
mach-bcmstb
mach-cortina board: presidio-asic: Add basic G3 engr. development board support 2020-02-07 16:16:01 -05:00
mach-davinci mach-davinci: Hard-code the default SPL_LDSCRIPT path 2020-03-16 18:54:18 -04:00
mach-exynos arm: exynos: Read default MMC device from XOM[7:5] pins 2020-01-28 09:54:05 +09:00
mach-highbank
mach-imx spl: mmc: Rename spl_boot_mode() to spl_mmc_boot_mode() 2020-04-22 20:41:57 +08:00
mach-integrator env: Convert CONFIG_ENV_IS_IN... to a choice 2017-08-15 20:50:01 -04:00
mach-k3 spl: mmc: Rename spl_boot_mode() to spl_mmc_boot_mode() 2020-04-22 20:41:57 +08:00
mach-keystone common: Move hang() to the same header as panic() 2020-01-24 23:06:49 +05:30
mach-kirkwood common: Move reset_cpu() to the CPU header 2020-01-24 23:06:49 +05:30
mach-mediatek arm: mediatek: remove unused binman config 2020-03-10 17:08:13 -04:00
mach-meson arm: meson-gx: add board_usb_init()/cleanup() for USB gadget 2020-04-20 14:19:10 +02:00
mach-mvebu arm: mvebu: correct SPL boot configs for SPI/MMC 2020-04-22 14:28:15 +02:00
mach-omap2 spl: mmc: Rename spl_boot_mode() to spl_mmc_boot_mode() 2020-04-22 20:41:57 +08:00
mach-orion5x edminiv2: Move CONFIG_SPL_LDSCRIPT to defconfig 2020-03-16 18:54:18 -04:00
mach-owl board: Add uCRobotics Bubblegum-96 board support 2018-07-09 15:25:23 -04:00
mach-qemu
mach-rmobile common: Move some cache and MMU functions out of common.h 2019-12-02 18:23:55 -05:00
mach-rockchip spl: mmc: Rename spl_boot_mode() to spl_mmc_boot_mode() 2020-04-22 20:41:57 +08:00
mach-s5pc1xx common: Move some cache and MMU functions out of common.h 2019-12-02 18:23:55 -05:00
mach-snapdragon mach-snapdragon: Fix overwriting last digit of serial number 2020-04-03 11:47:47 -04:00
mach-socfpga spl: mmc: Rename spl_boot_mode() to spl_mmc_boot_mode() 2020-04-22 20:41:57 +08:00
mach-sti
mach-stm32 mach-stm32: Fix MPU region size dedicated to SDRAM for STM32F4 2019-06-28 09:45:27 +02:00
mach-stm32mp spl: mmc: Rename spl_boot_partition() to spl_mmc_boot_partition() 2020-04-22 20:41:57 +08:00
mach-sunxi sunxi: SPL SPI: Add SPI boot support for the Allwinner H6 SoC 2020-03-18 18:12:04 +05:30
mach-tegra ARM: tegra: Add NVIDIA Jetson Nano Developer Kit support 2020-04-02 14:30:02 -07:00
mach-u8500 board: Add new Samsung "stemmy" board based on ST-Ericsson U8500 2020-01-22 17:47:57 -05:00
mach-uniphier spl: mmc: Rename spl_boot_mode() to spl_mmc_boot_mode() 2020-04-22 20:41:57 +08:00
mach-versal arm64: versal: Disable DDR cache mapping if DDR is not enabled 2020-04-06 12:52:45 +02:00
mach-versatile SPDX: Convert all of our single license tags to Linux Kernel style 2018-05-07 09:34:12 -04:00
mach-zynq ARM: zynq: Do not print message about boot device 2020-04-06 12:52:45 +02:00
mach-zynqmp arm64: zynqmp: Add support for u-boot.itb generation without ATF 2020-04-06 12:52:45 +02:00
mach-zynqmp-r5 common: Move reset_cpu() to the CPU header 2020-01-17 14:02:31 -05:00
thumb1/include/asm/proc-armv
config.mk efi_loader: Rename sections to allow for implicit data 2018-07-25 14:57:44 +02:00
Kconfig - enable DM_RNG on meson boards 2020-04-20 13:44:27 -04:00
Kconfig.debug
Makefile arm: Add support for ST-Ericsson U8500 SoC 2020-01-22 17:47:57 -05:00