It is convenient to have fixed mmcblk numbering of the eMMC and
sdcard, and with these aliases all Exynos 4 and 5 devices (and
probably Exynos 3, but I do not have one of those boards so cannot
verify) will have the eMMC as mmc0 and sdcard as mmc2.
I also removed sdhc aliases, as they should not be needed after [1] as
I understand it.
[1] https://lkml.kernel.org/lkml/[email protected]/
Henrik Grimler (6):
ARM: dts: exynos: add mmc aliases for Exynos3250
ARM: dts: exynos: add mmc aliases for Exynos4210
ARM: dts: exynos: add mmc aliases for Exynos4412
ARM: dts: exynos: add mmc aliases for Exynos5250
ARM: dts: exynos: add mmc aliases for Exynos5410
ARM: dts: exynos: add mmc aliases for Exynos5420
arch/arm/boot/dts/exynos3250.dtsi | 6 +++---
arch/arm/boot/dts/exynos4210.dtsi | 4 ++++
arch/arm/boot/dts/exynos4412.dtsi | 5 ++++-
arch/arm/boot/dts/exynos5250.dtsi | 8 ++++----
arch/arm/boot/dts/exynos5410.dtsi | 3 +++
arch/arm/boot/dts/exynos5420.dtsi | 6 +++---
6 files changed, 21 insertions(+), 11 deletions(-)
base-commit: 9ca5a7ce492d182c25ea2e785eeb72cee1d5056b
--
2.39.1
So that mmcblk numbering is fixed for the eMMC and sdcard, no matter
if a storage device is attached or not. Also remove old, no longer
used, mshc alias while we are at it.
Signed-off-by: Henrik Grimler <[email protected]>
---
arch/arm/boot/dts/exynos3250.dtsi | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/boot/dts/exynos3250.dtsi b/arch/arm/boot/dts/exynos3250.dtsi
index 54bb323186e4..119fbe4208cd 100644
--- a/arch/arm/boot/dts/exynos3250.dtsi
+++ b/arch/arm/boot/dts/exynos3250.dtsi
@@ -28,9 +28,9 @@ / {
aliases {
pinctrl0 = &pinctrl_0;
pinctrl1 = &pinctrl_1;
- mshc0 = &mshc_0;
- mshc1 = &mshc_1;
- mshc2 = &mshc_2;
+ mmc0 = &mshc_0;
+ mmc1 = &mshc_1;
+ mmc2 = &mshc_2;
spi0 = &spi_0;
spi1 = &spi_1;
i2c0 = &i2c_0;
--
2.39.1
So that mmcblk numbering is fixed for the eMMC and sdcard, no matter
if a storage device is attached or not.
Signed-off-by: Henrik Grimler <[email protected]>
---
arch/arm/boot/dts/exynos4210.dtsi | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/arm/boot/dts/exynos4210.dtsi b/arch/arm/boot/dts/exynos4210.dtsi
index 267eff6c97d6..403c28c120f9 100644
--- a/arch/arm/boot/dts/exynos4210.dtsi
+++ b/arch/arm/boot/dts/exynos4210.dtsi
@@ -23,6 +23,10 @@ / {
compatible = "samsung,exynos4210", "samsung,exynos4";
aliases {
+ mmc0 = &sdhci_0;
+ mmc1 = &sdhci_1;
+ mmc2 = &sdhci_2;
+ mmc3 = &sdhci_3;
pinctrl0 = &pinctrl_0;
pinctrl1 = &pinctrl_1;
pinctrl2 = &pinctrl_2;
--
2.39.1
So that mmcblk numbering is fixed for the eMMC and sdcard, no matter
if a storage device is attached or not. Also remove old, no longer
used, mshc alias while we are at it.
Signed-off-by: Henrik Grimler <[email protected]>
---
arch/arm/boot/dts/exynos4412.dtsi | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/exynos4412.dtsi b/arch/arm/boot/dts/exynos4412.dtsi
index 7b4e2c442888..9625e9fe63b1 100644
--- a/arch/arm/boot/dts/exynos4412.dtsi
+++ b/arch/arm/boot/dts/exynos4412.dtsi
@@ -28,7 +28,10 @@ aliases {
pinctrl3 = &pinctrl_3;
fimc-lite0 = &fimc_lite_0;
fimc-lite1 = &fimc_lite_1;
- mshc0 = &mshc_0;
+ mmc0 = &mshc_0; /* eMMC */
+ mmc1 = &sdhci_1;
+ mmc2 = &sdhci_2; /* uSD */
+ mmc3 = &sdhci_3;
};
cpus {
--
2.39.1
So that mmcblk numbering is fixed for the eMMC and sdcard, no matter
if a storage device is attached or not. Also remove old, no longer
used, mshc alias while we are at it.
Signed-off-by: Henrik Grimler <[email protected]>
---
arch/arm/boot/dts/exynos5250.dtsi | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
index 97e89859ba3d..d030020c5d46 100644
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -30,10 +30,10 @@ aliases {
gsc1 = &gsc_1;
gsc2 = &gsc_2;
gsc3 = &gsc_3;
- mshc0 = &mmc_0;
- mshc1 = &mmc_1;
- mshc2 = &mmc_2;
- mshc3 = &mmc_3;
+ mmc0 = &mmc_0; /* eMMC */
+ mmc1 = &mmc_1;
+ mmc2 = &mmc_2; /* uSD */
+ mmc3 = &mmc_3;
i2c4 = &i2c_4;
i2c5 = &i2c_5;
i2c6 = &i2c_6;
--
2.39.1
So that mmcblk numbering is fixed for the eMMC and sdcard, no matter
if a storage device is attached or not.
Signed-off-by: Henrik Grimler <[email protected]>
---
arch/arm/boot/dts/exynos5410.dtsi | 3 +++
1 file changed, 3 insertions(+)
diff --git a/arch/arm/boot/dts/exynos5410.dtsi b/arch/arm/boot/dts/exynos5410.dtsi
index 350b8afa0a3a..9ecbe3cf27e8 100644
--- a/arch/arm/boot/dts/exynos5410.dtsi
+++ b/arch/arm/boot/dts/exynos5410.dtsi
@@ -20,6 +20,9 @@ / {
interrupt-parent = <&gic>;
aliases {
+ mmc0 = &mmc_0;
+ mmc1 = &mmc_1;
+ mmc2 = &mmc_2;
pinctrl0 = &pinctrl_0;
pinctrl1 = &pinctrl_1;
pinctrl2 = &pinctrl_2;
--
2.39.1
So that mmcblk numbering is fixed for the eMMC and sdcard, no matter
if a storage device is attached or not. Also remove old, no longer
used, mshc alias while we are at it.
Signed-off-by: Henrik Grimler <[email protected]>
---
arch/arm/boot/dts/exynos5420.dtsi | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi
index b1051a7d07af..3179174a23c4 100644
--- a/arch/arm/boot/dts/exynos5420.dtsi
+++ b/arch/arm/boot/dts/exynos5420.dtsi
@@ -19,9 +19,9 @@ / {
compatible = "samsung,exynos5420", "samsung,exynos5";
aliases {
- mshc0 = &mmc_0;
- mshc1 = &mmc_1;
- mshc2 = &mmc_2;
+ mmc0 = &mmc_0;
+ mmc1 = &mmc_1;
+ mmc2 = &mmc_2;
pinctrl0 = &pinctrl_0;
pinctrl1 = &pinctrl_1;
pinctrl2 = &pinctrl_2;
--
2.39.1
On 26/01/2023 11:38, Henrik Grimler wrote:
> It is convenient to have fixed mmcblk numbering of the eMMC and
> sdcard, and with these aliases all Exynos 4 and 5 devices (and
> probably Exynos 3, but I do not have one of those boards so cannot
> verify) will have the eMMC as mmc0 and sdcard as mmc2.
>
> I also removed sdhc aliases, as they should not be needed after [1] as
> I understand it.
>
> [1] https://lkml.kernel.org/lkml/[email protected]/
Marek sent the same in the past:
https://lore.kernel.org/all/?q=%22exynos%3A+Use+fixed+index+for+the+MMC+devices%22
The patches are fine for me except, that these actually do not belong to
DTSI. Aliases for board or user-exposable interfaces are actually board
specific and each board should customize the ones it uses.
Best regards,
Krzysztof
On 26/01/2023 11:38, Henrik Grimler wrote:
> So that mmcblk numbering is fixed for the eMMC and sdcard, no matter
> if a storage device is attached or not. Also remove old, no longer
> used, mshc alias while we are at it.
>
> Signed-off-by: Henrik Grimler <[email protected]>
> ---
> arch/arm/boot/dts/exynos4412.dtsi | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm/boot/dts/exynos4412.dtsi b/arch/arm/boot/dts/exynos4412.dtsi
> index 7b4e2c442888..9625e9fe63b1 100644
> --- a/arch/arm/boot/dts/exynos4412.dtsi
> +++ b/arch/arm/boot/dts/exynos4412.dtsi
> @@ -28,7 +28,10 @@ aliases {
> pinctrl3 = &pinctrl_3;
> fimc-lite0 = &fimc_lite_0;
> fimc-lite1 = &fimc_lite_1;
> - mshc0 = &mshc_0;
> + mmc0 = &mshc_0; /* eMMC */
> + mmc1 = &sdhci_1;
> + mmc2 = &sdhci_2; /* uSD */
> + mmc3 = &sdhci_3;
This is definitely not correct. Several boards do not have mmc1 or mmc2
exposed at all.
Best regards,
Krzysztof
Hi Krzysztof,
On Thu, Jan 26, 2023 at 01:22:54PM +0100, Krzysztof Kozlowski wrote:
> On 26/01/2023 11:38, Henrik Grimler wrote:
> > It is convenient to have fixed mmcblk numbering of the eMMC and
> > sdcard, and with these aliases all Exynos 4 and 5 devices (and
> > probably Exynos 3, but I do not have one of those boards so cannot
> > verify) will have the eMMC as mmc0 and sdcard as mmc2.
> >
> > I also removed sdhc aliases, as they should not be needed after [1] as
> > I understand it.
> >
> > [1] https://lkml.kernel.org/lkml/[email protected]/
>
> Marek sent the same in the past:
> https://lore.kernel.org/all/?q=%22exynos%3A+Use+fixed+index+for+the+MMC+devices%22
>
> The patches are fine for me except, that these actually do not belong to
> DTSI. Aliases for board or user-exposable interfaces are actually board
> specific and each board should customize the ones it uses.
Thanks for reviewing! I will change the series to only add aliases to
the boards I am familiar with.
> Best regards,
> Krzysztof
Best regards,
Henrik Grimler
On 26/01/2023 14:19, Henrik Grimler wrote:
> Hi Krzysztof,
>
> On Thu, Jan 26, 2023 at 01:22:54PM +0100, Krzysztof Kozlowski wrote:
>> On 26/01/2023 11:38, Henrik Grimler wrote:
>>> It is convenient to have fixed mmcblk numbering of the eMMC and
>>> sdcard, and with these aliases all Exynos 4 and 5 devices (and
>>> probably Exynos 3, but I do not have one of those boards so cannot
>>> verify) will have the eMMC as mmc0 and sdcard as mmc2.
>>>
>>> I also removed sdhc aliases, as they should not be needed after [1] as
>>> I understand it.
>>>
>>> [1] https://lkml.kernel.org/lkml/[email protected]/
>>
>> Marek sent the same in the past:
>> https://lore.kernel.org/all/?q=%22exynos%3A+Use+fixed+index+for+the+MMC+devices%22
>>
>> The patches are fine for me except, that these actually do not belong to
>> DTSI. Aliases for board or user-exposable interfaces are actually board
>> specific and each board should customize the ones it uses.
>
> Thanks for reviewing! I will change the series to only add aliases to
> the boards I am familiar with.
I think you can move all of them to all of the boards. Add aliases for
interfaces which are enabled in the board.
Best regards,
Krzysztof