From 6785434709b74b9a821a21e7228a4c9eb4843095 Mon Sep 17 00:00:00 2001 From: Andre Przywara Date: Fri, 16 Apr 2021 11:52:27 +0100 Subject: sunxi: Bring back SD card as MMC device 0 Commit 2243d19e5618 ("mmc: mmc-uclass: Use dev_seq() to read aliases node's index") now actually enforces U-Boot's device enumeration policy, where explicitly named devices come first, then any other non-named devices follow, without filling gaps. For quite a while we have had an "mmc1 = &mmc2;" alias in our sunxi-u-boot.dtsi, which now leads to the problem that the SD card (which was always mmc device 0) now gets to be number 2. This breaks quite some boot scripts, including our own distro boot commands, and some other features looking at $mmc_bootdev, also fastboot. Just add an explicit mmc0 alias in the very same file to fix this and restore the old behaviour. Signed-off-by: Andre Przywara Reported-by: Samuel Holland Tested-by: Simon Baatz --- arch/arm/dts/sunxi-u-boot.dtsi | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/dts/sunxi-u-boot.dtsi b/arch/arm/dts/sunxi-u-boot.dtsi index a4227a3c22d..06da009fa28 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; }; -- cgit v1.2.3 From f264e796c06d7ce6c039bfc7255390309cbc5191 Mon Sep 17 00:00:00 2001 From: Samuel Holland Date: Sun, 18 Apr 2021 22:13:36 -0500 Subject: MAINTAINERS: Add allwinner/sunxi driver directories These drivers are sunxi platform-specific, and so are of interest to the sunxi maintainers. In fact, as there is no PHY driver maintainer, drivers/phy/allwinner had no maintainer at all. Signed-off-by: Samuel Holland Acked-by: Andre Przywara Signed-off-by: Andre Przywara --- MAINTAINERS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 9f0c9f9f735..4d0441c1a24 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 -- cgit v1.2.3