| Message ID | 20230316211558.8526-3-henrik@grimler.se |
|---|---|
| State | Superseded |
| Headers | show |
| Series | ARM: dts: add mmc aliases for Exynos devices | expand |
On 16/03/2023 22:15, Henrik Grimler wrote: > 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> > > chosen { > diff --git a/arch/arm/boot/dts/exynos4210-i9100.dts b/arch/arm/boot/dts/exynos4210-i9100.dts > index bba85011ecc9..7051e2c4b391 100644 > --- a/arch/arm/boot/dts/exynos4210-i9100.dts > +++ b/arch/arm/boot/dts/exynos4210-i9100.dts > @@ -25,6 +25,12 @@ memory@40000000 { > reg = <0x40000000 0x40000000>; > }; > > + aliases { > + mmc0 = &sdhci_0; > + mmc2 = &sdhci_2; > + mmc3 = &sdhci_3; Here... > + }; > + > chosen { > stdout-path = "serial2:115200n8"; > }; > diff --git a/arch/arm/boot/dts/exynos4210-origen.dts b/arch/arm/boot/dts/exynos4210-origen.dts > index 1103e7f92b57..1970c31410e5 100644 > --- a/arch/arm/boot/dts/exynos4210-origen.dts > +++ b/arch/arm/boot/dts/exynos4210-origen.dts > @@ -30,6 +30,11 @@ memory@40000000 { > 0x70000000 0x10000000>; > }; > > + aliases { > + mmc0 = &sdhci_0; here .... > + mmc2 = &sdhci_2; > + }; > + > chosen { > bootargs = "root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M init=/linuxrc"; > stdout-path = "serial2:115200n8"; > diff --git a/arch/arm/boot/dts/exynos4210-smdkv310.dts b/arch/arm/boot/dts/exynos4210-smdkv310.dts > index 181c99eca675..cb74af41e17c 100644 > --- a/arch/arm/boot/dts/exynos4210-smdkv310.dts > +++ b/arch/arm/boot/dts/exynos4210-smdkv310.dts > @@ -25,6 +25,10 @@ memory@40000000 { > reg = <0x40000000 0x80000000>; > }; > > + aliases { > + mmc2 = &sdhci_2; > + }; > + > chosen { > bootargs = "root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M init=/linuxrc"; > stdout-path = "serial1:115200n8"; > diff --git a/arch/arm/boot/dts/exynos4210-trats.dts b/arch/arm/boot/dts/exynos4210-trats.dts > index b8e9dd23fc51..b6b0c116016c 100644 > --- a/arch/arm/boot/dts/exynos4210-trats.dts > +++ b/arch/arm/boot/dts/exynos4210-trats.dts > @@ -26,6 +26,12 @@ memory@40000000 { > 0x70000000 0x10000000>; > }; > > + aliases { > + mmc0 = &sdhci_0; > + mmc2 = &sdhci_2; > + mmc3 = &sdhci_3; > + }; > + > chosen { > bootargs = "root=/dev/mmcblk0p5 rootwait earlyprintk panic=5"; > stdout-path = "serial2:115200n8"; > diff --git a/arch/arm/boot/dts/exynos4210-universal_c210.dts b/arch/arm/boot/dts/exynos4210-universal_c210.dts > index 140abfb38e1d..f42cfcbcdcfa 100644 > --- a/arch/arm/boot/dts/exynos4210-universal_c210.dts > +++ b/arch/arm/boot/dts/exynos4210-universal_c210.dts > @@ -24,6 +24,12 @@ memory@40000000 { > 0x50000000 0x10000000>; > }; > > + aliases { > + mmc0 = &sdhci_0; > + mmc2 = &sdhci_2; Why this is 2? Aliases are continues and match the board. For example Universal calls this mmc1 and the next mmc2, not 3. I bet it is the same on Trats and all other boards. > + mmc3 = &sdhci_3; > + }; > + > chosen { > bootargs = "root=/dev/mmcblk0p5 rw rootwait earlyprintk panic=5 maxcpus=1"; > stdout-path = "serial2:115200n8"; > diff --git a/arch/arm/boot/dts/exynos4412-itop-elite.dts b/arch/arm/boot/dts/exynos4412-itop-elite.dts > index 6260da187e92..0e5419c0eaff 100644 > --- a/arch/arm/boot/dts/exynos4412-itop-elite.dts > +++ b/arch/arm/boot/dts/exynos4412-itop-elite.dts > @@ -20,6 +20,10 @@ / { > model = "TOPEET iTop 4412 Elite board based on Exynos4412"; > compatible = "topeet,itop4412-elite", "samsung,exynos4412", "samsung,exynos4"; > > + aliases { > + mmc2 = &sdhci_2; mmc1 > + }; > + > chosen { > bootargs = "root=/dev/mmcblk0p2 rw rootfstype=ext4 rootdelay=1 rootwait"; > stdout-path = "serial2:115200n8"; > diff --git a/arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi b/arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi > index ca8d42b2ce3b..7bc6968af9c3 100644 > --- a/arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi > +++ b/arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi > @@ -23,6 +23,10 @@ memory@40000000 { > reg = <0x40000000 0x40000000>; > }; > > + aliases { > + mmc0 = &mshc_0; > + }; > + > firmware@203f000 { > compatible = "samsung,secure-firmware"; > reg = <0x0203f000 0x1000>; > diff --git a/arch/arm/boot/dts/exynos4412-midas.dtsi b/arch/arm/boot/dts/exynos4412-midas.dtsi > index 82aed59cba7c..e6b949c1a00f 100644 > --- a/arch/arm/boot/dts/exynos4412-midas.dtsi > +++ b/arch/arm/boot/dts/exynos4412-midas.dtsi > @@ -25,6 +25,9 @@ / { > aliases { > i2c11 = &i2c_max77693; > i2c12 = &i2c_max77693_fuel; > + mmc0 = &mshc_0; > + mmc2 = &sdhci_2; > + mmc3 = &sdhci_3; This is actually correct. > }; > > chosen { > diff --git a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi > index 25e082fda955..45ef7b7ba7e0 100644 > --- a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi > +++ b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi > @@ -13,6 +13,11 @@ > #include "exynos-mfc-reserved-memory.dtsi" > > / { > + aliases { > + mmc0 = &mshc_0; > + mmc2 = &sdhci_2; This is also correct. > + }; For all other cases, where schematics are missing, just make them linear. Krzysztof
Hi Krzysztof, On Fri, Mar 17, 2023 at 01:28:02PM +0100, Krzysztof Kozlowski wrote: > On 16/03/2023 22:15, Henrik Grimler wrote: > > 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> > > > > > > > chosen { > > diff --git a/arch/arm/boot/dts/exynos4210-i9100.dts b/arch/arm/boot/dts/exynos4210-i9100.dts > > index bba85011ecc9..7051e2c4b391 100644 > > --- a/arch/arm/boot/dts/exynos4210-i9100.dts > > +++ b/arch/arm/boot/dts/exynos4210-i9100.dts > > @@ -25,6 +25,12 @@ memory@40000000 { > > reg = <0x40000000 0x40000000>; > > }; > > > > + aliases { > > + mmc0 = &sdhci_0; > > + mmc2 = &sdhci_2; > > + mmc3 = &sdhci_3; > > Here... > > > + }; > > + > > chosen { > > stdout-path = "serial2:115200n8"; > > }; > > diff --git a/arch/arm/boot/dts/exynos4210-origen.dts b/arch/arm/boot/dts/exynos4210-origen.dts > > index 1103e7f92b57..1970c31410e5 100644 > > --- a/arch/arm/boot/dts/exynos4210-origen.dts > > +++ b/arch/arm/boot/dts/exynos4210-origen.dts > > @@ -30,6 +30,11 @@ memory@40000000 { > > 0x70000000 0x10000000>; > > }; > > > > + aliases { > > + mmc0 = &sdhci_0; > > here .... > > > + mmc2 = &sdhci_2; > > + }; > > + > > chosen { > > bootargs = "root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M init=/linuxrc"; > > stdout-path = "serial2:115200n8"; > > diff --git a/arch/arm/boot/dts/exynos4210-smdkv310.dts b/arch/arm/boot/dts/exynos4210-smdkv310.dts > > index 181c99eca675..cb74af41e17c 100644 > > --- a/arch/arm/boot/dts/exynos4210-smdkv310.dts > > +++ b/arch/arm/boot/dts/exynos4210-smdkv310.dts > > @@ -25,6 +25,10 @@ memory@40000000 { > > reg = <0x40000000 0x80000000>; > > }; > > > > + aliases { > > + mmc2 = &sdhci_2; > > + }; > > + > > chosen { > > bootargs = "root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M init=/linuxrc"; > > stdout-path = "serial1:115200n8"; > > diff --git a/arch/arm/boot/dts/exynos4210-trats.dts b/arch/arm/boot/dts/exynos4210-trats.dts > > index b8e9dd23fc51..b6b0c116016c 100644 > > --- a/arch/arm/boot/dts/exynos4210-trats.dts > > +++ b/arch/arm/boot/dts/exynos4210-trats.dts > > @@ -26,6 +26,12 @@ memory@40000000 { > > 0x70000000 0x10000000>; > > }; > > > > + aliases { > > + mmc0 = &sdhci_0; > > + mmc2 = &sdhci_2; > > + mmc3 = &sdhci_3; > > + }; > > + > > chosen { > > bootargs = "root=/dev/mmcblk0p5 rootwait earlyprintk panic=5"; > > stdout-path = "serial2:115200n8"; > > diff --git a/arch/arm/boot/dts/exynos4210-universal_c210.dts b/arch/arm/boot/dts/exynos4210-universal_c210.dts > > index 140abfb38e1d..f42cfcbcdcfa 100644 > > --- a/arch/arm/boot/dts/exynos4210-universal_c210.dts > > +++ b/arch/arm/boot/dts/exynos4210-universal_c210.dts > > @@ -24,6 +24,12 @@ memory@40000000 { > > 0x50000000 0x10000000>; > > }; > > > > + aliases { > > + mmc0 = &sdhci_0; > > + mmc2 = &sdhci_2; > > > Why this is 2? Aliases are continues and match the board. For example > Universal calls this mmc1 and the next mmc2, not 3. Not sure I follow, Universal calls sdhci_2 mmc1 in schematics? (I have tried searching for schematics but cannot really find anything about this board) > I bet it is the same on Trats and all other boards. Sure, I can change to mmc0, mmc1 for all 4210 devices. > > + mmc3 = &sdhci_3; > > + }; > > + > > chosen { > > bootargs = "root=/dev/mmcblk0p5 rw rootwait earlyprintk panic=5 maxcpus=1"; > > stdout-path = "serial2:115200n8"; > > diff --git a/arch/arm/boot/dts/exynos4412-itop-elite.dts b/arch/arm/boot/dts/exynos4412-itop-elite.dts > > index 6260da187e92..0e5419c0eaff 100644 > > --- a/arch/arm/boot/dts/exynos4412-itop-elite.dts > > +++ b/arch/arm/boot/dts/exynos4412-itop-elite.dts > > @@ -20,6 +20,10 @@ / { > > model = "TOPEET iTop 4412 Elite board based on Exynos4412"; > > compatible = "topeet,itop4412-elite", "samsung,exynos4412", "samsung,exynos4"; > > > > + aliases { > > + mmc2 = &sdhci_2; > > mmc1 Ok, will change. > > + }; > > + > > chosen { > > bootargs = "root=/dev/mmcblk0p2 rw rootfstype=ext4 rootdelay=1 rootwait"; > > stdout-path = "serial2:115200n8"; > > diff --git a/arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi b/arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi > > index ca8d42b2ce3b..7bc6968af9c3 100644 > > --- a/arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi > > +++ b/arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi > > @@ -23,6 +23,10 @@ memory@40000000 { > > reg = <0x40000000 0x40000000>; > > }; > > > > + aliases { > > + mmc0 = &mshc_0; > > + }; > > + > > firmware@203f000 { > > compatible = "samsung,secure-firmware"; > > reg = <0x0203f000 0x1000>; > > diff --git a/arch/arm/boot/dts/exynos4412-midas.dtsi b/arch/arm/boot/dts/exynos4412-midas.dtsi > > index 82aed59cba7c..e6b949c1a00f 100644 > > --- a/arch/arm/boot/dts/exynos4412-midas.dtsi > > +++ b/arch/arm/boot/dts/exynos4412-midas.dtsi > > @@ -25,6 +25,9 @@ / { > > aliases { > > i2c11 = &i2c_max77693; > > i2c12 = &i2c_max77693_fuel; > > + mmc0 = &mshc_0; > > + mmc2 = &sdhci_2; > > + mmc3 = &sdhci_3; > > This is actually correct. > > > }; > > > > chosen { > > diff --git a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi > > index 25e082fda955..45ef7b7ba7e0 100644 > > --- a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi > > +++ b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi > > @@ -13,6 +13,11 @@ > > #include "exynos-mfc-reserved-memory.dtsi" > > > > / { > > + aliases { > > + mmc0 = &mshc_0; > > + mmc2 = &sdhci_2; > > This is also correct. > > > + }; > > For all other cases, where schematics are missing, just make them linear. Alright, will do in next version, thanks for the feedback! > Krzysztof Best regards, Henrik Grimler
On 19/03/2023 21:13, Henrik Grimler wrote: >>> >>> + aliases { >>> + mmc0 = &sdhci_0; >>> + mmc2 = &sdhci_2; >> >> >> Why this is 2? Aliases are continues and match the board. For example >> Universal calls this mmc1 and the next mmc2, not 3. > > Not sure I follow, Universal calls sdhci_2 mmc1 in schematics? (I have tried searching for > schematics but cannot really find anything about this board) Yes. The alias numbers are the numbering exposed on the board. This might or might not match original numbering. If you have a development board with a SoM, pretty often not all interfaces, let's say UARTs, are exposed. SoM might have 10 UARTs, but board has only 4 and numbers them UART0-3. Aliases should be 0-3, not 0, 5, 7, 9. > >> I bet it is the same on Trats and all other boards. > > Sure, I can change to mmc0, mmc1 for all 4210 devices. Yes, please. > >>> + mmc3 = &sdhci_3; >>> + }; >>> + >>> chosen { >>> bootargs = "root=/dev/mmcblk0p5 rw rootwait earlyprintk panic=5 maxcpus=1"; >>> stdout-path = "serial2:115200n8"; >>> diff --git a/arch/arm/boot/dts/exynos4412-itop-elite.dts b/arch/arm/boot/dts/exynos4412-itop-elite.dts >>> index 6260da187e92..0e5419c0eaff 100644 >>> --- a/arch/arm/boot/dts/exynos4412-itop-elite.dts >>> +++ b/arch/arm/boot/dts/exynos4412-itop-elite.dts >>> @@ -20,6 +20,10 @@ / { >>> model = "TOPEET iTop 4412 Elite board based on Exynos4412"; >>> compatible = "topeet,itop4412-elite", "samsung,exynos4412", "samsung,exynos4"; >>> >>> + aliases { >>> + mmc2 = &sdhci_2; >> >> mmc1 > > Ok, will change. > >>> + }; >>> + >>> chosen { >>> bootargs = "root=/dev/mmcblk0p2 rw rootfstype=ext4 rootdelay=1 rootwait"; >>> stdout-path = "serial2:115200n8"; >>> diff --git a/arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi b/arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi >>> index ca8d42b2ce3b..7bc6968af9c3 100644 >>> --- a/arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi >>> +++ b/arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi >>> @@ -23,6 +23,10 @@ memory@40000000 { >>> reg = <0x40000000 0x40000000>; >>> }; >>> >>> + aliases { >>> + mmc0 = &mshc_0; >>> + }; >>> + >>> firmware@203f000 { >>> compatible = "samsung,secure-firmware"; >>> reg = <0x0203f000 0x1000>; >>> diff --git a/arch/arm/boot/dts/exynos4412-midas.dtsi b/arch/arm/boot/dts/exynos4412-midas.dtsi >>> index 82aed59cba7c..e6b949c1a00f 100644 >>> --- a/arch/arm/boot/dts/exynos4412-midas.dtsi >>> +++ b/arch/arm/boot/dts/exynos4412-midas.dtsi >>> @@ -25,6 +25,9 @@ / { >>> aliases { >>> i2c11 = &i2c_max77693; >>> i2c12 = &i2c_max77693_fuel; >>> + mmc0 = &mshc_0; >>> + mmc2 = &sdhci_2; >>> + mmc3 = &sdhci_3; >> >> This is actually correct. >> >>> }; >>> >>> chosen { >>> diff --git a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi >>> index 25e082fda955..45ef7b7ba7e0 100644 >>> --- a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi >>> +++ b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi >>> @@ -13,6 +13,11 @@ >>> #include "exynos-mfc-reserved-memory.dtsi" >>> >>> / { >>> + aliases { >>> + mmc0 = &mshc_0; >>> + mmc2 = &sdhci_2; >> >> This is also correct. >> >>> + }; >> >> For all other cases, where schematics are missing, just make them linear. > > Alright, will do in next version, thanks for the feedback! > Best regards, Krzysztof
diff --git a/arch/arm/boot/dts/exynos3250-artik5-eval.dts b/arch/arm/boot/dts/exynos3250-artik5-eval.dts index a1e22f630638..83266a66124b 100644 --- a/arch/arm/boot/dts/exynos3250-artik5-eval.dts +++ b/arch/arm/boot/dts/exynos3250-artik5-eval.dts @@ -16,6 +16,11 @@ / { model = "Samsung ARTIK5 evaluation board"; compatible = "samsung,artik5-eval", "samsung,artik5", "samsung,exynos3250", "samsung,exynos3"; + + aliases { + mmc2 = &mshc_2; + }; + }; &mshc_2 { diff --git a/arch/arm/boot/dts/exynos3250-artik5.dtsi b/arch/arm/boot/dts/exynos3250-artik5.dtsi index b81e1a9df126..3fdd922e635c 100644 --- a/arch/arm/boot/dts/exynos3250-artik5.dtsi +++ b/arch/arm/boot/dts/exynos3250-artik5.dtsi @@ -17,6 +17,11 @@ / { compatible = "samsung,artik5", "samsung,exynos3250", "samsung,exynos3"; + aliases { + mmc0 = &mshc_0; + mmc1 = &mshc_1; + }; + chosen { stdout-path = &serial_2; }; diff --git a/arch/arm/boot/dts/exynos3250-monk.dts b/arch/arm/boot/dts/exynos3250-monk.dts index 861c26824d4f..2de877d4ccc5 100644 --- a/arch/arm/boot/dts/exynos3250-monk.dts +++ b/arch/arm/boot/dts/exynos3250-monk.dts @@ -22,6 +22,7 @@ / { aliases { i2c7 = &i2c_max77836; + mmc0 = &mshc_0; }; memory@40000000 { diff --git a/arch/arm/boot/dts/exynos3250-rinato.dts b/arch/arm/boot/dts/exynos3250-rinato.dts index a252a5f667eb..88fb3e68ff02 100644 --- a/arch/arm/boot/dts/exynos3250-rinato.dts +++ b/arch/arm/boot/dts/exynos3250-rinato.dts @@ -23,6 +23,8 @@ / { aliases { i2c7 = &i2c_max77836; + mmc0 = &mshc_0; + mmc1 = &mshc_1; }; chosen { diff --git a/arch/arm/boot/dts/exynos4210-i9100.dts b/arch/arm/boot/dts/exynos4210-i9100.dts index bba85011ecc9..7051e2c4b391 100644 --- a/arch/arm/boot/dts/exynos4210-i9100.dts +++ b/arch/arm/boot/dts/exynos4210-i9100.dts @@ -25,6 +25,12 @@ memory@40000000 { reg = <0x40000000 0x40000000>; }; + aliases { + mmc0 = &sdhci_0; + mmc2 = &sdhci_2; + mmc3 = &sdhci_3; + }; + chosen { stdout-path = "serial2:115200n8"; }; diff --git a/arch/arm/boot/dts/exynos4210-origen.dts b/arch/arm/boot/dts/exynos4210-origen.dts index 1103e7f92b57..1970c31410e5 100644 --- a/arch/arm/boot/dts/exynos4210-origen.dts +++ b/arch/arm/boot/dts/exynos4210-origen.dts @@ -30,6 +30,11 @@ memory@40000000 { 0x70000000 0x10000000>; }; + aliases { + mmc0 = &sdhci_0; + mmc2 = &sdhci_2; + }; + chosen { bootargs = "root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M init=/linuxrc"; stdout-path = "serial2:115200n8"; diff --git a/arch/arm/boot/dts/exynos4210-smdkv310.dts b/arch/arm/boot/dts/exynos4210-smdkv310.dts index 181c99eca675..cb74af41e17c 100644 --- a/arch/arm/boot/dts/exynos4210-smdkv310.dts +++ b/arch/arm/boot/dts/exynos4210-smdkv310.dts @@ -25,6 +25,10 @@ memory@40000000 { reg = <0x40000000 0x80000000>; }; + aliases { + mmc2 = &sdhci_2; + }; + chosen { bootargs = "root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M init=/linuxrc"; stdout-path = "serial1:115200n8"; diff --git a/arch/arm/boot/dts/exynos4210-trats.dts b/arch/arm/boot/dts/exynos4210-trats.dts index b8e9dd23fc51..b6b0c116016c 100644 --- a/arch/arm/boot/dts/exynos4210-trats.dts +++ b/arch/arm/boot/dts/exynos4210-trats.dts @@ -26,6 +26,12 @@ memory@40000000 { 0x70000000 0x10000000>; }; + aliases { + mmc0 = &sdhci_0; + mmc2 = &sdhci_2; + mmc3 = &sdhci_3; + }; + chosen { bootargs = "root=/dev/mmcblk0p5 rootwait earlyprintk panic=5"; stdout-path = "serial2:115200n8"; diff --git a/arch/arm/boot/dts/exynos4210-universal_c210.dts b/arch/arm/boot/dts/exynos4210-universal_c210.dts index 140abfb38e1d..f42cfcbcdcfa 100644 --- a/arch/arm/boot/dts/exynos4210-universal_c210.dts +++ b/arch/arm/boot/dts/exynos4210-universal_c210.dts @@ -24,6 +24,12 @@ memory@40000000 { 0x50000000 0x10000000>; }; + aliases { + mmc0 = &sdhci_0; + mmc2 = &sdhci_2; + mmc3 = &sdhci_3; + }; + chosen { bootargs = "root=/dev/mmcblk0p5 rw rootwait earlyprintk panic=5 maxcpus=1"; stdout-path = "serial2:115200n8"; diff --git a/arch/arm/boot/dts/exynos4412-itop-elite.dts b/arch/arm/boot/dts/exynos4412-itop-elite.dts index 6260da187e92..0e5419c0eaff 100644 --- a/arch/arm/boot/dts/exynos4412-itop-elite.dts +++ b/arch/arm/boot/dts/exynos4412-itop-elite.dts @@ -20,6 +20,10 @@ / { model = "TOPEET iTop 4412 Elite board based on Exynos4412"; compatible = "topeet,itop4412-elite", "samsung,exynos4412", "samsung,exynos4"; + aliases { + mmc2 = &sdhci_2; + }; + chosen { bootargs = "root=/dev/mmcblk0p2 rw rootfstype=ext4 rootdelay=1 rootwait"; stdout-path = "serial2:115200n8"; diff --git a/arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi b/arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi index ca8d42b2ce3b..7bc6968af9c3 100644 --- a/arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi +++ b/arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi @@ -23,6 +23,10 @@ memory@40000000 { reg = <0x40000000 0x40000000>; }; + aliases { + mmc0 = &mshc_0; + }; + firmware@203f000 { compatible = "samsung,secure-firmware"; reg = <0x0203f000 0x1000>; diff --git a/arch/arm/boot/dts/exynos4412-midas.dtsi b/arch/arm/boot/dts/exynos4412-midas.dtsi index 82aed59cba7c..e6b949c1a00f 100644 --- a/arch/arm/boot/dts/exynos4412-midas.dtsi +++ b/arch/arm/boot/dts/exynos4412-midas.dtsi @@ -25,6 +25,9 @@ / { aliases { i2c11 = &i2c_max77693; i2c12 = &i2c_max77693_fuel; + mmc0 = &mshc_0; + mmc2 = &sdhci_2; + mmc3 = &sdhci_3; }; chosen { diff --git a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi index 25e082fda955..45ef7b7ba7e0 100644 --- a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi +++ b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi @@ -13,6 +13,11 @@ #include "exynos-mfc-reserved-memory.dtsi" / { + aliases { + mmc0 = &mshc_0; + mmc2 = &sdhci_2; + }; + chosen { stdout-path = &serial_1; }; diff --git a/arch/arm/boot/dts/exynos4412-origen.dts b/arch/arm/boot/dts/exynos4412-origen.dts index f6cebf73b839..aaf3a405b6bf 100644 --- a/arch/arm/boot/dts/exynos4412-origen.dts +++ b/arch/arm/boot/dts/exynos4412-origen.dts @@ -25,6 +25,11 @@ memory@40000000 { reg = <0x40000000 0x40000000>; }; + aliases { + mmc0 = &mshc_0; + mmc2 = &sdhci_2; + }; + chosen { stdout-path = "serial2:115200n8"; }; diff --git a/arch/arm/boot/dts/exynos4412-p4note.dtsi b/arch/arm/boot/dts/exynos4412-p4note.dtsi index 9052b3ebb3e8..0b89d5682f85 100644 --- a/arch/arm/boot/dts/exynos4412-p4note.dtsi +++ b/arch/arm/boot/dts/exynos4412-p4note.dtsi @@ -26,6 +26,12 @@ memory@40000000 { reg = <0x40000000 0x80000000>; }; + aliases { + mmc0 = &mshc_0; + mmc2 = &sdhci_2; + mmc3 = &sdhci_3; + }; + chosen { stdout-path = &serial_2; }; diff --git a/arch/arm/boot/dts/exynos4412-smdk4412.dts b/arch/arm/boot/dts/exynos4412-smdk4412.dts index a40ff394977c..2d27bfab8ecd 100644 --- a/arch/arm/boot/dts/exynos4412-smdk4412.dts +++ b/arch/arm/boot/dts/exynos4412-smdk4412.dts @@ -22,6 +22,10 @@ memory@40000000 { reg = <0x40000000 0x40000000>; }; + aliases { + mmc2 = &sdhci_2; + }; + chosen { bootargs = "root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M init=/linuxrc"; stdout-path = "serial1:115200n8"; diff --git a/arch/arm/boot/dts/exynos4412-tiny4412.dts b/arch/arm/boot/dts/exynos4412-tiny4412.dts index e0b6162d2e2a..3dac7fed96d7 100644 --- a/arch/arm/boot/dts/exynos4412-tiny4412.dts +++ b/arch/arm/boot/dts/exynos4412-tiny4412.dts @@ -17,6 +17,10 @@ / { model = "FriendlyARM TINY4412 board based on Exynos4412"; compatible = "friendlyarm,tiny4412", "samsung,exynos4412", "samsung,exynos4"; + aliases { + mmc2 = &sdhci_2; + }; + chosen { stdout-path = &serial_0; }; diff --git a/arch/arm/boot/dts/exynos5250-arndale.dts b/arch/arm/boot/dts/exynos5250-arndale.dts index 8f01337bb291..1c997cc242da 100644 --- a/arch/arm/boot/dts/exynos5250-arndale.dts +++ b/arch/arm/boot/dts/exynos5250-arndale.dts @@ -23,6 +23,11 @@ memory@40000000 { reg = <0x40000000 0x80000000>; }; + aliases { + mmc0 = &mmc_0; + mmc2 = &mmc_2; + }; + chosen { stdout-path = "serial2:115200n8"; }; diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts index f7d4017e1ede..fea3959e5ed3 100644 --- a/arch/arm/boot/dts/exynos5250-smdk5250.dts +++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts @@ -17,6 +17,8 @@ / { compatible = "samsung,smdk5250", "samsung,exynos5250", "samsung,exynos5"; aliases { + mmc0 = &mmc_0; + mmc2 = &mmc_2; }; memory@40000000 { diff --git a/arch/arm/boot/dts/exynos5250-snow-common.dtsi b/arch/arm/boot/dts/exynos5250-snow-common.dtsi index dea2dc818578..59b2cc35c37b 100644 --- a/arch/arm/boot/dts/exynos5250-snow-common.dtsi +++ b/arch/arm/boot/dts/exynos5250-snow-common.dtsi @@ -15,6 +15,9 @@ / { aliases { i2c104 = &i2c_104; + mmc0 = &mmc_0; /* eMMC */ + mmc1 = &mmc_2; /* SD */ + mmc2 = &mmc_3; /* WiFi */ }; memory@40000000 { diff --git a/arch/arm/boot/dts/exynos5250-spring.dts b/arch/arm/boot/dts/exynos5250-spring.dts index 8980cdbdcb3b..c12bb17631b7 100644 --- a/arch/arm/boot/dts/exynos5250-spring.dts +++ b/arch/arm/boot/dts/exynos5250-spring.dts @@ -23,6 +23,11 @@ memory@40000000 { reg = <0x40000000 0x80000000>; }; + aliases { + mmc0 = &mmc_0; + mmc1 = &mmc_1; + }; + chosen { bootargs = "console=tty1"; stdout-path = "serial3:115200n8"; diff --git a/arch/arm/boot/dts/exynos5260-xyref5260.dts b/arch/arm/boot/dts/exynos5260-xyref5260.dts index 0fd728bc0b75..85889bfd6ae9 100644 --- a/arch/arm/boot/dts/exynos5260-xyref5260.dts +++ b/arch/arm/boot/dts/exynos5260-xyref5260.dts @@ -18,6 +18,11 @@ memory@20000000 { reg = <0x20000000 0x80000000>; }; + aliases { + mmc0 = &mmc_0; + mmc2 = &mmc_2; + }; + chosen { stdout-path = "serial2:115200n8"; }; diff --git a/arch/arm/boot/dts/exynos5410-odroidxu.dts b/arch/arm/boot/dts/exynos5410-odroidxu.dts index 1ed73f3b4ac0..9d94a0776cb8 100644 --- a/arch/arm/boot/dts/exynos5410-odroidxu.dts +++ b/arch/arm/boot/dts/exynos5410-odroidxu.dts @@ -21,6 +21,8 @@ / { aliases { ethernet = ðernet; + mmc0 = &mmc_0; + mmc2 = &mmc_2; }; memory@40000000 { diff --git a/arch/arm/boot/dts/exynos5410-smdk5410.dts b/arch/arm/boot/dts/exynos5410-smdk5410.dts index b4a74f9cf319..0f2a6a6be1d0 100644 --- a/arch/arm/boot/dts/exynos5410-smdk5410.dts +++ b/arch/arm/boot/dts/exynos5410-smdk5410.dts @@ -18,6 +18,11 @@ memory@40000000 { reg = <0x40000000 0x80000000>; }; + aliases { + mmc0 = &mmc_0; + mmc2 = &mmc_2; + }; + chosen { stdout-path = "serial2:115200n8"; }; diff --git a/arch/arm/boot/dts/exynos5420-arndale-octa.dts b/arch/arm/boot/dts/exynos5420-arndale-octa.dts index 5ed55a5b0c67..4b4c56ce3a5c 100644 --- a/arch/arm/boot/dts/exynos5420-arndale-octa.dts +++ b/arch/arm/boot/dts/exynos5420-arndale-octa.dts @@ -23,6 +23,11 @@ memory@20000000 { reg = <0x20000000 0x80000000>; }; + aliases { + mmc0 = &mmc_0; + mmc2 = &mmc_2; + }; + chosen { stdout-path = "serial3:115200n8"; }; diff --git a/arch/arm/boot/dts/exynos5420-galaxy-tab-common.dtsi b/arch/arm/boot/dts/exynos5420-galaxy-tab-common.dtsi index 6a51cb14b58a..f525b2f5e4e0 100644 --- a/arch/arm/boot/dts/exynos5420-galaxy-tab-common.dtsi +++ b/arch/arm/boot/dts/exynos5420-galaxy-tab-common.dtsi @@ -28,6 +28,11 @@ / { * for more details. */ + aliases { + mmc0 = &mmc_0; + mmc2 = &mmc_2; + }; + chosen { stdout-path = "serial2:115200n8"; }; diff --git a/arch/arm/boot/dts/exynos5420-peach-pit.dts b/arch/arm/boot/dts/exynos5420-peach-pit.dts index df863b909ff7..7a48f2b32819 100644 --- a/arch/arm/boot/dts/exynos5420-peach-pit.dts +++ b/arch/arm/boot/dts/exynos5420-peach-pit.dts @@ -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 { diff --git a/arch/arm/boot/dts/exynos5420-smdk5420.dts b/arch/arm/boot/dts/exynos5420-smdk5420.dts index 0a9371bec3e0..e2493014cf8a 100644 --- a/arch/arm/boot/dts/exynos5420-smdk5420.dts +++ b/arch/arm/boot/dts/exynos5420-smdk5420.dts @@ -21,6 +21,11 @@ memory@20000000 { reg = <0x20000000 0x80000000>; }; + aliases { + mmc0 = &mmc_0; + mmc2 = &mmc_2; + }; + chosen { bootargs = "init=/linuxrc"; stdout-path = "serial2:115200n8"; diff --git a/arch/arm/boot/dts/exynos5422-odroid-core.dtsi b/arch/arm/boot/dts/exynos5422-odroid-core.dtsi index 30fc677d8bac..2f5b8602e020 100644 --- a/arch/arm/boot/dts/exynos5422-odroid-core.dtsi +++ b/arch/arm/boot/dts/exynos5422-odroid-core.dtsi @@ -19,6 +19,10 @@ memory@40000000 { reg = <0x40000000 0x7ea00000>; }; + aliases { + mmc2 = &mmc_2; + }; + chosen { stdout-path = "serial2:115200n8"; }; diff --git a/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi b/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi index d1b8e59e2daf..b4a851aa8881 100644 --- a/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi +++ b/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi @@ -13,6 +13,10 @@ #include "exynos5422-odroid-core.dtsi" / { + aliases { + mmc0 = &mmc_0; + }; + gpio-keys { compatible = "gpio-keys"; pinctrl-names = "default"; diff --git a/arch/arm/boot/dts/exynos5800-peach-pi.dts b/arch/arm/boot/dts/exynos5800-peach-pi.dts index 37af8fbd215c..1f544f12da6c 100644 --- a/arch/arm/boot/dts/exynos5800-peach-pi.dts +++ b/arch/arm/boot/dts/exynos5800-peach-pi.dts @@ -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 {