zephyr: rt9490: merge charger and bc12 dt nodes

Devices that using rt9490 has a warning message during build:

  Warning (unique_unit_address_if_enabled): /soc/i2c@f01c40/rt9490-bc12@53:
  duplicate unit-address (also used in node /soc/i2c@f01c40/rt9490@53)

Fix the warning by merging the two conflicting nodes.

BUG=none
TEST=manually verified on tentacruel
BRANCH=none

Signed-off-by: Ting Shen <phoenixshen@google.com>
Change-Id: I098607b4c7321e4182b8ed37a229ee3ed2bfd973
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4010984
Code-Coverage: Zoss <zoss-cl-coverage@prod.google.com>
Auto-Submit: Ting Shen <phoenixshen@chromium.org>
Commit-Queue: Eric Yilun Lin <yllin@google.com>
Tested-by: Ting Shen <phoenixshen@chromium.org>
Reviewed-by: Eric Yilun Lin <yllin@google.com>

13 files changed, 26 insertions, 45 deletions

diff --git a/zephyr/dts/bindings/charger/richtek,rt9490.yaml b/zephyr/dts/bindings/charger/richtek,rt9490.yaml
index ecd25696f3..0f9acf999a 100644
--- a/zephyr/dts/bindings/charger/richtek,rt9490.yaml
+++ b/zephyr/dts/bindings/charger/richtek,rt9490.yaml
@@ -9,6 +9,11 @@ compatible: "richtek,rt9490"
 include: chg-chip.yaml
 
 properties:
-    thermistor:
-      type: phandle
-      description: Underlying thermistor device to measure temperature
+  irq:
+    type: phandles
+    description: |
+        GPIO interrupt from BC1.2
+
+  thermistor:
+    type: phandle
+    description: Underlying thermistor device to measure temperature
diff --git a/zephyr/dts/bindings/usbc/bc12/richtek,rt9490-bc12.yaml b/zephyr/dts/bindings/usbc/bc12/richtek,rt9490-bc12.yaml
deleted file mode 100644
index 38791d65bf..0000000000
--- a/zephyr/dts/bindings/usbc/bc12/richtek,rt9490-bc12.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2022 The ChromiumOS Authors
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-description: USBC BC1.2
-
-compatible: "richtek,rt9490-bc12"
-
-include: base.yaml
-
-properties:
-  irq:
-    type: phandles
-    description: |
-        GPIO interrupt from BC1.2
diff --git a/zephyr/program/corsola/adc_tentacruel.dtsi b/zephyr/program/corsola/adc_tentacruel.dtsi
index 7ab6f8817b..63ecb23a8e 100644
--- a/zephyr/program/corsola/adc_tentacruel.dtsi
+++ b/zephyr/program/corsola/adc_tentacruel.dtsi
@@ -62,7 +62,7 @@
 			temp_host_high = <68>;
 			temp_host_halt = <90>;
 			temp_host_release_high = <59>;
-			sensor = <&charger>;
+			sensor = <&charger_bc12_port1>;
 		};
 	};
 };
diff --git a/zephyr/program/corsola/i2c_krabby.dtsi b/zephyr/program/corsola/i2c_krabby.dtsi
index a873210ff7..102ec4947c 100644
--- a/zephyr/program/corsola/i2c_krabby.dtsi
+++ b/zephyr/program/corsola/i2c_krabby.dtsi
@@ -6,10 +6,11 @@
 #include "ite_i2c.dtsi"
 
 &i2c0 {
-	charger: rt9490@53 {
+	charger_bc12_port1: rt9490@53 {
 		compatible = "richtek,rt9490";
 		status = "okay";
 		reg = <0x53>;
+		irq = <&int_usb_c1_bc12_charger>;
 	};
 };
 
diff --git a/zephyr/program/corsola/i2c_magikarp.dtsi b/zephyr/program/corsola/i2c_magikarp.dtsi
index 45b7cf20fb..0dfd317b88 100644
--- a/zephyr/program/corsola/i2c_magikarp.dtsi
+++ b/zephyr/program/corsola/i2c_magikarp.dtsi
@@ -6,10 +6,11 @@
 #include "ite_i2c.dtsi"
 
 &i2c0 {
-	charger: rt9490@53 {
+	charger_bc12_port1: rt9490@53 {
 		compatible = "richtek,rt9490";
 		status = "okay";
 		reg = <0x53>;
+		irq = <&int_usb_c1_bc12_charger>;
 	};
 };
 
diff --git a/zephyr/program/corsola/i2c_tentacruel.dtsi b/zephyr/program/corsola/i2c_tentacruel.dtsi
index e56119ff86..05203103d5 100644
--- a/zephyr/program/corsola/i2c_tentacruel.dtsi
+++ b/zephyr/program/corsola/i2c_tentacruel.dtsi
@@ -6,10 +6,11 @@
 #include "ite_i2c.dtsi"
 
 &i2c0 {
-	charger: rt9490@53 {
+	charger_bc12_port1: rt9490@53 {
 		compatible = "richtek,rt9490";
 		status = "okay";
 		reg = <0x53>;
+		irq = <&int_usb_c1_bc12_charger>;
 		thermistor = <&thermistor_rt9490>;
 	};
 };
diff --git a/zephyr/program/corsola/ite_i2c.dtsi b/zephyr/program/corsola/ite_i2c.dtsi
index 6fd153e1fa..ba8e31423a 100644
--- a/zephyr/program/corsola/ite_i2c.dtsi
+++ b/zephyr/program/corsola/ite_i2c.dtsi
@@ -62,13 +62,6 @@
 		address-width = <8>;
 		timeout = <5>;
 	};
-
-	bc12_port1: rt9490-bc12@53 {
-		compatible = "richtek,rt9490-bc12";
-		status = "okay";
-		reg = <0x53>;
-		irq = <&int_usb_c1_bc12_charger>;
-	};
 };
 
 &i2c1 {
diff --git a/zephyr/program/corsola/ite_usbc.dtsi b/zephyr/program/corsola/ite_usbc.dtsi
index a72864da35..f8881e437c 100644
--- a/zephyr/program/corsola/ite_usbc.dtsi
+++ b/zephyr/program/corsola/ite_usbc.dtsi
@@ -14,7 +14,7 @@
 			bc12 = <&bc12_ppc_port0>;
 			ppc = <&bc12_ppc_port0>;
 			tcpc = <&usbpd0>;
-			chg = <&charger>;
+			chg = <&charger_bc12_port1>;
 			usb-mux-chain-0 {
 				compatible = "cros-ec,usb-mux-chain";
 				usb-muxes = <&it5205_mux_0 &virtual_mux_0>;
@@ -29,7 +29,7 @@
 		port1@1 {
 			compatible = "named-usbc-port";
 			reg = <1>;
-			bc12 = <&bc12_port1>;
+			bc12 = <&charger_bc12_port1>;
 			ppc = <&ppc_port1>;
 			tcpc = <&usbpd1>;
 			usb-mux-chain-1 {
diff --git a/zephyr/program/corsola/usbc_magikarp.dtsi b/zephyr/program/corsola/usbc_magikarp.dtsi
index c94db15b3a..1d96f2a194 100644
--- a/zephyr/program/corsola/usbc_magikarp.dtsi
+++ b/zephyr/program/corsola/usbc_magikarp.dtsi
@@ -14,7 +14,7 @@
 			bc12 = <&bc12_port0>;
 			ppc = <&ppc_port0>;
 			tcpc = <&usbpd0>;
-			chg = <&charger>;
+			chg = <&charger_bc12_port1>;
 			usb-mux-chain-0 {
 				compatible = "cros-ec,usb-mux-chain";
 				usb-muxes = <&it5205_mux_0 &virtual_mux_0>;
@@ -29,7 +29,7 @@
 		port1@1 {
 			compatible = "named-usbc-port";
 			reg = <1>;
-			bc12 = <&bc12_port1>;
+			bc12 = <&charger_bc12_port1>;
 			ppc = <&ppc_port1>;
 			tcpc = <&usbpd1>;
 			usb-mux-chain-1 {
diff --git a/zephyr/program/corsola/usbc_tentacruel.dtsi b/zephyr/program/corsola/usbc_tentacruel.dtsi
index bb105a8e08..3a0ead7b3e 100644
--- a/zephyr/program/corsola/usbc_tentacruel.dtsi
+++ b/zephyr/program/corsola/usbc_tentacruel.dtsi
@@ -15,7 +15,7 @@
 			ppc = <&bc12_ppc_port0>;
 			ppc_alt = <&ppc_port0>;
 			tcpc = <&usbpd0>;
-			chg = <&charger>;
+			chg = <&charger_bc12_port1>;
 			usb-mux-chain-0 {
 				compatible = "cros-ec,usb-mux-chain";
 				usb-muxes = <&it5205_mux_0 &virtual_mux_0>;
@@ -30,7 +30,7 @@
 		port1@1 {
 			compatible = "named-usbc-port";
 			reg = <1>;
-			bc12 = <&bc12_port1>;
+			bc12 = <&charger_bc12_port1>;
 			ppc = <&ppc_port1>;
 			tcpc = <&usbpd1>;
 			usb-mux-chain-1 {
diff --git a/zephyr/shim/include/usbc/bc12_rt9490.h b/zephyr/shim/include/usbc/bc12_rt9490.h
index a9371ddeea..c4323728f9 100644
--- a/zephyr/shim/include/usbc/bc12_rt9490.h
+++ b/zephyr/shim/include/usbc/bc12_rt9490.h
@@ -5,7 +5,7 @@
 
 #include "driver/charger/rt9490.h"
 
-#define RT9490_BC12_COMPAT richtek_rt9490_bc12
+#define RT9490_BC12_COMPAT richtek_rt9490
 
 #define BC12_CHIP_RT9490(id)             \
 	{                                \
diff --git a/zephyr/shim/src/bc12_rt9490.c b/zephyr/shim/src/bc12_rt9490.c
index 0b30a5d2da..5394069d51 100644
--- a/zephyr/shim/src/bc12_rt9490.c
+++ b/zephyr/shim/src/bc12_rt9490.c
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#define DT_DRV_COMPAT richtek_rt9490_bc12
+#define DT_DRV_COMPAT richtek_rt9490
 
 #include "driver/charger/rt9490.h"
 #include "gpio/gpio_int.h"
diff --git a/zephyr/test/drivers/rt9490/charger.dts b/zephyr/test/drivers/rt9490/charger.dts
index 5a3815490f..e74729aaed 100644
--- a/zephyr/test/drivers/rt9490/charger.dts
+++ b/zephyr/test/drivers/rt9490/charger.dts
@@ -4,26 +4,21 @@
 			compatible = "named-usbc-port";
 			reg = <0>;
 			chg = <&rt9490>;
-			bc12 = <&rt9490_bc12>;
+			bc12 = <&rt9490>;
 			tcpc = <&tcpci_emul>;
 		};
 
 		port1@1 {
-			bc12 = <&rt9490_bc12>;
+			bc12 = <&rt9490>;
 		};
 	};
-
-	rt9490_bc12: rt9490-bc12 {
-		compatible = "richtek,rt9490-bc12";
-		status = "okay";
-	};
 };
 
 &i2c0 {
 	status="okay";
 
 	rt9490: rt9490@53 {
-		compatible = "zephyr,rt9490-emul";
+		compatible = "zephyr,rt9490-emul", "richtek,rt9490";
 		status = "okay";
 		reg = <0x53>;
 	};