diff options
| author | Tom Rini <trini@konsulko.com> | 2022-05-25 06:29:00 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-05-25 06:29:00 +0300 |
| commit | 7e0edcadb09d55d5319fdc862041fd1b874476f5 (patch) | |
| tree | 3c5b591fea0c39989c580df0cdc78c6731a317eb /drivers/mmc | |
| parent | 1b04a961c6bcb9768f517198890cac680ee532e8 (diff) | |
| parent | 7495051219b64ec0e8fac8930586dc10666530da (diff) | |
| download | u-boot-7e0edcadb09d55d5319fdc862041fd1b874476f5.tar.xz | |
Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-sunxi
The bulk of it is (finally!) some DT sync from the kernel. We refrained
from syncing one incompatible change, as this would spoil booting Linux
kernels before v5.13 with U-Boot's DT (via UEFI, for instance).
I test booted Linux v5.18 and v5.4 with that new DT on some boards, and
the headless peripherals (MMC, USB, Ethernet) seemed to work.
The rest are fixes:
- silencing missing clock warnings due to the new pinctrl driver
- fixing "UART0 on PortF", allowing UART access through the SD card pins
- add an F1C100s clock driver, to enable MMC support (SPI comes later)
- some cleanups for CONS_INDEX_n in Kconfig
Tested on BananaPi-M1, Pine64-LTS, Pine-H64, X96-Mate (H616) and
OrangePi-Zero.
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig index f04cc44e19..5e2921ce41 100644 --- a/drivers/mmc/Kconfig +++ b/drivers/mmc/Kconfig @@ -727,7 +727,7 @@ config ZYNQ_HISPD_BROKEN config MMC_SUNXI bool "Allwinner sunxi SD/MMC Host Controller support" - depends on ARCH_SUNXI && !UART0_PORT_F + depends on ARCH_SUNXI default y help This selects support for the SD/MMC Host Controller on |