From 46c1a0c49dd9d598784f2c114ea0147e43fdbd48 Mon Sep 17 00:00:00 2001
From: Laxman Dewangan <ldewangan@nvidia.com>
Date: Sun, 17 Dec 2023 10:16:42 +0000
Subject: [PATCH] t23x: nv-platforms: Remove INA device node

The INA device nodes are added in the base DTB
files which is integrated from mainline. Hence,
it is not required to add the same devices frm
override base DTB files.

Remove the duplicate entries.

Bug 4037899

Change-Id: I60e13b6daf0dec819c4ced4add019097f4735c66
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/device/hardware/nvidia/t23x-public-dts/+/3036336
Reviewed-by: svcacv <svcacv@nvidia.com>
Reviewed-by: Jonathan Hunter <jonathanh@nvidia.com>
GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
---
 nv-platform/tegra234-p3701-0000.dtsi          | 45 -------------------
 nv-platform/tegra234-p3740-0002.dtsi          | 27 +----------
 ...ra234-p3768-0000+p3767-xxxx-nv-common.dtsi | 21 ---------
 3 files changed, 1 insertion(+), 92 deletions(-)

diff --git a/nv-platform/tegra234-p3701-0000.dtsi b/nv-platform/tegra234-p3701-0000.dtsi
index cd7efae..8f4b4e3 100644
--- a/nv-platform/tegra234-p3701-0000.dtsi
+++ b/nv-platform/tegra234-p3701-0000.dtsi
@@ -5,51 +5,6 @@
 
 / {
 	bus@0 {
-		i2c@c240000 {
-			ina3221@40 {
-				compatible = "ti,ina3221";
-				reg = <0x40>;
-				#address-cells = <1>;
-				#size-cells = <0>;
-				channel@0 {
-					reg = <0x0>;
-					label = "VDD_GPU_SOC";
-					shunt-resistor-micro-ohms = <2000>;
-				};
-				channel@1 {
-					reg = <0x1>;
-					label = "VDD_CPU_CV";
-					shunt-resistor-micro-ohms = <2000>;
-				};
-				channel@2 {
-					reg = <0x2>;
-					label = "VIN_SYS_5V0";
-					shunt-resistor-micro-ohms = <2000>;
-					ti,summation-disable;
-				};
-			};
-
-			ina3221@41 {
-				compatible = "ti,ina3221";
-				reg = <0x41>;
-				#address-cells = <1>;
-				#size-cells = <0>;
-				channel@0 {
-					reg = <0x0>;
-					status = "disabled";
-				};
-				channel@1 {
-					reg = <0x1>;
-					label = "VDDQ_VDD2_1V8AO";
-					shunt-resistor-micro-ohms = <2000>;
-				};
-				channel@2 {
-					reg = <0x2>;
-					status = "disabled";
-				};
-			};
-		};
-
 		spi@3270000 {
 			flash@0 {
 				spi-max-frequency = <51000000>;
diff --git a/nv-platform/tegra234-p3740-0002.dtsi b/nv-platform/tegra234-p3740-0002.dtsi
index c955631..dbc8c9e 100644
--- a/nv-platform/tegra234-p3740-0002.dtsi
+++ b/nv-platform/tegra234-p3740-0002.dtsi
@@ -31,32 +31,7 @@
 		};
 
 		i2c@c250000 {
-			ina3221@41 {
-				compatible = "ti,ina3221";
-				reg = <0x41>;
-				#address-cells = <1>;
-				#size-cells = <0>;
-				channel@0 {
-					reg = <0x0>;
-					label = "CVB_ATX_12V";
-					shunt-resistor-micro-ohms = <2000>;
-				};
-				channel@1 {
-					reg = <0x1>;
-					label = "CVB_ATX_3V3";
-					shunt-resistor-micro-ohms = <2000>;
-				};
-				channel@2 {
-					reg = <0x2>;
-					label = "CVB_ATX_5V";
-					shunt-resistor-micro-ohms = <2000>;
-				};
-			};
-
-			ina219@44 {
-				compatible = "ti,ina219";
-				reg = <0x44>;
-				shunt-resistor = <2000>;
+			power-sensor@44 {
 				label = "CVB_ATX_12V_8P";
 			};
 
diff --git a/nv-platform/tegra234-p3768-0000+p3767-xxxx-nv-common.dtsi b/nv-platform/tegra234-p3768-0000+p3767-xxxx-nv-common.dtsi
index d99cdd7..8345c97 100644
--- a/nv-platform/tegra234-p3768-0000+p3767-xxxx-nv-common.dtsi
+++ b/nv-platform/tegra234-p3768-0000+p3767-xxxx-nv-common.dtsi
@@ -177,27 +177,6 @@
 
 		i2c@c240000 {
 			status = "okay";
-			ina32211_1_40: ina3221@40 {
-				compatible = "ti,ina3221";
-				reg = <0x40>;
-				#address-cells = <1>;
-				#size-cells = <0>;
-				channel@0 {
-					reg = <0x0>;
-					label = "VDD_IN";
-					shunt-resistor-micro-ohms = <5000>;
-				};
-				channel@1 {
-					reg = <0x1>;
-					label = "VDD_CPU_GPU_CV";
-					shunt-resistor-micro-ohms = <5000>;
-				};
-				channel@2 {
-					reg = <0x2>;
-					label = "VDD_SOC";
-					shunt-resistor-micro-ohms = <5000>;
-				};
-			};
 			fusb301@25 {
 				compatible = "onsemi,fusb301";
 				reg = <0x25>;