summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Wang <matt_wang@compal.corp-partner.google.com>2022-10-03 15:35:20 +0800
committerChromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com>2022-10-06 17:55:43 +0000
commitc2204be77f2ce98d57e3529fb3f9013474f27331 (patch)
treef6b3d24ec1f25667fd20aa1cc370027d5bc394c8
parentcefc4c4e4a34420465fb948bd61893396c0ea3c3 (diff)
downloadchrome-ec-c2204be77f2ce98d57e3529fb3f9013474f27331.tar.gz
skyrim: separate the charger from i2c_common to the respective dts file
Separate the charger to the respective dts file so let each board can change the charger. BUG=b:249707388 BRANCH=none TEST=zmake build winterfold skyrim frostflow morthal success LOW_COVERAGE_REASON=Skyrim board tests not created yet: b/247151116 Signed-off-by: Matt Wang <matt_wang@compal.corp-partner.google.com> Change-Id: Icc83e92b44e674a1ad52e1c56e345b65656c0585 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3932275 Code-Coverage: Zoss <zoss-cl-coverage@prod.google.com> Reviewed-by: Elthan Huang <elthan_huang@compal.corp-partner.google.com> Reviewed-by: Diana Z <dzigterman@chromium.org> Commit-Queue: Diana Z <dzigterman@chromium.org>
-rw-r--r--zephyr/projects/skyrim/frostflow.dts5
-rw-r--r--zephyr/projects/skyrim/i2c_common.dtsi6
-rw-r--r--zephyr/projects/skyrim/morthal.dts8
-rw-r--r--zephyr/projects/skyrim/skyrim.dts5
-rw-r--r--zephyr/projects/skyrim/winterhold.dts8
5 files changed, 26 insertions, 6 deletions
diff --git a/zephyr/projects/skyrim/frostflow.dts b/zephyr/projects/skyrim/frostflow.dts
index 28494c6250..c1b60e500b 100644
--- a/zephyr/projects/skyrim/frostflow.dts
+++ b/zephyr/projects/skyrim/frostflow.dts
@@ -155,6 +155,11 @@
};
&i2c4_1 {
+ charger: isl9241@9 {
+ compatible = "intersil,isl9241";
+ status = "okay";
+ reg = <0x9>;
+ };
alt_charger: isl9538@9 {
compatible = "intersil,isl923x";
status = "okay";
diff --git a/zephyr/projects/skyrim/i2c_common.dtsi b/zephyr/projects/skyrim/i2c_common.dtsi
index 8358b1c296..aaf54a161b 100644
--- a/zephyr/projects/skyrim/i2c_common.dtsi
+++ b/zephyr/projects/skyrim/i2c_common.dtsi
@@ -227,12 +227,6 @@
clock-frequency = <I2C_BITRATE_FAST>;
pinctrl-0 = <&i2c4_1_sda_scl_gpf2_f3>;
pinctrl-names = "default";
-
- charger: isl9241@9 {
- compatible = "intersil,isl9241";
- status = "okay";
- reg = <0x9>;
- };
};
&i2c_ctrl4 {
diff --git a/zephyr/projects/skyrim/morthal.dts b/zephyr/projects/skyrim/morthal.dts
index bb1e45aa87..508ce23bce 100644
--- a/zephyr/projects/skyrim/morthal.dts
+++ b/zephyr/projects/skyrim/morthal.dts
@@ -153,6 +153,14 @@
};
};
+&i2c4_1 {
+ charger: isl9241@9 {
+ compatible = "intersil,isl9241";
+ status = "okay";
+ reg = <0x9>;
+ };
+};
+
&usbc_port0 {
ppc = <&ppc_port0>;
usb-mux-chain-0 {
diff --git a/zephyr/projects/skyrim/skyrim.dts b/zephyr/projects/skyrim/skyrim.dts
index 02308e4390..6a812a55f3 100644
--- a/zephyr/projects/skyrim/skyrim.dts
+++ b/zephyr/projects/skyrim/skyrim.dts
@@ -172,6 +172,11 @@
};
&i2c4_1 {
+ charger: isl9241@9 {
+ compatible = "intersil,isl9241";
+ status = "okay";
+ reg = <0x9>;
+ };
alt_charger: isl9538@9 {
compatible = "intersil,isl923x";
status = "okay";
diff --git a/zephyr/projects/skyrim/winterhold.dts b/zephyr/projects/skyrim/winterhold.dts
index aba1054d81..ae3c9b799a 100644
--- a/zephyr/projects/skyrim/winterhold.dts
+++ b/zephyr/projects/skyrim/winterhold.dts
@@ -101,6 +101,14 @@
};
};
+&i2c4_1 {
+ charger: isl9241@9 {
+ compatible = "intersil,isl9241";
+ status = "okay";
+ reg = <0x9>;
+ };
+};
+
&usbc_port0 {
ppc = <&ppc_port0>;
usb-mux-chain-0 {