arm64: tegra: Fix mmc0 alias for Jetson Xavier NX

There are two variants of the Jetson Xavier NX platform; one has an
eMMC and one as a micro SD-card slot. The SDHCI controller used by
each variant is different, however, the current device-tree for both
Xavier NX boards have the same SDHCI controller defined as 'mmc0' in
the device-tree alias node. Fix this by correcting the 'mmc0' alias
for the SD-card variant.

Fixes: 3f9efbbe57bc ("arm64: tegra: Add support for Jetson Xavier NX")
Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>

diff --git a/arch/arm64/boot/dts/nvidia/tegra194-p3668-0000.dtsi b/arch/arm64/boot/dts/nvidia/tegra194-p3668-0000.dtsi
index 7da3d48cb410608398eba304cc65604544ca0ba8..14da4206ea66a0dde009bee42fa2bebcd57d62f2 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra194-p3668-0000.dtsi
+++ b/arch/arm64/boot/dts/nvidia/tegra194-p3668-0000.dtsi
@@ -5,6 +5,10 @@
        model = "NVIDIA Jetson Xavier NX (SD-card)";
        compatible = "nvidia,p3668-0000", "nvidia,tegra194";
 
+       aliases {
+               mmc0 = "/bus@0/mmc@3400000";
+       };
+
        bus@0 {
                /* SDMMC1 (SD/MMC) */
                mmc@3400000 {

diff --git a/arch/arm64/boot/dts/nvidia/tegra194-p3668-0001.dtsi b/arch/arm64/boot/dts/nvidia/tegra194-p3668-0001.dtsi
index b7808648cfe4d226b26304f5d6b8e5ee904dfcca..f5a9ebbfb12f68dc0369346aa95631591627040d 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra194-p3668-0001.dtsi
+++ b/arch/arm64/boot/dts/nvidia/tegra194-p3668-0001.dtsi
@@ -5,6 +5,10 @@
        model = "NVIDIA Jetson Xavier NX (eMMC)";
        compatible = "nvidia,p3668-0001", "nvidia,tegra194";
 
+       aliases {
+               mmc0 = "/bus@0/mmc@3460000";
+       };
+
        bus@0 {
                /* SDMMC4 (eMMC) */
                mmc@3460000 {

diff --git a/arch/arm64/boot/dts/nvidia/tegra194-p3668.dtsi b/arch/arm64/boot/dts/nvidia/tegra194-p3668.dtsi
index 4f12721c332bcca2b3d2763204da6e35a79b2dff..f16b0aa8a374e7519d90c79258152d2e5c55047e 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra194-p3668.dtsi
+++ b/arch/arm64/boot/dts/nvidia/tegra194-p3668.dtsi
@@ -14,7 +14,6 @@
                i2c5 = "/bus@0/i2c@31c0000";
                i2c6 = "/bus@0/i2c@c250000";
                i2c7 = "/bus@0/i2c@31e0000";
-               mmc0 = "/bus@0/mmc@3460000";
                rtc0 = "/bpmp/i2c/pmic@3c";
                rtc1 = "/bus@0/rtc@c2a0000";
                serial0 = &tcu;