summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTing Shen <phoenixshen@google.com>2023-01-12 18:06:35 +0800
committerChromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com>2023-01-13 15:50:14 +0000
commitd7029ebca1d8110c3baa12ecde5f2540f4e4dc55 (patch)
tree2830e57a603831af05fd1db31e7e371fbd2fac1e
parentd19e022401a164a168c3de99d5eb2af8be293d08 (diff)
downloadchrome-ec-d7029ebca1d8110c3baa12ecde5f2540f4e4dc55.tar.gz
geralt: remove rt9490-bc12 dt node
RT9490's charger and bc12 nodes are merged in CL:4010984. update Geralt dts to reflect this change. BUG=b:264841530 TEST=USB_CHG task doesn't crash BRANCH=none Change-Id: I9b5d057d713ca563095a55e8d2b25a7da9b3d4c4 Signed-off-by: Ting Shen <phoenixshen@google.com> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4159978 Code-Coverage: Zoss <zoss-cl-coverage@prod.google.com> Commit-Queue: Eric Yilun Lin <yllin@google.com> Reviewed-by: Eric Yilun Lin <yllin@google.com> Tested-by: Simon Zhou <zhouguohui@huaqin.corp-partner.google.com>
-rw-r--r--zephyr/program/geralt/i2c.dtsi8
-rw-r--r--zephyr/program/geralt/usbc.dtsi4
2 files changed, 3 insertions, 9 deletions
diff --git a/zephyr/program/geralt/i2c.dtsi b/zephyr/program/geralt/i2c.dtsi
index 0262933ac7..cc2e6f6bdf 100644
--- a/zephyr/program/geralt/i2c.dtsi
+++ b/zephyr/program/geralt/i2c.dtsi
@@ -60,16 +60,10 @@
timeout = <5>;
};
- charger: rt9490@53 {
+ charger_bc12_port1: rt9490@53 {
compatible = "richtek,rt9490";
status = "okay";
reg = <0x53>;
- };
-
- bc12_port1: rt9490-bc12@53 {
- compatible = "richtek,rt9490-bc12";
- status = "okay";
- reg = <0x53>;
irq = <&int_usb_c1_bc12_charger>;
};
};
diff --git a/zephyr/program/geralt/usbc.dtsi b/zephyr/program/geralt/usbc.dtsi
index 18475169a9..88e29a6b27 100644
--- a/zephyr/program/geralt/usbc.dtsi
+++ b/zephyr/program/geralt/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 = <&tusb546_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 {