overlays: Add updated mmc1 alias to sdio overlays

In the downstream RPi kernel, aliases are used to assign instance
numbers to the SD/MMC interfaces. The updated sdio overlays
effectively rename the device node, so the mmc1 alias has to be
updated in order to preserve the mmc1 numbering, otherwise the device
will appear as mmc2.

Signed-off-by: Phil Elwell <phil@raspberrypi.org>
(cherry picked from commit e947e787796e72ca7fce395a0179b63d32b8eff8
https://github.com/raspberrypi/linux raspi/rpi-4.15.y)
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>

diff --git a/arch/arm/boot/dts/overlays/sdio-1bit-overlay.dts b/arch/arm/boot/dts/overlays/sdio-1bit-overlay.dts
index c0898dc57036817ddb1468c5975050c756835b02..297daae8faf9f41ab625e14251d5fa6cd2ee8540 100644 (file)
--- a/arch/arm/boot/dts/overlays/sdio-1bit-overlay.dts
+++ b/arch/arm/boot/dts/overlays/sdio-1bit-overlay.dts
@@ -48,6 +48,14 @@
                };
        };
 
+       fragment@3 {
+               target-path = "/aliases";
+               __overlay__ {
+                       mmc1 = "/soc/sdio@7e300000";
+               };
+       };
+
+
        __overrides__ {
                poll_once = <&sdio_1bit>,"non-removable?";
                sdio_overclock = <&sdio_1bit>,"brcm,overclock-50:0";

diff --git a/arch/arm/boot/dts/overlays/sdio-overlay.dts b/arch/arm/boot/dts/overlays/sdio-overlay.dts
index 2ac7d4f5f81d7eb4af674047ae90aeb95cc8357e..685b65a858e89c1f379dc4c282a29f0703faad83 100644 (file)
--- a/arch/arm/boot/dts/overlays/sdio-overlay.dts
+++ b/arch/arm/boot/dts/overlays/sdio-overlay.dts
@@ -48,6 +48,13 @@
                };
        };
 
+       fragment@3 {
+               target-path = "/aliases";
+               __overlay__ {
+                       mmc1 = "/soc/sdio@7e300000";
+               };
+       };
+
        __overrides__ {
                poll_once = <&sdio_ovl>,"non-removable?";
                bus_width = <&sdio_ovl>,"bus-width:0";