Commit 3ddba33d authored by Henrik Grimler's avatar Henrik Grimler Committed by Krzysztof Kozlowski

ARM: dts: exynos: add mmc aliases

Add aliases for eMMC, SD card and WiFi where applicable, so that
assigned mmc indeces are always the same.
Co-developed-by: default avatarAnton Bambura <jenneron@protonmail.com>
Signed-off-by: default avatarAnton Bambura <jenneron@protonmail.com>
[ Tested on exynos5800-peach-pi ]
Tested-by: default avatarValentine Iourine <iourine@iourine.msk.su>
Signed-off-by: default avatarHenrik Grimler <henrik@grimler.se>
Tested-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Link: https://lore.kernel.org/r/20230402144724.17839-3-henrik@grimler.seSigned-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
parent 37f9514e
...@@ -16,6 +16,10 @@ / { ...@@ -16,6 +16,10 @@ / {
model = "Samsung ARTIK5 evaluation board"; model = "Samsung ARTIK5 evaluation board";
compatible = "samsung,artik5-eval", "samsung,artik5", compatible = "samsung,artik5-eval", "samsung,artik5",
"samsung,exynos3250", "samsung,exynos3"; "samsung,exynos3250", "samsung,exynos3";
aliases {
mmc0 = &mshc_2;
};
}; };
&mshc_2 { &mshc_2 {
......
...@@ -17,6 +17,11 @@ ...@@ -17,6 +17,11 @@
/ { / {
compatible = "samsung,artik5", "samsung,exynos3250", "samsung,exynos3"; compatible = "samsung,artik5", "samsung,exynos3250", "samsung,exynos3";
aliases {
mmc0 = &mshc_0;
mmc1 = &mshc_1;
};
chosen { chosen {
stdout-path = &serial_2; stdout-path = &serial_2;
}; };
......
...@@ -22,6 +22,7 @@ / { ...@@ -22,6 +22,7 @@ / {
aliases { aliases {
i2c7 = &i2c_max77836; i2c7 = &i2c_max77836;
mmc0 = &mshc_0;
}; };
memory@40000000 { memory@40000000 {
......
...@@ -23,6 +23,8 @@ / { ...@@ -23,6 +23,8 @@ / {
aliases { aliases {
i2c7 = &i2c_max77836; i2c7 = &i2c_max77836;
mmc0 = &mshc_0;
mmc1 = &mshc_1;
}; };
chosen { chosen {
......
...@@ -25,6 +25,12 @@ memory@40000000 { ...@@ -25,6 +25,12 @@ memory@40000000 {
reg = <0x40000000 0x40000000>; reg = <0x40000000 0x40000000>;
}; };
aliases {
mmc0 = &sdhci_0;
mmc1 = &sdhci_2;
mmc2 = &sdhci_3;
};
chosen { chosen {
stdout-path = "serial2:115200n8"; stdout-path = "serial2:115200n8";
}; };
......
...@@ -30,6 +30,11 @@ memory@40000000 { ...@@ -30,6 +30,11 @@ memory@40000000 {
0x70000000 0x10000000>; 0x70000000 0x10000000>;
}; };
aliases {
mmc0 = &sdhci_0;
mmc1 = &sdhci_2;
};
chosen { chosen {
bootargs = "root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M init=/linuxrc"; bootargs = "root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M init=/linuxrc";
stdout-path = "serial2:115200n8"; stdout-path = "serial2:115200n8";
......
...@@ -25,6 +25,10 @@ memory@40000000 { ...@@ -25,6 +25,10 @@ memory@40000000 {
reg = <0x40000000 0x80000000>; reg = <0x40000000 0x80000000>;
}; };
aliases {
mmc0 = &sdhci_2;
};
chosen { chosen {
bootargs = "root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M init=/linuxrc"; bootargs = "root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M init=/linuxrc";
stdout-path = "serial1:115200n8"; stdout-path = "serial1:115200n8";
......
...@@ -26,6 +26,12 @@ memory@40000000 { ...@@ -26,6 +26,12 @@ memory@40000000 {
0x70000000 0x10000000>; 0x70000000 0x10000000>;
}; };
aliases {
mmc0 = &sdhci_0;
mmc1 = &sdhci_2;
mmc2 = &sdhci_3;
};
chosen { chosen {
bootargs = "root=/dev/mmcblk0p5 rootwait earlyprintk panic=5"; bootargs = "root=/dev/mmcblk0p5 rootwait earlyprintk panic=5";
stdout-path = "serial2:115200n8"; stdout-path = "serial2:115200n8";
......
...@@ -24,6 +24,12 @@ memory@40000000 { ...@@ -24,6 +24,12 @@ memory@40000000 {
0x50000000 0x10000000>; 0x50000000 0x10000000>;
}; };
aliases {
mmc0 = &sdhci_0;
mmc1 = &sdhci_2;
mmc2 = &sdhci_3;
};
chosen { chosen {
bootargs = "root=/dev/mmcblk0p5 rw rootwait earlyprintk panic=5 maxcpus=1"; bootargs = "root=/dev/mmcblk0p5 rw rootwait earlyprintk panic=5 maxcpus=1";
stdout-path = "serial2:115200n8"; stdout-path = "serial2:115200n8";
......
...@@ -20,6 +20,10 @@ / { ...@@ -20,6 +20,10 @@ / {
model = "TOPEET iTop 4412 Elite board based on Exynos4412"; model = "TOPEET iTop 4412 Elite board based on Exynos4412";
compatible = "topeet,itop4412-elite", "samsung,exynos4412", "samsung,exynos4"; compatible = "topeet,itop4412-elite", "samsung,exynos4412", "samsung,exynos4";
aliases {
mmc1 = &sdhci_2;
};
chosen { chosen {
bootargs = "root=/dev/mmcblk0p2 rw rootfstype=ext4 rootdelay=1 rootwait"; bootargs = "root=/dev/mmcblk0p2 rw rootfstype=ext4 rootdelay=1 rootwait";
stdout-path = "serial2:115200n8"; stdout-path = "serial2:115200n8";
......
...@@ -23,6 +23,10 @@ memory@40000000 { ...@@ -23,6 +23,10 @@ memory@40000000 {
reg = <0x40000000 0x40000000>; reg = <0x40000000 0x40000000>;
}; };
aliases {
mmc0 = &mshc_0;
};
firmware@203f000 { firmware@203f000 {
compatible = "samsung,secure-firmware"; compatible = "samsung,secure-firmware";
reg = <0x0203f000 0x1000>; reg = <0x0203f000 0x1000>;
......
...@@ -25,6 +25,9 @@ / { ...@@ -25,6 +25,9 @@ / {
aliases { aliases {
i2c11 = &i2c_max77693; i2c11 = &i2c_max77693;
i2c12 = &i2c_max77693_fuel; i2c12 = &i2c_max77693_fuel;
mmc0 = &mshc_0;
mmc2 = &sdhci_2;
mmc3 = &sdhci_3;
}; };
chosen { chosen {
......
...@@ -13,6 +13,11 @@ ...@@ -13,6 +13,11 @@
#include "exynos-mfc-reserved-memory.dtsi" #include "exynos-mfc-reserved-memory.dtsi"
/ { / {
aliases {
mmc0 = &mshc_0;
mmc2 = &sdhci_2;
};
chosen { chosen {
stdout-path = &serial_1; stdout-path = &serial_1;
}; };
......
...@@ -25,6 +25,11 @@ memory@40000000 { ...@@ -25,6 +25,11 @@ memory@40000000 {
reg = <0x40000000 0x40000000>; reg = <0x40000000 0x40000000>;
}; };
aliases {
mmc0 = &mshc_0;
mmc1 = &sdhci_2;
};
chosen { chosen {
stdout-path = "serial2:115200n8"; stdout-path = "serial2:115200n8";
}; };
......
...@@ -26,6 +26,12 @@ memory@40000000 { ...@@ -26,6 +26,12 @@ memory@40000000 {
reg = <0x40000000 0x80000000>; reg = <0x40000000 0x80000000>;
}; };
aliases {
mmc0 = &mshc_0;
mmc2 = &sdhci_2;
mmc3 = &sdhci_3;
};
chosen { chosen {
stdout-path = &serial_2; stdout-path = &serial_2;
}; };
......
...@@ -22,6 +22,10 @@ memory@40000000 { ...@@ -22,6 +22,10 @@ memory@40000000 {
reg = <0x40000000 0x40000000>; reg = <0x40000000 0x40000000>;
}; };
aliases {
mmc0 = &sdhci_2;
};
chosen { chosen {
bootargs = "root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M init=/linuxrc"; bootargs = "root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M init=/linuxrc";
stdout-path = "serial1:115200n8"; stdout-path = "serial1:115200n8";
......
...@@ -17,6 +17,10 @@ / { ...@@ -17,6 +17,10 @@ / {
model = "FriendlyARM TINY4412 board based on Exynos4412"; model = "FriendlyARM TINY4412 board based on Exynos4412";
compatible = "friendlyarm,tiny4412", "samsung,exynos4412", "samsung,exynos4"; compatible = "friendlyarm,tiny4412", "samsung,exynos4412", "samsung,exynos4";
aliases {
mmc0 = &sdhci_2;
};
chosen { chosen {
stdout-path = &serial_0; stdout-path = &serial_0;
}; };
......
...@@ -23,6 +23,11 @@ memory@40000000 { ...@@ -23,6 +23,11 @@ memory@40000000 {
reg = <0x40000000 0x80000000>; reg = <0x40000000 0x80000000>;
}; };
aliases {
mmc0 = &mmc_0;
mmc1 = &mmc_2;
};
chosen { chosen {
stdout-path = "serial2:115200n8"; stdout-path = "serial2:115200n8";
}; };
......
...@@ -17,6 +17,8 @@ / { ...@@ -17,6 +17,8 @@ / {
compatible = "samsung,smdk5250", "samsung,exynos5250", "samsung,exynos5"; compatible = "samsung,smdk5250", "samsung,exynos5250", "samsung,exynos5";
aliases { aliases {
mmc0 = &mmc_0;
mmc1 = &mmc_2;
}; };
memory@40000000 { memory@40000000 {
......
...@@ -15,6 +15,9 @@ ...@@ -15,6 +15,9 @@
/ { / {
aliases { aliases {
i2c104 = &i2c_104; i2c104 = &i2c_104;
mmc0 = &mmc_0; /* eMMC */
mmc1 = &mmc_2; /* SD */
mmc2 = &mmc_3; /* WiFi */
}; };
memory@40000000 { memory@40000000 {
......
...@@ -23,6 +23,11 @@ memory@40000000 { ...@@ -23,6 +23,11 @@ memory@40000000 {
reg = <0x40000000 0x80000000>; reg = <0x40000000 0x80000000>;
}; };
aliases {
mmc0 = &mmc_0;
mmc1 = &mmc_1;
};
chosen { chosen {
bootargs = "console=tty1"; bootargs = "console=tty1";
stdout-path = "serial3:115200n8"; stdout-path = "serial3:115200n8";
......
...@@ -18,6 +18,11 @@ memory@20000000 { ...@@ -18,6 +18,11 @@ memory@20000000 {
reg = <0x20000000 0x80000000>; reg = <0x20000000 0x80000000>;
}; };
aliases {
mmc0 = &mmc_0;
mmc1 = &mmc_2;
};
chosen { chosen {
stdout-path = "serial2:115200n8"; stdout-path = "serial2:115200n8";
}; };
......
...@@ -21,6 +21,8 @@ / { ...@@ -21,6 +21,8 @@ / {
aliases { aliases {
ethernet = &ethernet; ethernet = &ethernet;
mmc0 = &mmc_0;
mmc1 = &mmc_2;
}; };
memory@40000000 { memory@40000000 {
......
...@@ -18,6 +18,11 @@ memory@40000000 { ...@@ -18,6 +18,11 @@ memory@40000000 {
reg = <0x40000000 0x80000000>; reg = <0x40000000 0x80000000>;
}; };
aliases {
mmc0 = &mmc_0;
mmc1 = &mmc_2;
};
chosen { chosen {
stdout-path = "serial2:115200n8"; stdout-path = "serial2:115200n8";
}; };
......
...@@ -23,6 +23,11 @@ memory@20000000 { ...@@ -23,6 +23,11 @@ memory@20000000 {
reg = <0x20000000 0x80000000>; reg = <0x20000000 0x80000000>;
}; };
aliases {
mmc0 = &mmc_0;
mmc1 = &mmc_2;
};
chosen { chosen {
stdout-path = "serial3:115200n8"; stdout-path = "serial3:115200n8";
}; };
......
...@@ -28,6 +28,11 @@ / { ...@@ -28,6 +28,11 @@ / {
* for more details. * for more details.
*/ */
aliases {
mmc0 = &mmc_0;
mmc2 = &mmc_2;
};
chosen { chosen {
stdout-path = "serial2:115200n8"; stdout-path = "serial2:115200n8";
}; };
......
...@@ -31,6 +31,9 @@ / { ...@@ -31,6 +31,9 @@ / {
aliases { aliases {
/* Assign 20 so we don't get confused w/ builtin ones */ /* Assign 20 so we don't get confused w/ builtin ones */
i2c20 = &i2c_tunnel; i2c20 = &i2c_tunnel;
mmc0 = &mmc_0; /* eMMC */
mmc1 = &mmc_2; /* uSD */
mmc2 = &mmc_1; /* WiFi */
}; };
backlight: backlight { backlight: backlight {
......
...@@ -21,6 +21,11 @@ memory@20000000 { ...@@ -21,6 +21,11 @@ memory@20000000 {
reg = <0x20000000 0x80000000>; reg = <0x20000000 0x80000000>;
}; };
aliases {
mmc0 = &mmc_0;
mmc1 = &mmc_2;
};
chosen { chosen {
bootargs = "init=/linuxrc"; bootargs = "init=/linuxrc";
stdout-path = "serial2:115200n8"; stdout-path = "serial2:115200n8";
......
...@@ -19,6 +19,10 @@ memory@40000000 { ...@@ -19,6 +19,10 @@ memory@40000000 {
reg = <0x40000000 0x7ea00000>; reg = <0x40000000 0x7ea00000>;
}; };
aliases {
mmc2 = &mmc_2;
};
chosen { chosen {
stdout-path = "serial2:115200n8"; stdout-path = "serial2:115200n8";
}; };
......
...@@ -13,6 +13,10 @@ ...@@ -13,6 +13,10 @@
#include "exynos5422-odroid-core.dtsi" #include "exynos5422-odroid-core.dtsi"
/ { / {
aliases {
mmc0 = &mmc_0;
};
gpio-keys { gpio-keys {
compatible = "gpio-keys"; compatible = "gpio-keys";
pinctrl-names = "default"; pinctrl-names = "default";
......
...@@ -19,6 +19,10 @@ / { ...@@ -19,6 +19,10 @@ / {
chassis-type = "handset"; chassis-type = "handset";
aliases {
mmc0 = &mmc_0;
};
memory@20000000 { memory@20000000 {
device_type = "memory"; device_type = "memory";
reg = <0x20000000 0x80000000>; /* 2 GiB */ reg = <0x20000000 0x80000000>; /* 2 GiB */
......
...@@ -29,6 +29,9 @@ / { ...@@ -29,6 +29,9 @@ / {
aliases { aliases {
/* Assign 20 so we don't get confused w/ builtin ones */ /* Assign 20 so we don't get confused w/ builtin ones */
i2c20 = &i2c_tunnel; i2c20 = &i2c_tunnel;
mmc0 = &mmc_0; /* eMMC */
mmc1 = &mmc_2; /* SD */
mmc2 = &mmc_1; /* WiFi */
}; };
backlight: backlight { backlight: backlight {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment