arm64: tegra: Add support for Jetson Xavier NX with eMMC

Add support for the variant of the Jetson Xavier NX Developer Kit that
has a system-on-module which includes an eMMC.

Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>

diff --git a/arch/arm64/boot/dts/nvidia/Makefile b/arch/arm64/boot/dts/nvidia/Makefile
index 9296d12d11e9ef4f3e344f431a29cc7d64d2de6b..e13fb10704728543f2081b8d501f8ad8829db2cb 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/Makefile
+++ b/arch/arm64/boot/dts/nvidia/Makefile
@@ -9,4 +9,5 @@ dtb-$(CONFIG_ARCH_TEGRA_210_SOC) += tegra210-p2894-0050-a08.dtb
 dtb-$(CONFIG_ARCH_TEGRA_186_SOC) += tegra186-p2771-0000.dtb
 dtb-$(CONFIG_ARCH_TEGRA_194_SOC) += tegra194-p2972-0000.dtb
 dtb-$(CONFIG_ARCH_TEGRA_194_SOC) += tegra194-p3509-0000+p3668-0000.dtb
+dtb-$(CONFIG_ARCH_TEGRA_194_SOC) += tegra194-p3509-0000+p3668-0001.dtb
 dtb-$(CONFIG_ARCH_TEGRA_234_SOC) += tegra234-sim-vdk.dtb

diff --git a/arch/arm64/boot/dts/nvidia/tegra194-p3509-0000+p3668-0001.dts b/arch/arm64/boot/dts/nvidia/tegra194-p3509-0000+p3668-0001.dts
new file mode 100644 (file)
index 0000000..238fd98
--- /dev/null
+++ b/arch/arm64/boot/dts/nvidia/tegra194-p3509-0000+p3668-0001.dts
@@ -0,0 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
+/dts-v1/;
+
+#include "tegra194-p3668-0001.dtsi"
+#include "tegra194-p3509-0000.dtsi"
+
+/ {
+       model = "NVIDIA Jetson Xavier NX Developer Kit (eMMC)";
+       compatible = "nvidia,p3509-0000+p3668-0001", "nvidia,tegra194";
+};

diff --git a/arch/arm64/boot/dts/nvidia/tegra194-p3668-0001.dtsi b/arch/arm64/boot/dts/nvidia/tegra194-p3668-0001.dtsi
new file mode 100644 (file)
index 0000000..b780864
--- /dev/null
+++ b/arch/arm64/boot/dts/nvidia/tegra194-p3668-0001.dtsi
@@ -0,0 +1,19 @@
+// SPDX-License-Identifier: GPL-2.0
+#include "tegra194-p3668.dtsi"
+
+/ {
+       model = "NVIDIA Jetson Xavier NX (eMMC)";
+       compatible = "nvidia,p3668-0001", "nvidia,tegra194";
+
+       bus@0 {
+               /* SDMMC4 (eMMC) */
+               mmc@3460000 {
+                       status = "okay";
+                       bus-width = <8>;
+                       non-removable;
+
+                       vqmmc-supply = <&vdd_1v8ls>;
+                       vmmc-supply = <&vdd_emmc_3v3>;
+               };
+       };
+};

diff --git a/arch/arm64/boot/dts/nvidia/tegra194-p3668.dtsi b/arch/arm64/boot/dts/nvidia/tegra194-p3668.dtsi
index a26b8a37f884615252a87f69f0d9c82817497df9..4f12721c332bcca2b3d2763204da6e35a79b2dff 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra194-p3668.dtsi
+++ b/arch/arm64/boot/dts/nvidia/tegra194-p3668.dtsi
@@ -252,7 +252,7 @@
                                                regulator-boot-on;
                                        };
 
-                                       ldo3 {
+                                       vdd_emmc_3v3: ldo3 {
                                                regulator-name = "VDD_EMMC_3V3";
                                                regulator-min-microvolt = <3300000>;
                                                regulator-max-microvolt = <3300000>;