ARM: dts: exynos: add mmc aliases
authorHenrik Grimler <henrik@grimler.se>
Sun, 2 Apr 2023 14:47:24 +0000 (16:47 +0200)
committerKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Mon, 3 Apr 2023 16:16:55 +0000 (18:16 +0200)
Add aliases for eMMC, SD card and WiFi where applicable, so that
assigned mmc indeces are always the same.

Co-developed-by: Anton Bambura <jenneron@protonmail.com>
Signed-off-by: Anton Bambura <jenneron@protonmail.com>
[ Tested on exynos5800-peach-pi ]
Tested-by: Valentine Iourine <iourine@iourine.msk.su>
Signed-off-by: Henrik Grimler <henrik@grimler.se>
Tested-by: Marek Szyprowski <m.szyprowski@samsung.com>
Link: https://lore.kernel.org/r/20230402144724.17839-3-henrik@grimler.se
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
32 files changed:
arch/arm/boot/dts/exynos3250-artik5-eval.dts
arch/arm/boot/dts/exynos3250-artik5.dtsi
arch/arm/boot/dts/exynos3250-monk.dts
arch/arm/boot/dts/exynos3250-rinato.dts
arch/arm/boot/dts/exynos4210-i9100.dts
arch/arm/boot/dts/exynos4210-origen.dts
arch/arm/boot/dts/exynos4210-smdkv310.dts
arch/arm/boot/dts/exynos4210-trats.dts
arch/arm/boot/dts/exynos4210-universal_c210.dts
arch/arm/boot/dts/exynos4412-itop-elite.dts
arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi
arch/arm/boot/dts/exynos4412-midas.dtsi
arch/arm/boot/dts/exynos4412-odroid-common.dtsi
arch/arm/boot/dts/exynos4412-origen.dts
arch/arm/boot/dts/exynos4412-p4note.dtsi
arch/arm/boot/dts/exynos4412-smdk4412.dts
arch/arm/boot/dts/exynos4412-tiny4412.dts
arch/arm/boot/dts/exynos5250-arndale.dts
arch/arm/boot/dts/exynos5250-smdk5250.dts
arch/arm/boot/dts/exynos5250-snow-common.dtsi
arch/arm/boot/dts/exynos5250-spring.dts
arch/arm/boot/dts/exynos5260-xyref5260.dts
arch/arm/boot/dts/exynos5410-odroidxu.dts
arch/arm/boot/dts/exynos5410-smdk5410.dts
arch/arm/boot/dts/exynos5420-arndale-octa.dts
arch/arm/boot/dts/exynos5420-galaxy-tab-common.dtsi
arch/arm/boot/dts/exynos5420-peach-pit.dts
arch/arm/boot/dts/exynos5420-smdk5420.dts
arch/arm/boot/dts/exynos5422-odroid-core.dtsi
arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
arch/arm/boot/dts/exynos5422-samsung-k3g.dts
arch/arm/boot/dts/exynos5800-peach-pi.dts

index a1e22f6306385b42123c9851e31eaa1cbefed318..660cc7fac4db3bc1463e931552d713b6f6c57e2a 100644 (file)
        model = "Samsung ARTIK5 evaluation board";
        compatible = "samsung,artik5-eval", "samsung,artik5",
                        "samsung,exynos3250", "samsung,exynos3";
+
+       aliases {
+               mmc0 = &mshc_2;
+       };
 };
 
 &mshc_2 {
index b81e1a9df12600664200a6ce81e08269cc063b6e..3fdd922e635ce6f69854e4d598e3f385fbe817ba 100644 (file)
 / {
        compatible = "samsung,artik5", "samsung,exynos3250", "samsung,exynos3";
 
+       aliases {
+               mmc0 = &mshc_0;
+               mmc1 = &mshc_1;
+       };
+
        chosen {
                stdout-path = &serial_2;
        };
index 861c26824d4f80aa37b6b1b99faee789c8c2c980..2de877d4ccc5c8029035e76195977d2e1e7d0553 100644 (file)
@@ -22,6 +22,7 @@
 
        aliases {
                i2c7 = &i2c_max77836;
+               mmc0 = &mshc_0;
        };
 
        memory@40000000 {
index a252a5f667eb484481c4f966b373493ffcb7280e..88fb3e68ff029197b3eaeb18a69f63b174da617f 100644 (file)
@@ -23,6 +23,8 @@
 
        aliases {
                i2c7 = &i2c_max77836;
+               mmc0 = &mshc_0;
+               mmc1 = &mshc_1;
        };
 
        chosen {
index bba85011ecc93da5f366846b5e072a5edcf1d2e1..37cd4dde53e4763c803eb6624c3194bd0b13f601 100644 (file)
                reg = <0x40000000 0x40000000>;
        };
 
+       aliases {
+               mmc0 = &sdhci_0;
+               mmc1 = &sdhci_2;
+               mmc2 = &sdhci_3;
+       };
+
        chosen {
                stdout-path = "serial2:115200n8";
        };
index 1103e7f92b570ceb0df2c33d70a685d965e91374..f1927ca15e080af9486f2b1e31337109f6979f98 100644 (file)
                       0x70000000 0x10000000>;
        };
 
+       aliases {
+               mmc0 = &sdhci_0;
+               mmc1 = &sdhci_2;
+       };
+
        chosen {
                bootargs = "root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M init=/linuxrc";
                stdout-path = "serial2:115200n8";
index 181c99eca6751d070c158b9552cbae57469b633f..b566f878ed84f9db891c11084d54f48ba096639d 100644 (file)
                reg = <0x40000000 0x80000000>;
        };
 
+       aliases {
+               mmc0 = &sdhci_2;
+       };
+
        chosen {
                bootargs = "root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M init=/linuxrc";
                stdout-path = "serial1:115200n8";
index b8e9dd23fc51270bac3f8a38b8bcc1370150326d..ff6ee4b2c31b59bc75b4091fcef7719a9ba1f349 100644 (file)
                        0x70000000 0x10000000>;
        };
 
+       aliases {
+               mmc0 = &sdhci_0;
+               mmc1 = &sdhci_2;
+               mmc2 = &sdhci_3;
+       };
+
        chosen {
                bootargs = "root=/dev/mmcblk0p5 rootwait earlyprintk panic=5";
                stdout-path = "serial2:115200n8";
index 140abfb38e1dba78019591492aa7a315d9a788be..8fe0d5d2be2d9cacb9b280dd69e0214c3326fbf9 100644 (file)
                        0x50000000 0x10000000>;
        };
 
+       aliases {
+               mmc0 = &sdhci_0;
+               mmc1 = &sdhci_2;
+               mmc2 = &sdhci_3;
+       };
+
        chosen {
                bootargs = "root=/dev/mmcblk0p5 rw rootwait earlyprintk panic=5 maxcpus=1";
                stdout-path = "serial2:115200n8";
index 6260da187e92cf7c763b1f83ced7d699460cd62c..ded232b04e0de433d2589c8d25f0839670033ca5 100644 (file)
        model = "TOPEET iTop 4412 Elite board based on Exynos4412";
        compatible = "topeet,itop4412-elite", "samsung,exynos4412", "samsung,exynos4";
 
+       aliases {
+               mmc1 = &sdhci_2;
+       };
+
        chosen {
                bootargs = "root=/dev/mmcblk0p2 rw rootfstype=ext4 rootdelay=1 rootwait";
                stdout-path = "serial2:115200n8";
index ca8d42b2ce3b94aea14235e948b1c902340dbba8..7bc6968af9c335da7589378030ead1ebae2dec7a 100644 (file)
                reg = <0x40000000 0x40000000>;
        };
 
+       aliases {
+               mmc0 = &mshc_0;
+       };
+
        firmware@203f000 {
                compatible = "samsung,secure-firmware";
                reg = <0x0203f000 0x1000>;
index 82aed59cba7c08439de25572b0668b3cfd78f5de..e6b949c1a00f2e8f4a4ecf8a5a296eaab24e0b38 100644 (file)
@@ -25,6 +25,9 @@
        aliases {
                i2c11 = &i2c_max77693;
                i2c12 = &i2c_max77693_fuel;
+               mmc0 = &mshc_0;
+               mmc2 = &sdhci_2;
+               mmc3 = &sdhci_3;
        };
 
        chosen {
index 25e082fda955e73b9b54968513dd7b554f164a96..45ef7b7ba7e0f0e8769e9a61631339941fd1bc40 100644 (file)
 #include "exynos-mfc-reserved-memory.dtsi"
 
 / {
+       aliases {
+               mmc0 = &mshc_0;
+               mmc2 = &sdhci_2;
+       };
+
        chosen {
                stdout-path = &serial_1;
        };
index f6cebf73b839768ade4b72fdcf6d6c7985915fd6..23b151645d66867f9a9f63d3c935ab4e6b4bcae9 100644 (file)
                reg = <0x40000000 0x40000000>;
        };
 
+       aliases {
+               mmc0 = &mshc_0;
+               mmc1 = &sdhci_2;
+       };
+
        chosen {
                stdout-path = "serial2:115200n8";
        };
index 9052b3ebb3e8b341cdc6f20ee922348bf86da161..0b89d5682f857cc8a10fb5655866d2184e4d3cfa 100644 (file)
                reg = <0x40000000 0x80000000>;
        };
 
+       aliases {
+               mmc0 = &mshc_0;
+               mmc2 = &sdhci_2;
+               mmc3 = &sdhci_3;
+       };
+
        chosen {
                stdout-path = &serial_2;
        };
index a40ff394977c0440ec804382f9e12b5779024802..715dfcba14174388f049c33bb72f6738081d15c8 100644 (file)
                reg = <0x40000000 0x40000000>;
        };
 
+       aliases {
+               mmc0 = &sdhci_2;
+       };
+
        chosen {
                bootargs = "root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M init=/linuxrc";
                stdout-path = "serial1:115200n8";
index e0b6162d2e2ae8ef30bea046fe3bee933efc1fa6..5a2dcdc5c28b8150ca54a5b14eb522205245a836 100644 (file)
        model = "FriendlyARM TINY4412 board based on Exynos4412";
        compatible = "friendlyarm,tiny4412", "samsung,exynos4412", "samsung,exynos4";
 
+       aliases {
+               mmc0 = &sdhci_2;
+       };
+
        chosen {
                stdout-path = &serial_0;
        };
index 8f01337bb29187310f946f01789199e4404425a3..d586189966da5c071810a41ad855245902d213d1 100644 (file)
                reg = <0x40000000 0x80000000>;
        };
 
+       aliases {
+               mmc0 = &mmc_0;
+               mmc1 = &mmc_2;
+       };
+
        chosen {
                stdout-path = "serial2:115200n8";
        };
index f7d4017e1ede3afa376311dc6f7239666f8ce153..bb623726ef1e614c50074ec2890072b2b37d212e 100644 (file)
@@ -17,6 +17,8 @@
        compatible = "samsung,smdk5250", "samsung,exynos5250", "samsung,exynos5";
 
        aliases {
+               mmc0 = &mmc_0;
+               mmc1 = &mmc_2;
        };
 
        memory@40000000 {
index dea2dc8185786ee1ca66fb5b17052af15858129d..59b2cc35c37b75e819ca0de0c5d30d9d613a615b 100644 (file)
@@ -15,6 +15,9 @@
 / {
        aliases {
                i2c104 = &i2c_104;
+               mmc0 = &mmc_0; /* eMMC */
+               mmc1 = &mmc_2; /* SD */
+               mmc2 = &mmc_3; /* WiFi */
        };
 
        memory@40000000 {
index 8980cdbdcb3b87d2b455b6c02c5b76081b32ca8e..c12bb17631b7c92220de71ab66998a0168c46bd2 100644 (file)
                reg = <0x40000000 0x80000000>;
        };
 
+       aliases {
+               mmc0 = &mmc_0;
+               mmc1 = &mmc_1;
+       };
+
        chosen {
                bootargs = "console=tty1";
                stdout-path = "serial3:115200n8";
index 0fd728bc0b75cf11a29ea94f7e341447555c32da..d072a7398866b7c738dbea9a60b21b53e74153dd 100644 (file)
                reg = <0x20000000 0x80000000>;
        };
 
+       aliases {
+               mmc0 = &mmc_0;
+               mmc1 = &mmc_2;
+       };
+
        chosen {
                stdout-path = "serial2:115200n8";
        };
index 1ed73f3b4ac0ea74db8968181f8059cfc9094013..882fc77c4bc44e35dced6c981c176ea2cd679e2f 100644 (file)
@@ -21,6 +21,8 @@
 
        aliases {
                ethernet = &ethernet;
+               mmc0 = &mmc_0;
+               mmc1 = &mmc_2;
        };
 
        memory@40000000 {
index b4a74f9cf31917c67c28859093f2bd543f7c0558..bb29b76f6f6a94aeb8de58a121c806c3c9965ccc 100644 (file)
                reg = <0x40000000 0x80000000>;
        };
 
+       aliases {
+               mmc0 = &mmc_0;
+               mmc1 = &mmc_2;
+       };
+
        chosen {
                stdout-path = "serial2:115200n8";
        };
index 5ed55a5b0c67b1ad6f172559d5765c5a6b621590..809ddda02e5388a3f2fab96a661c007da05e742a 100644 (file)
                reg = <0x20000000 0x80000000>;
        };
 
+       aliases {
+               mmc0 = &mmc_0;
+               mmc1 = &mmc_2;
+       };
+
        chosen {
                stdout-path = "serial3:115200n8";
        };
index 6a51cb14b58a3d74b1d8f7c30cb26e45f033c4ec..f525b2f5e4e083ba499dc0ad11866fb78146f37c 100644 (file)
         * for more details.
         */
 
+       aliases {
+               mmc0 = &mmc_0;
+               mmc2 = &mmc_2;
+       };
+
        chosen {
                stdout-path = "serial2:115200n8";
        };
index df863b909ff739f9ea9c6f88166650ab3ad8c879..7a48f2b32819343996d37a4bf1f4264d52bafaa8 100644 (file)
@@ -31,6 +31,9 @@
        aliases {
                /* Assign 20 so we don't get confused w/ builtin ones */
                i2c20 = &i2c_tunnel;
+               mmc0 = &mmc_0; /* eMMC */
+               mmc1 = &mmc_2; /* uSD */
+               mmc2 = &mmc_1; /* WiFi */
        };
 
        backlight: backlight {
index 0a9371bec3e0ff0c7c2a02d373cea00b89f4e212..e299344e427a418615b5d1fb5201d61e1a1e0fa0 100644 (file)
                reg = <0x20000000 0x80000000>;
        };
 
+       aliases {
+               mmc0 = &mmc_0;
+               mmc1 = &mmc_2;
+       };
+
        chosen {
                bootargs = "init=/linuxrc";
                stdout-path = "serial2:115200n8";
index 30fc677d8bac5fdbe49cc081d21a5518f372d022..2f5b8602e020584d9a6365515698da3d5cdfbc29 100644 (file)
                reg = <0x40000000 0x7ea00000>;
        };
 
+       aliases {
+               mmc2 = &mmc_2;
+       };
+
        chosen {
                stdout-path = "serial2:115200n8";
        };
index d1b8e59e2daf3f3bad33ca9147911c0a51ecd00e..b4a851aa88814386c8969c2aa52843e6a7dbcdee 100644 (file)
 #include "exynos5422-odroid-core.dtsi"
 
 / {
+       aliases {
+               mmc0 = &mmc_0;
+       };
+
        gpio-keys {
                compatible = "gpio-keys";
                pinctrl-names = "default";
index 13134592c1996cb9aa654f2e55347fcad1ea7a8c..c35261a338ff70c90d51ae6d9b3e826804758d7a 100644 (file)
 
        chassis-type = "handset";
 
+       aliases {
+               mmc0 = &mmc_0;
+       };
+
        memory@20000000 {
                device_type = "memory";
                reg = <0x20000000 0x80000000>; /* 2 GiB */
index 37af8fbd215cd670f621d8b5cdb943178697cc69..1f544f12da6c5bd75ed0287e3ca9e65977e61357 100644 (file)
@@ -29,6 +29,9 @@
        aliases {
                /* Assign 20 so we don't get confused w/ builtin ones */
                i2c20 = &i2c_tunnel;
+               mmc0 = &mmc_0; /* eMMC */
+               mmc1 = &mmc_2; /* SD */
+               mmc2 = &mmc_1; /* WiFi */
        };
 
        backlight: backlight {