summaryrefslogtreecommitdiff
path: root/zephyr/projects/trogdor/lazor
diff options
context:
space:
mode:
authorMichał Barnaś <mb@semihalf.com>2021-08-19 15:05:18 +0200
committerCommit Bot <commit-bot@chromium.org>2021-09-03 21:31:02 +0000
commit5dd50874e1f4b1f0c47d7245daabb68a4414f0ba (patch)
tree6c147a53117b352870d961eaa315c381867cadaa /zephyr/projects/trogdor/lazor
parentd64c9ddf0459370f09a4ec9189c2426e50e1f323 (diff)
downloadchrome-ec-5dd50874e1f4b1f0c47d7245daabb68a4414f0ba.tar.gz
zephyr: define lazor's batteries in device tree
This commit adds lazor's batteries definitions to device tree and removes old battery.c usage in Zephyr. BRANCH=main BUG=b:183544739 TEST=Compile and flash CrOS EC firmware to lazor. It should work the same as without this commit. TEST=Compile and flash Zephyr, battery should be detected correctly and its model should be logged in EC console. Change-Id: I937f7b56cb5acdea949a655cc2a107f360cbf535 Signed-off-by: Michał Barnaś <mb@semihalf.com> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3107387 Reviewed-by: Keith Short <keithshort@chromium.org> Commit-Queue: Keith Short <keithshort@chromium.org> Tested-by: Keith Short <keithshort@chromium.org>
Diffstat (limited to 'zephyr/projects/trogdor/lazor')
-rw-r--r--zephyr/projects/trogdor/lazor/CMakeLists.txt1
-rw-r--r--zephyr/projects/trogdor/lazor/battery.dts20
2 files changed, 7 insertions, 14 deletions
diff --git a/zephyr/projects/trogdor/lazor/CMakeLists.txt b/zephyr/projects/trogdor/lazor/CMakeLists.txt
index 3c8372cebf..2344e25666 100644
--- a/zephyr/projects/trogdor/lazor/CMakeLists.txt
+++ b/zephyr/projects/trogdor/lazor/CMakeLists.txt
@@ -24,7 +24,6 @@ zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_LED_COMMON
"${PLATFORM_EC_BOARD}/led.c")
zephyr_library_sources(
- "${PLATFORM_EC_BOARD}/battery.c"
"${PLATFORM_EC_BOARD}/hibernate.c"
"${PLATFORM_EC_BOARD}/sku.c"
"${PLATFORM_EC_BOARD}/switchcap.c"
diff --git a/zephyr/projects/trogdor/lazor/battery.dts b/zephyr/projects/trogdor/lazor/battery.dts
index 7428cfb1af..52aa69d400 100644
--- a/zephyr/projects/trogdor/lazor/battery.dts
+++ b/zephyr/projects/trogdor/lazor/battery.dts
@@ -4,27 +4,21 @@
*/
/ {
- named-batteries {
- compatible = "named-batteries";
-
- ap16l5j {
- enum-name = "ap16l5j";
+ batteries {
+ default_battery: ap16l5j {
+ compatible = "panasonic,ap16l5j";
};
-
ap16l5j_009 {
- enum-name = "ap16l5j_009";
+ compatible = "panasonic,ap16l5j-009";
};
-
ap16l8j {
- enum-name = "ap16l8j";
+ compatible = "lgc,ap16l8j";
};
-
lgc_ap18c8k {
- enum-name = "lgc_ap18c8k";
+ compatible = "lgc,ap18c8k";
};
-
murata_ap18c4k {
- enum-name = "murata_ap18c4k";
+ compatible = "murata,ap18c4k";
};
};
};