From 1312a1cc0c43c90ef0d6ae31b22b45d02dffec9e Mon Sep 17 00:00:00 2001 From: Laxman Dewangan Date: Fri, 7 Apr 2023 10:44:43 +0000 Subject: [PATCH] concord: p3701: Sync with mainline V6.3-rc5 Pull the nodes from overlay to base based on V6.3-rc5 p3701 files. Bug 4057304 Change-Id: I703c45f40f0eb6a00cf6855f9b3c2ce86d319ba7 Signed-off-by: Laxman Dewangan Reviewed-on: https://git-master.nvidia.com/r/c/device/hardware/nvidia/platform/t23x/concord-generic-dts/+/2884404 Reviewed-by: svcacv GVS: Gerrit_Virtual_Submit --- overlay/tegra234-p3701-0000.dtsi | 52 +---------- overlay/tegra234-status-overlay.dtsi | 12 --- tegra234-p3701-0000.dtsi | 131 ++++++++++++++++++++------- 3 files changed, 99 insertions(+), 96 deletions(-) diff --git a/overlay/tegra234-p3701-0000.dtsi b/overlay/tegra234-p3701-0000.dtsi index ef32b56..3574afd 100644 --- a/overlay/tegra234-p3701-0000.dtsi +++ b/overlay/tegra234-p3701-0000.dtsi @@ -53,33 +53,8 @@ }; }; - padctl@3520000 { - vclamp-usb-supply = <&vdd_ao_1v8>; - avdd-usb-supply = <&vdd_ao_3v3>; - - ports { - usb2-0 { - vbus-supply = <&vdd_5v0_sys>; - }; - - usb2-1 { - vbus-supply = <&vdd_5v0_sys>; - }; - - usb2-2 { - vbus-supply = <&vdd_5v0_sys>; - }; - - usb2-3 { - vbus-supply = <&vdd_5v0_sys>; - }; - }; - }; - spi@3270000 { flash@0 { - compatible = "jedec,spi-nor"; - reg = <0>; spi-max-frequency = <51000000>; spi-tx-bus-width = <1>; spi-rx-bus-width = <1>; @@ -87,31 +62,6 @@ }; }; - vdd_5v0_sys: regulator@0 { - compatible = "regulator-fixed"; - regulator-name = "VIN_SYS_5V0"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - regulator-always-on; - regulator-boot-on; - }; - - vdd_ao_1v8: regulator@1 { - compatible = "regulator-fixed"; - regulator-name = "vdd-AO-1v8"; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - regulator-always-on; - }; - - vdd_ao_3v3: regulator@2 { - compatible = "regulator-fixed"; - regulator-name = "vdd-AO-3v3"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - regulator-always-on; - }; - hdr40_vdd_3v3: regulator@3 { compatible = "regulator-fixed"; reg = <3>; @@ -137,7 +87,7 @@ tegra_tmp451: thermal-sensor@4c { compatible = "ti,tmp451"; reg = <0x4c>; - vcc-supply = <&vdd_ao_1v8>; + vcc-supply = <&vdd_1v8_ao>; #thermal-sensor-cells = <1>; status = "okay"; }; diff --git a/overlay/tegra234-status-overlay.dtsi b/overlay/tegra234-status-overlay.dtsi index 438a1cb..8f6e5f8 100644 --- a/overlay/tegra234-status-overlay.dtsi +++ b/overlay/tegra234-status-overlay.dtsi @@ -271,10 +271,6 @@ }; }; - i2c@3160000 { - status = "okay"; - }; - i2c@c240000 { status = "okay"; }; @@ -303,18 +299,10 @@ status = "okay"; }; - spi@3270000 { - status = "okay"; - }; - serial@31d0000 { status = "okay"; }; - mmc@3400000 { - status = "okay"; - }; - pwm@32a0000 { status = "okay"; }; diff --git a/tegra234-p3701-0000.dtsi b/tegra234-p3701-0000.dtsi index b129dc0..4d8aff2 100644 --- a/tegra234-p3701-0000.dtsi +++ b/tegra234-p3701-0000.dtsi @@ -6,6 +6,88 @@ model = "NVIDIA Jetson AGX Orin"; 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"; + cd-gpios = <&gpio TEGRA234_MAIN_GPIO(G, 7) GPIO_ACTIVE_LOW>; + 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>; + + ports { + usb2-0 { + vbus-supply = <&vdd_5v0_sys>; + }; + + usb2-1 { + vbus-supply = <&vdd_5v0_sys>; + }; + + usb2-2 { + vbus-supply = <&vdd_5v0_sys>; + }; + + usb2-3 { + vbus-supply = <&vdd_5v0_sys>; + }; + }; + }; + + 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"; @@ -14,6 +96,14 @@ 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"; @@ -22,6 +112,14 @@ 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 { compatible = "regulator-fixed"; regulator-name = "VDD_3V3_PCIE"; @@ -41,37 +139,4 @@ regulator-boot-on; enable-active-low; }; - - bus@0 { - 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 { - cd-gpios = <&gpio TEGRA234_MAIN_GPIO(G, 7) GPIO_ACTIVE_LOW>; - disable-wp; - }; - - mmc@3460000 { - status = "okay"; - bus-width = <8>; - non-removable; - }; - - rtc@c2a0000 { - status = "okay"; - }; - - pmc@c360000 { - nvidia,invert-interrupt; - }; - }; };