arm64: tegra: Add common nodes to AGX Orin module

The AGX Orin module boards contain common nodes that can
be moved to the included module dtsi. This eliminates
redundancy within the files and reduces lines of code.
Data from tegra234-p3701-0000 and tegra234-p3701-0008 that
is common is now in tegra234-p3701.dtsi.

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 cb792041fc621db2722ca0cee30d23f46df75244..ea846b879a2137f30e60253df882ace5eedcd107 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra234-p3701-0000.dtsi
+++ b/arch/arm64/boot/dts/nvidia/tegra234-p3701-0000.dtsi
@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0
 
-#include "tegra234.dtsi"
 #include "tegra234-p3701.dtsi"
 
 / {
@@ -8,34 +7,6 @@
        compatible = "nvidia,p3701-0000", "nvidia,tegra234";
 
        bus@0 {
-               i2c@3160000 {
-                       status = "okay";
-
-                       eeprom@50 {
-                               compatible = "atmel,24c02";
-                               reg = <0x50>;
-
-                               label = "module";
-                               vcc-supply = <&vdd_1v8_hs>;
-                               address-width = <8>;
-                               pagesize = <8>;
-                               size = <256>;
-                               read-only;
-                       };
-               };
-
-               spi@3270000 {
-                       status = "okay";
-
-                       flash@0 {
-                               compatible = "jedec,spi-nor";
-                               reg = <0>;
-                               spi-max-frequency = <102000000>;
-                               spi-tx-bus-width = <4>;
-                               spi-rx-bus-width = <4>;
-                       };
-               };
-
                mmc@3400000 {
                        status = "okay";
                        bus-width = <4>;
@@ -43,12 +14,6 @@
                        disable-wp;
                };
 
-               mmc@3460000 {
-                       status = "okay";
-                       bus-width = <8>;
-                       non-removable;
-               };
-
                padctl@3520000 {
                        vclamp-usb-supply = <&vdd_1v8_ao>;
                        avdd-usb-supply = <&vdd_3v3_ao>;
@@ -72,54 +37,6 @@
                        };
                };
 
-               rtc@c2a0000 {
-                       status = "okay";
-               };
-
-               pmc@c360000 {
-                       nvidia,invert-interrupt;
-               };
-       };
-
-       vdd_5v0_sys: regulator-vdd-5v0-sys {
-               compatible = "regulator-fixed";
-               regulator-name = "VIN_SYS_5V0";
-               regulator-min-microvolt = <5000000>;
-               regulator-max-microvolt = <5000000>;
-               regulator-always-on;
-               regulator-boot-on;
-       };
-
-       vdd_1v8_ls: regulator-vdd-1v8-ls {
-               compatible = "regulator-fixed";
-               regulator-name = "VDD_1V8_LS";
-               regulator-min-microvolt = <1800000>;
-               regulator-max-microvolt = <1800000>;
-               regulator-always-on;
-       };
-
-       vdd_1v8_hs: regulator-vdd-1v8-hs {
-               compatible = "regulator-fixed";
-               regulator-name = "VDD_1V8_HS";
-               regulator-min-microvolt = <1800000>;
-               regulator-max-microvolt = <1800000>;
-               regulator-always-on;
-       };
-
-       vdd_1v8_ao: regulator-vdd-1v8-ao {
-               compatible = "regulator-fixed";
-               regulator-name = "VDD_1V8_AO";
-               regulator-min-microvolt = <1800000>;
-               regulator-max-microvolt = <1800000>;
-               regulator-always-on;
-       };
-
-       vdd_3v3_ao: regulator-vdd-3v3-ao {
-               compatible = "regulator-fixed";
-               regulator-name = "VDD_3V3_AO";
-               regulator-min-microvolt = <3300000>;
-               regulator-max-microvolt = <3300000>;
-               regulator-always-on;
        };
 
        vdd_3v3_pcie: regulator-vdd-3v3-pcie {

diff --git a/arch/arm64/boot/dts/nvidia/tegra234-p3701-0008.dtsi b/arch/arm64/boot/dts/nvidia/tegra234-p3701-0008.dtsi
index 62c4fdad0b600bd6e71ecbf2e42bf8c1a510b25c..9218ea8d43e6a5add0429f3de0ed9ebff5fa58f8 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra234-p3701-0008.dtsi
+++ b/arch/arm64/boot/dts/nvidia/tegra234-p3701-0008.dtsi
@@ -1,58 +1,10 @@
 // SPDX-License-Identifier: GPL-2.0
 
-#include "tegra234.dtsi"
 #include "tegra234-p3701.dtsi"
 
 / {
        compatible = "nvidia,p3701-0008", "nvidia,tegra234";
 
-       bus@0 {
-               i2c@3160000 {
-                       status = "okay";
-
-                       eeprom@50 {
-                               compatible = "atmel,24c02";
-                               reg = <0x50>;
-                               label = "module";
-                               vcc-supply = <&vdd_1v8_hs>;
-                               address-width = <8>;
-                               pagesize = <8>;
-                               size = <256>;
-                               read-only;
-                       };
-               };
-
-               spi@3270000 {
-                       status = "okay";
-
-                       flash@0 {
-                               compatible = "jedec,spi-nor";
-                               reg = <0>;
-                               spi-max-frequency = <102000000>;
-                               spi-tx-bus-width = <4>;
-                               spi-rx-bus-width = <4>;
-                       };
-               };
-
-               mmc@3460000 {
-                       status = "okay";
-                       bus-width = <8>;
-                       non-removable;
-               };
-
-               i2c@c240000 {
-                       status = "okay";
-               };
-
-               rtc@c2a0000 {
-                       status = "okay";
-               };
-
-               pmc@c360000 {
-                       nvidia,invert-interrupt;
-               };
-       };
-
        bpmp {
                i2c {
                        status = "okay";
@@ -68,45 +20,4 @@
                        status = "okay";
                };
        };
-
-       vdd_1v8_ao: regulator-vdd-1v8-ao {
-               compatible = "regulator-fixed";
-               regulator-name = "VDD_1V8_AO";
-               regulator-min-microvolt = <1800000>;
-               regulator-max-microvolt = <1800000>;
-               regulator-always-on;
-       };
-
-       vdd_1v8_hs: regulator-vdd-1v8-hs {
-               compatible = "regulator-fixed";
-               regulator-name = "VDD_1V8_HS";
-               regulator-min-microvolt = <1800000>;
-               regulator-max-microvolt = <1800000>;
-               regulator-always-on;
-       };
-
-       vdd_1v8_ls: regulator-vdd-1v8-ls {
-               compatible = "regulator-fixed";
-               regulator-name = "VDD_1V8_LS";
-               regulator-min-microvolt = <1800000>;
-               regulator-max-microvolt = <1800000>;
-               regulator-always-on;
-       };
-
-       vdd_3v3_ao: regulator-vdd-3v3-ao {
-               compatible = "regulator-fixed";
-               regulator-name = "vdd-AO-3v3";
-               regulator-min-microvolt = <3300000>;
-               regulator-max-microvolt = <3300000>;
-               regulator-always-on;
-       };
-
-       vdd_5v0_sys: regulator-vdd-5v0-sys {
-               compatible = "regulator-fixed";
-               regulator-name = "VIN_SYS_5V0";
-               regulator-min-microvolt = <5000000>;
-               regulator-max-microvolt = <5000000>;
-               regulator-always-on;
-               regulator-boot-on;
-       };
 };

diff --git a/arch/arm64/boot/dts/nvidia/tegra234-p3701.dtsi b/arch/arm64/boot/dts/nvidia/tegra234-p3701.dtsi
index 320c8e9b06b46d743ca958fd0f2cc663021042e8..18bd4ccb6b77cbcca00375575e6dc162b203ddc9 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra234-p3701.dtsi
+++ b/arch/arm64/boot/dts/nvidia/tegra234-p3701.dtsi
@@ -1,5 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0
 
+#include "tegra234.dtsi"
+
 / {
        compatible = "nvidia,p3701", "nvidia,tegra234";
 
@@ -45,6 +47,40 @@
                        };
                };
 
+               i2c@3160000 {
+                       status = "okay";
+
+                       eeprom@50 {
+                               compatible = "atmel,24c02";
+                               reg = <0x50>;
+
+                               label = "module";
+                               vcc-supply = <&vdd_1v8_hs>;
+                               address-width = <8>;
+                               pagesize = <8>;
+                               size = <256>;
+                               read-only;
+                       };
+               };
+
+               spi@3270000 {
+                       status = "okay";
+
+                       flash@0 {
+                               compatible = "jedec,spi-nor";
+                               reg = <0>;
+                               spi-max-frequency = <102000000>;
+                               spi-tx-bus-width = <4>;
+                               spi-rx-bus-width = <4>;
+                       };
+               };
+
+               mmc@3460000 {
+                       status = "okay";
+                       bus-width = <8>;
+                       non-removable;
+               };
+
                i2c@c240000 {
                        status = "okay";
 
@@ -97,5 +133,54 @@
                                };
                        };
                };
+
+               rtc@c2a0000 {
+                       status = "okay";
+               };
+
+               pmc@c360000 {
+                       nvidia,invert-interrupt;
+               };
+       };
+
+       vdd_1v8_ao: regulator-vdd-1v8-ao {
+               compatible = "regulator-fixed";
+               regulator-name = "VDD_1V8_AO";
+               regulator-min-microvolt = <1800000>;
+               regulator-max-microvolt = <1800000>;
+               regulator-always-on;
+       };
+
+       vdd_1v8_hs: regulator-vdd-1v8-hs {
+               compatible = "regulator-fixed";
+               regulator-name = "VDD_1V8_HS";
+               regulator-min-microvolt = <1800000>;
+               regulator-max-microvolt = <1800000>;
+               regulator-always-on;
+       };
+
+       vdd_1v8_ls: regulator-vdd-1v8-ls {
+               compatible = "regulator-fixed";
+               regulator-name = "VDD_1V8_LS";
+               regulator-min-microvolt = <1800000>;
+               regulator-max-microvolt = <1800000>;
+               regulator-always-on;
+       };
+
+       vdd_3v3_ao: regulator-vdd-3v3-ao {
+               compatible = "regulator-fixed";
+               regulator-name = "VDD_3V3_AO";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               regulator-always-on;
+       };
+
+       vdd_5v0_sys: regulator-vdd-5v0-sys {
+               compatible = "regulator-fixed";
+               regulator-name = "VIN_SYS_5V0";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               regulator-always-on;
+               regulator-boot-on;
        };
 };