ARM64: tegra: Fix mmc0 alias for Jetson Xavier NX
Subsystems (2)
Jon Hunter
maintainerPATCH 1/1 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.
--- arch/arm64/boot/dts/nvidia/tegra194-p3668-0000.dtsi | 4 ++++ arch/arm64/boot/dts/nvidia/tegra194-p3668-0001.dtsi | 4 ++++ arch/arm64/boot/dts/nvidia/tegra194-p3668.dtsi | 1 - 3 files changed, 8 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/nvidia/tegra194-p3668-0000.dtsi +4 -0
@@ -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 {
arch/arm64/boot/dts/nvidia/tegra194-p3668-0001.dtsi +4 -0
@@ -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 {
arch/arm64/boot/dts/nvidia/tegra194-p3668.dtsi +0 -1
@@ -14,7 +14,6 @@ aliases { 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;
Signature · 1 line
2.25.1
Thierry Reding
AppliedQuoted 7 lines · Jon Hunter
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.
Quoted 7 lines
Fixes 3f9efbbe57bc ("arm64: tegra: Add support for Jetson Xavier NX")Signed-off-by Jon Hunter <[email protected]>--- arch/arm64/boot/dts/nvidia/tegra194-p3668-0000.dtsi | 4 ++++ arch/arm64/boot/dts/nvidia/tegra194-p3668-0001.dtsi | 4 ++++ arch/arm64/boot/dts/nvidia/tegra194-p3668.dtsi | 1 - 3 files changed, 8 insertions(+), 1 deletion(-)
Applied, thanks. I'll let this soak in linux-next for just a few days and then send this as a pull request for v5.12.
Just one small nitpick: the correct prefix is "arm64: tegra:". I've fixed it up and will keep doing so, but if you want to save me an extra 2 seconds per patch that would be how. =)
Thierry