Since probe order of mmc can vary depending on device tree dependencies,
Lets try and introduce a consistent definition of what mmc0, 1 are
across platforms.
NOTE: Certain platforms may choose to have overrides due to various
legacy reasons, we permit that in the board specific alias definition.
Signed-off-by: Nishanth Menon <[email protected]>
---
arch/arm64/boot/dts/ti/k3-am64.dtsi | 2 ++
arch/arm64/boot/dts/ti/k3-am65.dtsi | 2 ++
arch/arm64/boot/dts/ti/k3-j7200.dtsi | 2 ++
arch/arm64/boot/dts/ti/k3-j721e.dtsi | 3 +++
4 files changed, 9 insertions(+)
diff --git a/arch/arm64/boot/dts/ti/k3-am64.dtsi b/arch/arm64/boot/dts/ti/k3-am64.dtsi
index de6805b0c72c..120974726be8 100644
--- a/arch/arm64/boot/dts/ti/k3-am64.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am64.dtsi
@@ -30,6 +30,8 @@ aliases {
serial8 = &main_uart6;
ethernet0 = &cpsw_port1;
ethernet1 = &cpsw_port2;
+ mmc0 = &sdhci0;
+ mmc1 = &sdhci1;
};
chosen { };
diff --git a/arch/arm64/boot/dts/ti/k3-am65.dtsi b/arch/arm64/boot/dts/ti/k3-am65.dtsi
index a9fc1af03f27..a58a39fa42db 100644
--- a/arch/arm64/boot/dts/ti/k3-am65.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am65.dtsi
@@ -31,6 +31,8 @@ aliases {
i2c4 = &main_i2c2;
i2c5 = &main_i2c3;
ethernet0 = &cpsw_port1;
+ mmc0 = &sdhci0;
+ mmc1 = &sdhci1;
};
chosen { };
diff --git a/arch/arm64/boot/dts/ti/k3-j7200.dtsi b/arch/arm64/boot/dts/ti/k3-j7200.dtsi
index b7005b803149..47567cb260c2 100644
--- a/arch/arm64/boot/dts/ti/k3-j7200.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-j7200.dtsi
@@ -30,6 +30,8 @@ aliases {
serial9 = &main_uart7;
serial10 = &main_uart8;
serial11 = &main_uart9;
+ mmc0 = &main_sdhci0;
+ mmc1 = &main_sdhci1;
};
chosen { };
diff --git a/arch/arm64/boot/dts/ti/k3-j721e.dtsi b/arch/arm64/boot/dts/ti/k3-j721e.dtsi
index f0587fde147e..214359e7288b 100644
--- a/arch/arm64/boot/dts/ti/k3-j721e.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-j721e.dtsi
@@ -31,6 +31,9 @@ aliases {
serial10 = &main_uart8;
serial11 = &main_uart9;
ethernet0 = &cpsw_port1;
+ mmc0 = &main_sdhci0;
+ mmc1 = &main_sdhci1;
+ mmc2 = &main_sdhci2;
};
chosen { };
--
2.32.0
On 15/09/21 7:24 pm, Nishanth Menon wrote:
> Since probe order of mmc can vary depending on device tree dependencies,
> Lets try and introduce a consistent definition of what mmc0, 1 are
> across platforms.
>
> NOTE: Certain platforms may choose to have overrides due to various
> legacy reasons, we permit that in the board specific alias definition.
>
> Signed-off-by: Nishanth Menon <[email protected]>
> ---
Reviewed-by: Aswath Govindraju <[email protected]>
> arch/arm64/boot/dts/ti/k3-am64.dtsi | 2 ++
> arch/arm64/boot/dts/ti/k3-am65.dtsi | 2 ++
> arch/arm64/boot/dts/ti/k3-j7200.dtsi | 2 ++
> arch/arm64/boot/dts/ti/k3-j721e.dtsi | 3 +++
> 4 files changed, 9 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/ti/k3-am64.dtsi b/arch/arm64/boot/dts/ti/k3-am64.dtsi
> index de6805b0c72c..120974726be8 100644
> --- a/arch/arm64/boot/dts/ti/k3-am64.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-am64.dtsi
> @@ -30,6 +30,8 @@ aliases {
> serial8 = &main_uart6;
> ethernet0 = &cpsw_port1;
> ethernet1 = &cpsw_port2;
> + mmc0 = &sdhci0;
> + mmc1 = &sdhci1;
> };
>
> chosen { };
> diff --git a/arch/arm64/boot/dts/ti/k3-am65.dtsi b/arch/arm64/boot/dts/ti/k3-am65.dtsi
> index a9fc1af03f27..a58a39fa42db 100644
> --- a/arch/arm64/boot/dts/ti/k3-am65.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-am65.dtsi
> @@ -31,6 +31,8 @@ aliases {
> i2c4 = &main_i2c2;
> i2c5 = &main_i2c3;
> ethernet0 = &cpsw_port1;
> + mmc0 = &sdhci0;
> + mmc1 = &sdhci1;
> };
>
> chosen { };
> diff --git a/arch/arm64/boot/dts/ti/k3-j7200.dtsi b/arch/arm64/boot/dts/ti/k3-j7200.dtsi
> index b7005b803149..47567cb260c2 100644
> --- a/arch/arm64/boot/dts/ti/k3-j7200.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-j7200.dtsi
> @@ -30,6 +30,8 @@ aliases {
> serial9 = &main_uart7;
> serial10 = &main_uart8;
> serial11 = &main_uart9;
> + mmc0 = &main_sdhci0;
> + mmc1 = &main_sdhci1;
> };
>
> chosen { };
> diff --git a/arch/arm64/boot/dts/ti/k3-j721e.dtsi b/arch/arm64/boot/dts/ti/k3-j721e.dtsi
> index f0587fde147e..214359e7288b 100644
> --- a/arch/arm64/boot/dts/ti/k3-j721e.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-j721e.dtsi
> @@ -31,6 +31,9 @@ aliases {
> serial10 = &main_uart8;
> serial11 = &main_uart9;
> ethernet0 = &cpsw_port1;
> + mmc0 = &main_sdhci0;
> + mmc1 = &main_sdhci1;
> + mmc2 = &main_sdhci2;
> };
>
> chosen { };
>
On Wed, 15 Sep 2021 08:54:15 -0500, Nishanth Menon wrote:
> Since probe order of mmc can vary depending on device tree dependencies,
> Lets try and introduce a consistent definition of what mmc0, 1 are
> across platforms.
>
> NOTE: Certain platforms may choose to have overrides due to various
> legacy reasons, we permit that in the board specific alias definition.
Hi Nishanth Menon,
I have applied the following to branch ti-k3-dts-next on [1].
Thank you!
[1/1] arm64: dts: ti: ti-k3*: Introduce aliases for mmc nodes
commit: f54e1a97c8dbfe7717e15690c79f1bf20186e1fe
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent up the chain during
the next merge window (or sooner if it is a relevant bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
[1] git://git.kernel.org/pub/scm/linux/kernel/git/nmenon/linux.git
--
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D