arm64: tegra: Combine IGX Orin board files

Current IGX Orin structure has both a top-level module+board
file as well as a board file. Most of the data in the board-file
is closely related to the module itself. The benefit of this
extra file is outweighed by the additional complexity. Merge
the board file into the module+board file for simplicity.

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-p3740-0002+p3701-0008.dts b/arch/arm64/boot/dts/nvidia/tegra234-p3740-0002+p3701-0008.dts
index bac611d735c58957d9be57b4c7b116ee72e75a36..9581b31b459f248ef5b51c285b424504d794f25d 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra234-p3740-0002+p3701-0008.dts
+++ b/arch/arm64/boot/dts/nvidia/tegra234-p3740-0002+p3701-0008.dts
@@ -3,8 +3,8 @@
 
 #include <dt-bindings/input/linux-event-codes.h>
 #include <dt-bindings/input/gpio-keys.h>
+#include <dt-bindings/sound/rt5640.h>
 #include "tegra234-p3701-0008.dtsi"
-#include "tegra234-p3740-0002.dtsi"
 
 / {
        model = "NVIDIA IGX Orin Development Kit";
@@ -20,6 +20,32 @@
        };
 
        bus@0 {
+               aconnect@2900000 {
+                       ahub@2900800 {
+                               i2s@2901300 {
+                                       ports {
+                                               port@1 {
+                                                       endpoint {
+                                                               dai-format = "i2s";
+                                                               remote-endpoint = <&rt5640_ep>;
+                                                       };
+                                               };
+                                       };
+                               };
+
+                               i2s@2901500 {
+                                       ports {
+                                               port@1 {
+                                                       endpoint {
+                                                               bitclock-master;
+                                                               frame-master;
+                                                       };
+                                               };
+                                       };
+                               };
+                       };
+               };
+
                serial@3100000 {
                        compatible = "nvidia,tegra194-hsuart";
                        reset-names = "serial";
@@ -45,6 +71,40 @@
                i2c@31c0000 {
                        status = "okay";
 
+                       rt5640: audio-codec@1c {
+                               compatible = "realtek,rt5640";
+                               reg = <0x1c>;
+                               interrupt-parent = <&gpio>;
+                               interrupts = <TEGRA234_MAIN_GPIO(F, 3) GPIO_ACTIVE_HIGH>;
+                               clocks = <&bpmp TEGRA234_CLK_AUD_MCLK>;
+                               clock-names = "mclk";
+
+                               realtek,dmic1-data-pin = <RT5640_DMIC1_DATA_PIN_NONE>;
+                               realtek,dmic2-data-pin = <RT5640_DMIC2_DATA_PIN_NONE>;
+                               realtek,jack-detect-source = <RT5640_JD_SRC_HDA_HEADER>;
+
+                               sound-name-prefix = "CVB-RT";
+
+                               port {
+                                       rt5640_ep: endpoint {
+                                               remote-endpoint = <&i2s4_dap>;
+                                               mclk-fs = <256>;
+                                       };
+                               };
+                       };
+
+                       /* carrier board ID EEPROM */
+                       eeprom@55 {
+                               compatible = "atmel,24c02";
+                               reg = <0x55>;
+
+                               label = "system";
+                               vcc-supply = <&vdd_1v8_ls>;
+                               address-width = <8>;
+                               pagesize = <8>;
+                               size = <256>;
+                               read-only;
+                       };
                };
 
                i2c@31e0000 {
@@ -60,6 +120,121 @@
                        status = "okay";
                };
 
+               padctl@3520000 {
+                       vclamp-usb-supply = <&vdd_1v8_ao>;
+                       avdd-usb-supply = <&vdd_3v3_ao>;
+                       status = "okay";
+
+                       pads {
+                               usb2 {
+                                       lanes {
+                                               usb2-0 {
+                                                       nvidia,function = "xusb";
+                                                       status = "okay";
+                                               };
+
+                                               usb2-1 {
+                                                       nvidia,function = "xusb";
+                                                       status = "okay";
+                                               };
+
+                                               usb2-2 {
+                                                       nvidia,function = "xusb";
+                                                       status = "okay";
+                                               };
+
+                                               usb2-3 {
+                                                       nvidia,function = "xusb";
+                                                       status = "okay";
+                                               };
+                                       };
+                               };
+
+                               usb3 {
+                                       lanes {
+                                               usb3-0 {
+                                                       nvidia,function = "xusb";
+                                                       status = "okay";
+                                               };
+
+                                               usb3-1 {
+                                                       nvidia,function = "xusb";
+                                                       status = "okay";
+                                               };
+
+                                               usb3-2 {
+                                                       nvidia,function = "xusb";
+                                                       status = "okay";
+                                               };
+                                       };
+                               };
+                       };
+
+                       ports {
+                               usb2-0 {
+                                       mode = "otg";
+                                       usb-role-switch;
+                                       status = "okay";
+                                       vbus-supply = <&vdd_5v0_sys>;
+                               };
+
+                               usb2-1 {
+                                       mode = "host";
+                                       status = "okay";
+                                       vbus-supply = <&vdd_5v0_sys>;
+                               };
+
+                               usb2-2 {
+                                       mode = "host";
+                                       status = "okay";
+                                       vbus-supply = <&vdd_5v0_sys>;
+                               };
+
+                               usb2-3 {
+                                       mode = "host";
+                                       status = "okay";
+                                       vbus-supply = <&vdd_5v0_sys>;
+                               };
+
+                               usb3-0 {
+                                       nvidia,usb2-companion = <2>;
+                                       status = "okay";
+                               };
+
+                               usb3-1 {
+                                       nvidia,usb2-companion = <0>;
+                                       status = "okay";
+                               };
+
+                               usb3-2 {
+                                       nvidia,usb2-companion = <1>;
+                                       status = "okay";
+                               };
+                       };
+               };
+
+               usb@3550000 {
+                       status = "okay";
+
+                       phys = <&{/bus@0/padctl@3520000/pads/usb2/lanes/usb2-0}>,
+                               <&{/bus@0/padctl@3520000/pads/usb3/lanes/usb3-1}>;
+                       phy-names = "usb2-0", "usb3-0";
+               };
+
+               usb@3610000 {
+                       status = "okay";
+
+                       phys =  <&{/bus@0/padctl@3520000/pads/usb2/lanes/usb2-0}>,
+                               <&{/bus@0/padctl@3520000/pads/usb2/lanes/usb2-1}>,
+                               <&{/bus@0/padctl@3520000/pads/usb2/lanes/usb2-2}>,
+                               <&{/bus@0/padctl@3520000/pads/usb2/lanes/usb2-3}>,
+                               <&{/bus@0/padctl@3520000/pads/usb3/lanes/usb3-0}>,
+                               <&{/bus@0/padctl@3520000/pads/usb3/lanes/usb3-1}>,
+                               <&{/bus@0/padctl@3520000/pads/usb3/lanes/usb3-2}>;
+                       phy-names = "usb2-0", "usb2-1", "usb2-2", "usb2-3",
+                               "usb3-0", "usb3-1", "usb3-2";
+               };
+
                fuse@3810000 {
                        status = "okay";
                };
@@ -70,6 +245,37 @@
 
                i2c@c250000 {
                        status = "okay";
+
+                       power-sensor@41 {
+                               compatible = "ti,ina3221";
+                               reg = <0x41>;
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               input@0 {
+                                       reg = <0x0>;
+                                       label = "CVB_ATX_12V";
+                                       shunt-resistor-micro-ohms = <2000>;
+                               };
+
+                               input@1 {
+                                       reg = <0x1>;
+                                       label = "CVB_ATX_3V3";
+                                       shunt-resistor-micro-ohms = <2000>;
+                               };
+
+                               input@2 {
+                                       reg = <0x2>;
+                                       label = "CVB_ATX_5V";
+                                       shunt-resistor-micro-ohms = <2000>;
+                               };
+                       };
+
+                       power-sensor@44 {
+                               compatible = "ti,ina219";
+                               reg = <0x44>;
+                               shunt-resistor = <2000>;
+                       };
                };
 
                host1x@13e00000 {
@@ -235,4 +441,32 @@
                          "CVB-RT DMIC1",               "CVB-RT MIC",
                          "CVB-RT DMIC2",               "CVB-RT MIC";
        };
+
+       vdd_3v3_dp: regulator-vdd-3v3-dp {
+               compatible = "regulator-fixed";
+               regulator-name = "VDD_3V3_DP";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               vin-supply = <&vdd_3v3_sys>;
+               gpio = <&gpio TEGRA234_MAIN_GPIO(H, 6) 0>;
+               enable-active-high;
+               regulator-always-on;
+       };
+
+       vdd_3v3_sys: regulator-vdd-3v3-sys {
+               compatible = "regulator-fixed";
+               regulator-name = "VDD_3V3_SYS";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+       };
+
+       vdd_3v3_wifi: regulator-vdd-3v3-wifi {
+               compatible = "regulator-fixed";
+               regulator-name = "VDD_3V3_WIFI";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               gpio = <&gpio TEGRA234_MAIN_GPIO(G, 3) GPIO_ACTIVE_HIGH>;
+               regulator-boot-on;
+               enable-active-high;
+       };
 };

diff --git a/arch/arm64/boot/dts/nvidia/tegra234-p3740-0002.dtsi b/arch/arm64/boot/dts/nvidia/tegra234-p3740-0002.dtsi
deleted file mode 100644 (file)
index 377f518..0000000
--- a/arch/arm64/boot/dts/nvidia/tegra234-p3740-0002.dtsi
+++ /dev/null
@@ -1,248 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-
-#include <dt-bindings/sound/rt5640.h>
-
-/ {
-       compatible = "nvidia,p3740-0002";
-
-       bus@0 {
-               aconnect@2900000 {
-                       ahub@2900800 {
-                               i2s@2901300 {
-                                       ports {
-                                               port@1 {
-                                                       endpoint {
-                                                               dai-format = "i2s";
-                                                               remote-endpoint = <&rt5640_ep>;
-                                                       };
-                                               };
-                                       };
-                               };
-
-                               i2s@2901500 {
-                                       ports {
-                                               port@1 {
-                                                       endpoint {
-                                                               bitclock-master;
-                                                               frame-master;
-                                                       };
-                                               };
-                                       };
-                               };
-                       };
-               };
-
-               i2c@31c0000 {
-                       rt5640: audio-codec@1c {
-                               compatible = "realtek,rt5640";
-                               reg = <0x1c>;
-                               interrupt-parent = <&gpio>;
-                               interrupts = <TEGRA234_MAIN_GPIO(F, 3) GPIO_ACTIVE_HIGH>;
-                               clocks = <&bpmp TEGRA234_CLK_AUD_MCLK>;
-                               clock-names = "mclk";
-
-                               realtek,dmic1-data-pin = <RT5640_DMIC1_DATA_PIN_NONE>;
-                               realtek,dmic2-data-pin = <RT5640_DMIC2_DATA_PIN_NONE>;
-                               realtek,jack-detect-source = <RT5640_JD_SRC_HDA_HEADER>;
-
-                               sound-name-prefix = "CVB-RT";
-
-                               port {
-                                       rt5640_ep: endpoint {
-                                               remote-endpoint = <&i2s4_dap>;
-                                               mclk-fs = <256>;
-                                       };
-                               };
-                       };
-
-                       /* carrier board ID EEPROM */
-                       eeprom@55 {
-                               compatible = "atmel,24c02";
-                               reg = <0x55>;
-
-                               label = "system";
-                               vcc-supply = <&vdd_1v8_ls>;
-                               address-width = <8>;
-                               pagesize = <8>;
-                               size = <256>;
-                               read-only;
-                       };
-               };
-
-               padctl@3520000 {
-                       vclamp-usb-supply = <&vdd_1v8_ao>;
-                       avdd-usb-supply = <&vdd_3v3_ao>;
-                       status = "okay";
-
-                       pads {
-                               usb2 {
-                                       lanes {
-                                               usb2-0 {
-                                                       nvidia,function = "xusb";
-                                                       status = "okay";
-                                               };
-
-                                               usb2-1 {
-                                                       nvidia,function = "xusb";
-                                                       status = "okay";
-                                               };
-
-                                               usb2-2 {
-                                                       nvidia,function = "xusb";
-                                                       status = "okay";
-                                               };
-
-                                               usb2-3 {
-                                                       nvidia,function = "xusb";
-                                                       status = "okay";
-                                               };
-                                       };
-                               };
-
-                               usb3 {
-                                       lanes {
-                                               usb3-0 {
-                                                       nvidia,function = "xusb";
-                                                       status = "okay";
-                                               };
-
-                                               usb3-1 {
-                                                       nvidia,function = "xusb";
-                                                       status = "okay";
-                                               };
-
-                                               usb3-2 {
-                                                       nvidia,function = "xusb";
-                                                       status = "okay";
-                                               };
-                                       };
-                               };
-                       };
-
-                       ports {
-                               usb2-0 {
-                                       mode = "otg";
-                                       usb-role-switch;
-                                       status = "okay";
-                                       vbus-supply = <&vdd_5v0_sys>;
-                               };
-
-                               usb2-1 {
-                                       mode = "host";
-                                       status = "okay";
-                                       vbus-supply = <&vdd_5v0_sys>;
-                               };
-
-                               usb2-2 {
-                                       mode = "host";
-                                       status = "okay";
-                                       vbus-supply = <&vdd_5v0_sys>;
-                               };
-
-                               usb2-3 {
-                                       mode = "host";
-                                       status = "okay";
-                                       vbus-supply = <&vdd_5v0_sys>;
-                               };
-
-                               usb3-0 {
-                                       nvidia,usb2-companion = <2>;
-                                       status = "okay";
-                               };
-
-                               usb3-1 {
-                                       nvidia,usb2-companion = <0>;
-                                       status = "okay";
-                               };
-
-                               usb3-2 {
-                                       nvidia,usb2-companion = <1>;
-                                       status = "okay";
-                               };
-                       };
-               };
-
-               usb@3550000 {
-                       status = "okay";
-
-                       phys = <&{/bus@0/padctl@3520000/pads/usb2/lanes/usb2-0}>,
-                               <&{/bus@0/padctl@3520000/pads/usb3/lanes/usb3-1}>;
-                       phy-names = "usb2-0", "usb3-0";
-               };
-
-               usb@3610000 {
-                       status = "okay";
-
-                       phys =  <&{/bus@0/padctl@3520000/pads/usb2/lanes/usb2-0}>,
-                               <&{/bus@0/padctl@3520000/pads/usb2/lanes/usb2-1}>,
-                               <&{/bus@0/padctl@3520000/pads/usb2/lanes/usb2-2}>,
-                               <&{/bus@0/padctl@3520000/pads/usb2/lanes/usb2-3}>,
-                               <&{/bus@0/padctl@3520000/pads/usb3/lanes/usb3-0}>,
-                               <&{/bus@0/padctl@3520000/pads/usb3/lanes/usb3-1}>,
-                               <&{/bus@0/padctl@3520000/pads/usb3/lanes/usb3-2}>;
-                       phy-names = "usb2-0", "usb2-1", "usb2-2", "usb2-3",
-                               "usb3-0", "usb3-1", "usb3-2";
-               };
-
-               i2c@c250000 {
-                       power-sensor@41 {
-                               compatible = "ti,ina3221";
-                               reg = <0x41>;
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-
-                               input@0 {
-                                       reg = <0x0>;
-                                       label = "CVB_ATX_12V";
-                                       shunt-resistor-micro-ohms = <2000>;
-                               };
-
-                               input@1 {
-                                       reg = <0x1>;
-                                       label = "CVB_ATX_3V3";
-                                       shunt-resistor-micro-ohms = <2000>;
-                               };
-
-                               input@2 {
-                                       reg = <0x2>;
-                                       label = "CVB_ATX_5V";
-                                       shunt-resistor-micro-ohms = <2000>;
-                               };
-                       };
-
-                       power-sensor@44 {
-                               compatible = "ti,ina219";
-                               reg = <0x44>;
-                               shunt-resistor = <2000>;
-                       };
-               };
-       };
-
-       vdd_3v3_dp: regulator-vdd-3v3-dp {
-                               compatible = "regulator-fixed";
-                               regulator-name = "VDD_3V3_DP";
-                               regulator-min-microvolt = <3300000>;
-                               regulator-max-microvolt = <3300000>;
-                               vin-supply = <&vdd_3v3_sys>;
-                               gpio = <&gpio TEGRA234_MAIN_GPIO(H, 6) 0>;
-                               enable-active-high;
-                               regulator-always-on;
-       };
-
-       vdd_3v3_sys: regulator-vdd-3v3-sys {
-                               compatible = "regulator-fixed";
-                               regulator-name = "VDD_3V3_SYS";
-                               regulator-min-microvolt = <3300000>;
-                               regulator-max-microvolt = <3300000>;
-       };
-
-       vdd_3v3_wifi: regulator-vdd-3v3-wifi {
-                               compatible = "regulator-fixed";
-                               regulator-name = "VDD_3V3_WIFI";
-                               regulator-min-microvolt = <3300000>;
-                               regulator-max-microvolt = <3300000>;
-                               gpio = <&gpio TEGRA234_MAIN_GPIO(G, 3) GPIO_ACTIVE_HIGH>;
-                               regulator-boot-on;
-                               enable-active-high;
-       };
-};