arm64: tegra: Move AGX Orin nodes to correct location

Some of the nodes inside the AGX Orin module file are in the
wrong location. In particular, the SD card interface and
two of the PCIe regulators in the module file should instead
reside in the board file. These components are not part of the
module. They are part of the carrier board. Move these
nodes to the correct location.

Fixes: cd42b26a527f ("arm64: tegra: Add regulators required for PCIe")
Fixes: d71b893a119d ("arm64: tegra: Add Tegra234 SDMMC1 device tree node")
Signed-off-by: Dara Stotland <dstotland@nvidia.com>
Reviewed-by: Brad Griffis <bgriffis@nvidia.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>

diff --git a/arch/arm64/boot/dts/nvidia/tegra234-p3701-0000.dtsi b/arch/arm64/boot/dts/nvidia/tegra234-p3701-0000.dtsi
index ea846b879a2137f30e60253df882ace5eedcd107..2830eab1b2eb933a15f7e11c46936fcceb88a428 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra234-p3701-0000.dtsi
+++ b/arch/arm64/boot/dts/nvidia/tegra234-p3701-0000.dtsi
@@ -7,12 +7,6 @@
        compatible = "nvidia,p3701-0000", "nvidia,tegra234";
 
        bus@0 {
-               mmc@3400000 {
-                       status = "okay";
-                       bus-width = <4>;
-                       cd-gpios = <&gpio TEGRA234_MAIN_GPIO(G, 7) GPIO_ACTIVE_LOW>;
-                       disable-wp;
-               };
 
                padctl@3520000 {
                        vclamp-usb-supply = <&vdd_1v8_ao>;
@@ -39,25 +33,6 @@
 
        };
 
-       vdd_3v3_pcie: regulator-vdd-3v3-pcie {
-               compatible = "regulator-fixed";
-               regulator-name = "VDD_3V3_PCIE";
-               regulator-min-microvolt = <3300000>;
-               regulator-max-microvolt = <3300000>;
-               gpio = <&gpio TEGRA234_MAIN_GPIO(H, 4) GPIO_ACTIVE_HIGH>;
-               regulator-boot-on;
-               enable-active-high;
-       };
-
-       vdd_12v_pcie: regulator-vdd-12v-pcie {
-               compatible = "regulator-fixed";
-               regulator-name = "VDD_12V_PCIE";
-               regulator-min-microvolt = <12000000>;
-               regulator-max-microvolt = <12000000>;
-               gpio = <&gpio TEGRA234_MAIN_GPIO(A, 1) GPIO_ACTIVE_LOW>;
-               regulator-boot-on;
-       };
-
        thermal-zones {
                tj-thermal {
                        polling-delay = <1000>;

diff --git a/arch/arm64/boot/dts/nvidia/tegra234-p3737-0000+p3701-0000.dts b/arch/arm64/boot/dts/nvidia/tegra234-p3737-0000+p3701-0000.dts
index 21feaf4344398ac4e65ff333784533a526e8c293..90f12277aede8bb5a73f22a967897b5fa9810449 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra234-p3737-0000+p3701-0000.dts
+++ b/arch/arm64/boot/dts/nvidia/tegra234-p3737-0000+p3701-0000.dts
@@ -106,6 +106,13 @@
                        status = "okay";
                };
 
+               mmc@3400000 {
+                       status = "okay";
+                       bus-width = <4>;
+                       cd-gpios = <&gpio TEGRA234_MAIN_GPIO(G, 7) GPIO_ACTIVE_LOW>;
+                       disable-wp;
+               };
+
                hda@3510000 {
                        nvidia,model = "NVIDIA Jetson AGX Orin HDA";
                        status = "okay";
@@ -522,4 +529,23 @@
                regulator-max-microvolt = <1800000>;
                regulator-always-on;
        };
+
+       vdd_3v3_pcie: regulator-vdd-3v3-pcie {
+               compatible = "regulator-fixed";
+               regulator-name = "VDD_3V3_PCIE";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               gpio = <&gpio TEGRA234_MAIN_GPIO(H, 4) GPIO_ACTIVE_HIGH>;
+               regulator-boot-on;
+               enable-active-high;
+       };
+
+       vdd_12v_pcie: regulator-vdd-12v-pcie {
+               compatible = "regulator-fixed";
+               regulator-name = "VDD_12V_PCIE";
+               regulator-min-microvolt = <12000000>;
+               regulator-max-microvolt = <12000000>;
+               gpio = <&gpio TEGRA234_MAIN_GPIO(A, 1) GPIO_ACTIVE_LOW>;
+               regulator-boot-on;
+       };
 };