diff options
| author | Tom Rini <trini@konsulko.com> | 2021-05-31 10:18:26 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-05-31 10:18:26 -0400 |
| commit | fa68645b948969cd9d6f40d19323ebe7c998f419 (patch) | |
| tree | 78b31e2edb1dd71cc55aecc4cac39c9723c6828e | |
| parent | ffd810487ec2ff6095edf3f3d058d7ed6eb85ff3 (diff) | |
| parent | f264e796c06d7ce6c039bfc7255390309cbc5191 (diff) | |
| download | u-boot-fa68645b948969cd9d6f40d19323ebe7c998f419.tar.gz u-boot-fa68645b948969cd9d6f40d19323ebe7c998f419.tar.bz2 u-boot-fa68645b948969cd9d6f40d19323ebe7c998f419.zip | |
Merge https://source.denx.de/u-boot/custodians/u-boot-sunxi
This contains the fix to bring back the SD card as MMC0. In the long run
we are looking into a more robust solution, but for now we need to fix
this, as this breaks the user experience left, right, and centre.
Also add the one MAINTAINERS path addition from Samuel.
| -rw-r--r-- | MAINTAINERS | 3 | ||||
| -rw-r--r-- | arch/arm/dts/sunxi-u-boot.dtsi | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 9f0c9f9f73..4d0441c1a2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -478,6 +478,9 @@ F: arch/arm/cpu/armv7/sunxi/ F: arch/arm/include/asm/arch-sunxi/ F: arch/arm/mach-sunxi/ F: board/sunxi/ +F: drivers/clk/sunxi/ +F: drivers/phy/allwinner/ +F: drivers/video/sunxi/ ARM TEGRA M: Tom Warren <twarren@nvidia.com> diff --git a/arch/arm/dts/sunxi-u-boot.dtsi b/arch/arm/dts/sunxi-u-boot.dtsi index a4227a3c22..06da009fa2 100644 --- a/arch/arm/dts/sunxi-u-boot.dtsi +++ b/arch/arm/dts/sunxi-u-boot.dtsi @@ -12,6 +12,7 @@ / { aliases { + mmc0 = &mmc0; mmc1 = &mmc2; }; |