[PATCH v2 2/2] ARM: dts: exynos: add mmc aliases

[Krzysztof Kozlowski]

On 09/02/2023 15:50, Marek Szyprowski wrote:
> On 09.02.2023 15:23, Krzysztof Kozlowski wrote:
>> On 28/01/2023 14:31, Henrik Grimler wrote:
>>> Add aliases for eMMC, SD card and WiFi where applicable, so that
>>> assigned mmcblk numbers are always the same.
>>>
>>> Co-developed-by: Anton Bambura <jenneron at protonmail.com>
>>> Signed-off-by: Anton Bambura <jenneron at protonmail.com>
>>> [ Tested on exynos5800-peach-pi ]
>>> Tested-by: Valentine Iourine <iourine at iourine.msk.su>
>>> Signed-off-by: Henrik Grimler <henrik at grimler.se>
>>> ---
>>>   arch/arm/boot/dts/exynos3250-artik5-eval.dts        | 5 +++++
>>>   arch/arm/boot/dts/exynos3250-artik5.dtsi            | 5 +++++
>>>   arch/arm/boot/dts/exynos3250-monk.dts               | 1 +
>>>   arch/arm/boot/dts/exynos3250-rinato.dts             | 2 ++
>>>   arch/arm/boot/dts/exynos4210-i9100.dts              | 6 ++++++
>>>   arch/arm/boot/dts/exynos4210-origen.dts             | 5 +++++
>>>   arch/arm/boot/dts/exynos4210-smdkv310.dts           | 4 ++++
>>>   arch/arm/boot/dts/exynos4210-trats.dts              | 6 ++++++
>>>   arch/arm/boot/dts/exynos4210-universal_c210.dts     | 6 ++++++
>>>   arch/arm/boot/dts/exynos4412-itop-elite.dts         | 5 +++++
>>>   arch/arm/boot/dts/exynos4412-midas.dtsi             | 3 +++
>>>   arch/arm/boot/dts/exynos4412-odroid-common.dtsi     | 5 +++++
>>>   arch/arm/boot/dts/exynos4412-origen.dts             | 5 +++++
>>>   arch/arm/boot/dts/exynos4412-p4note.dtsi            | 6 ++++++
>>>   arch/arm/boot/dts/exynos4412-smdk4412.dts           | 4 ++++
>>>   arch/arm/boot/dts/exynos4412-tiny4412.dts           | 4 ++++
>>>   arch/arm/boot/dts/exynos5250-arndale.dts            | 5 +++++
>>>   arch/arm/boot/dts/exynos5250-smdk5250.dts           | 2 ++
>>>   arch/arm/boot/dts/exynos5250-snow-common.dtsi       | 3 +++
>>>   arch/arm/boot/dts/exynos5250-spring.dts             | 5 +++++
>>>   arch/arm/boot/dts/exynos5260-xyref5260.dts          | 5 +++++
>>>   arch/arm/boot/dts/exynos5410-odroidxu.dts           | 2 ++
>>>   arch/arm/boot/dts/exynos5410-smdk5410.dts           | 5 +++++
>>>   arch/arm/boot/dts/exynos5420-arndale-octa.dts       | 5 +++++
>>>   arch/arm/boot/dts/exynos5420-galaxy-tab-common.dtsi | 5 +++++
>>>   arch/arm/boot/dts/exynos5420-peach-pit.dts          | 3 +++
>>>   arch/arm/boot/dts/exynos5420-smdk5420.dts           | 5 +++++
>>>   arch/arm/boot/dts/exynos5422-odroid-core.dtsi       | 5 +++++
>>>   arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi  | 4 ++++
>>>   arch/arm/boot/dts/exynos5422-samsung-k3g.dts        | 4 ++++
>>>   arch/arm/boot/dts/exynos5800-peach-pi.dts           | 3 +++
>>>   31 files changed, 133 insertions(+)
>>>
>>> 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 0ac3f284fbb8..a6e2f46917a8 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 80d90fe7fad1..a68e5f81404c 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 at 40000000 {
>>> diff --git a/arch/arm/boot/dts/exynos3250-rinato.dts b/arch/arm/boot/dts/exynos3250-rinato.dts
>>> index 1f9cba0607e1..f0fb6890e4a8 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 at 40000000 {
>>>   		reg = <0x40000000 0x40000000>;
>>>   	};
>>>   
>>> +	aliases {
>>> +		mmc0 = &sdhci_0;
>>> +		mmc2 = &sdhci_2;
>>> +		mmc3 = &sdhci_3;
>> 1. Is this actually correct? Since mmc1 was disabled, sdhci_2 had mmc1
>> index but now will have mmc2.
>>
>> 2. I tested Odroid U3 and the ID changed. emmc went from 1 to 0. Any
>> idea why? Both patches should be transparent.
> 
> Nope, eMMC and SD order changed a few times in the past and now they get 
> indices based on the probe time, so any order is possible depending on 
> the presence of the sd card / eMMC module.
> 
>> 3. Patchset does not look bisectable, so both patches should be squashed.
> 
> Why? First patch removes obsolete mshc aliases, which don't determine 
> the logical MMC device number in the system. The second one adds fixed 
> indices to the local MMC devices created by the respective MMC host 
> controllers.

Ah, I see now, so mshc only determined the caps. That makes sense and
answers my two questions.

But my question (1) a bit remains - these numbers of aliases should
reflect what is wired on the board, so:
A. before indices were mmc0, mmc1, mmc2 (and sdhcio_1 disabled). Now
indices will be mmc0, mmc2 and mmc3, right?

B. How the interface is called on the board? For some boards we actually
can check with schematics.

Best regards,
Krzysztof