Skip to contentSkip to conversation

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

PATCH Superseded Jon Hunter 2 participants 3 messages Jan 27, 2021

Subsystems (2)
Device tree bindings Tegra architecture support

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Jon Hunter

author maintainer
#0 lore raw

PATCH 1/1 arm64: tegra: Add support for Jetson Xavier NX with eMMC

There are two versions of the Jetson Xavier NX system-on-module; one with a micro SD-card slot and one with an eMMC. Currently, only the system-on-module with the micro SD-card slot is supported and so add necessary device-tree changes to add support for the eMMC version.

Signed-off-by Jon Hunter <[email protected]>
---
 arch/arm64/boot/dts/nvidia/Makefile           |   1 +
 .../nvidia/tegra194-p3509-0000+p3668-0000.dts | 351 +-----------------
 .../nvidia/tegra194-p3509-0000+p3668-0001.dts |  10 +
 .../boot/dts/nvidia/tegra194-p3509-0000.dtsi  | 351 ++++++++++++++++++
 .../boot/dts/nvidia/tegra194-p3668-0000.dtsi  | 282 +-------------
 .../boot/dts/nvidia/tegra194-p3668-0001.dtsi  |  19 +
 .../arm64/boot/dts/nvidia/tegra194-p3668.dtsi | 284 ++++++++++++++
 7 files changed, 669 insertions(+), 629 deletions(-)
 create mode 100644 arch/arm64/boot/dts/nvidia/tegra194-p3509-0000+p3668-0001.dts
 create mode 100644 arch/arm64/boot/dts/nvidia/tegra194-p3509-0000.dtsi
 create mode 100644 arch/arm64/boot/dts/nvidia/tegra194-p3668-0001.dtsi
 create mode 100644 arch/arm64/boot/dts/nvidia/tegra194-p3668.dtsi
arch/arm64/boot/dts/nvidia/Makefile +1 -0
index 9296d12d11e9..e13fb1070472 100644
@@ -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
arch/arm64/boot/dts/nvidia/tegra194-p3509-0000+p3668-0000.dts +2 -349

359 lines not on this page · raw message

arch/arm64/boot/dts/nvidia/tegra194-p3509-0000+p3668-0001.dts new file +10 -0
new file mode 100644
index 000000000000..238fd98e8e45
@@ -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";
+};
arch/arm64/boot/dts/nvidia/tegra194-p3509-0000.dtsi new file +351 -0

351 lines not on this page · raw message

arch/arm64/boot/dts/nvidia/tegra194-p3668-0000.dtsi +2 -280

297 lines not on this page · raw message

arch/arm64/boot/dts/nvidia/tegra194-p3668-0001.dtsi new file +19 -0
new file mode 100644
index 000000000000..b7808648cfe4
@@ -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>;
+		};
+	};
+};
arch/arm64/boot/dts/nvidia/tegra194-p3668.dtsi new file +284 -0

284 lines not on this page · raw message

Signature · 1 line
2.25.1
#1 lore raw
Quoted 6 lines · Jon Hunter

There are two versions of the Jetson Xavier NX system-on-module; one with a micro SD-card slot and one with an eMMC. Currently, only the system-on-module with the micro SD-card slot is supported and so add necessary device-tree changes to add support for the eMMC version.

Signed-off-by Jon Hunter <[email protected]>
Quoted 13 lines
---
 arch/arm64/boot/dts/nvidia/Makefile           |   1 +
 .../nvidia/tegra194-p3509-0000+p3668-0000.dts | 351 +-----------------
 .../nvidia/tegra194-p3509-0000+p3668-0001.dts |  10 +
 .../boot/dts/nvidia/tegra194-p3509-0000.dtsi  | 351 ++++++++++++++++++
 .../boot/dts/nvidia/tegra194-p3668-0000.dtsi  | 282 +-------------
 .../boot/dts/nvidia/tegra194-p3668-0001.dtsi  |  19 +
 .../arm64/boot/dts/nvidia/tegra194-p3668.dtsi | 284 ++++++++++++++
 7 files changed, 669 insertions(+), 629 deletions(-)
 create mode 100644 arch/arm64/boot/dts/nvidia/tegra194-p3509-0000+p3668-0001.dts
 create mode 100644 arch/arm64/boot/dts/nvidia/tegra194-p3509-0000.dtsi
 create mode 100644 arch/arm64/boot/dts/nvidia/tegra194-p3668-0001.dtsi
 create mode 100644 arch/arm64/boot/dts/nvidia/tegra194-p3668.dtsi

This looks good, although I must say this is difficult to review. Maybe it would help if this was split into two patches where first the files are split for tegra194-p3509-0000+p3668-0000 and the second patch adds only the files for the new SKU.

Thierry

author maintainer
#2 lore raw
Quoted 21 lines · Thierry Reding
Quoted 6 lines · Jon Hunter

There are two versions of the Jetson Xavier NX system-on-module; one with a micro SD-card slot and one with an eMMC. Currently, only the system-on-module with the micro SD-card slot is supported and so add necessary device-tree changes to add support for the eMMC version.

Signed-off-by Jon Hunter <[email protected]>
Quoted 13 lines
---
 arch/arm64/boot/dts/nvidia/Makefile           |   1 +
 .../nvidia/tegra194-p3509-0000+p3668-0000.dts | 351 +-----------------
 .../nvidia/tegra194-p3509-0000+p3668-0001.dts |  10 +
 .../boot/dts/nvidia/tegra194-p3509-0000.dtsi  | 351 ++++++++++++++++++
 .../boot/dts/nvidia/tegra194-p3668-0000.dtsi  | 282 +-------------
 .../boot/dts/nvidia/tegra194-p3668-0001.dtsi  |  19 +
 .../arm64/boot/dts/nvidia/tegra194-p3668.dtsi | 284 ++++++++++++++
 7 files changed, 669 insertions(+), 629 deletions(-)
 create mode 100644 arch/arm64/boot/dts/nvidia/tegra194-p3509-0000+p3668-0001.dts
 create mode 100644 arch/arm64/boot/dts/nvidia/tegra194-p3509-0000.dtsi
 create mode 100644 arch/arm64/boot/dts/nvidia/tegra194-p3668-0001.dtsi
 create mode 100644 arch/arm64/boot/dts/nvidia/tegra194-p3668.dtsi
Quoted 4 lines

This looks good, although I must say this is difficult to review. Maybe it would help if this was split into two patches where first the files are split for tegra194-p3509-0000+p3668-0000 and the second patch adds only the files for the new SKU.

Yes, OK I will do that. I must admit the diff is not very clear.

Jon

Signature · 1 line
nvpublic