From 91ccf069b49f6a7d52722bab517de6eb5bc2494b Mon Sep 17 00:00:00 2001 From: Eric Yilun Lin Date: Thu, 8 Dec 2022 14:58:36 +0800 Subject: corsola: drop board level battery.dtsi To follow the new project organization rule. BUG=b:254097516 TEST=zmake compare-builds tentacruel magikarp krabby TEST=./twister -T ./zephyr/test BRANCH=none Change-Id: Id015dc01b719d7f7beea73576100734ff99f7f99 Signed-off-by: Eric Yilun Lin Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4085113 Reviewed-by: Sung-Chi Li Commit-Queue: Eric Yilun Lin Tested-by: Eric Yilun Lin Code-Coverage: Zoss --- zephyr/program/corsola/battery_krabby.dtsi | 12 ------------ zephyr/program/corsola/battery_magikarp.dtsi | 12 ------------ zephyr/program/corsola/battery_tentacruel.dtsi | 12 ------------ zephyr/program/corsola/krabby/project.overlay | 10 +++++++++- zephyr/program/corsola/magikarp/project.overlay | 7 ++++++- zephyr/program/corsola/tentacruel/project.overlay | 7 ++++++- 6 files changed, 21 insertions(+), 39 deletions(-) delete mode 100644 zephyr/program/corsola/battery_krabby.dtsi delete mode 100644 zephyr/program/corsola/battery_magikarp.dtsi delete mode 100644 zephyr/program/corsola/battery_tentacruel.dtsi (limited to 'zephyr/program/corsola') diff --git a/zephyr/program/corsola/battery_krabby.dtsi b/zephyr/program/corsola/battery_krabby.dtsi deleted file mode 100644 index ce41859182..0000000000 --- a/zephyr/program/corsola/battery_krabby.dtsi +++ /dev/null @@ -1,12 +0,0 @@ -/* Copyright 2021 The ChromiumOS Authors - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - -/ { - batteries { - default_battery: c235 { - compatible = "celxpert,c235-41", "battery-smart"; - }; - }; -}; diff --git a/zephyr/program/corsola/battery_magikarp.dtsi b/zephyr/program/corsola/battery_magikarp.dtsi deleted file mode 100644 index bbdd6ac0c5..0000000000 --- a/zephyr/program/corsola/battery_magikarp.dtsi +++ /dev/null @@ -1,12 +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. - */ - -/ { - batteries { - default_battery: smp_c31n1915 { - compatible = "smp,c31n1915", "battery-smart"; - }; - }; -}; diff --git a/zephyr/program/corsola/battery_tentacruel.dtsi b/zephyr/program/corsola/battery_tentacruel.dtsi deleted file mode 100644 index f116c20a51..0000000000 --- a/zephyr/program/corsola/battery_tentacruel.dtsi +++ /dev/null @@ -1,12 +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. - */ - -/ { - batteries { - default_battery: dynapack_c140254 { - compatible = "dynapack,c140254", "battery-smart"; - }; - }; -}; diff --git a/zephyr/program/corsola/krabby/project.overlay b/zephyr/program/corsola/krabby/project.overlay index 88908e523f..f166243219 100644 --- a/zephyr/program/corsola/krabby/project.overlay +++ b/zephyr/program/corsola/krabby/project.overlay @@ -9,7 +9,6 @@ #include "../power_signal.dtsi" #include "../usba.dtsi" #include "../ite_adc.dtsi" -#include "../battery_krabby.dtsi" #include "../ite_gpio.dtsi" #include "../ite_keyboard.dtsi" #include "../ite_i2c.dtsi" @@ -17,3 +16,12 @@ #include "../ite_led.dtsi" #include "../ite_motionsense.dtsi" #include "../ite_usbc.dtsi" + + +/ { + batteries { + default_battery: c235 { + compatible = "celxpert,c235-41", "battery-smart"; + }; + }; +}; diff --git a/zephyr/program/corsola/magikarp/project.overlay b/zephyr/program/corsola/magikarp/project.overlay index ebd28ece95..334bd34f28 100644 --- a/zephyr/program/corsola/magikarp/project.overlay +++ b/zephyr/program/corsola/magikarp/project.overlay @@ -10,7 +10,6 @@ #include "../power_signal.dtsi" #include "../usba.dtsi" #include "../ite_adc.dtsi" -#include "../battery_magikarp.dtsi" #include "../cbi_magikarp.dtsi" #include "../ite_gpio.dtsi" #include "../ite_keyboard.dtsi" @@ -347,6 +346,12 @@ led-values = <0>; }; }; + + batteries { + default_battery: smp_c31n1915 { + compatible = "smp,c31n1915", "battery-smart"; + }; + }; }; &adc0 { diff --git a/zephyr/program/corsola/tentacruel/project.overlay b/zephyr/program/corsola/tentacruel/project.overlay index 5e3111ad02..c63c7ad25e 100644 --- a/zephyr/program/corsola/tentacruel/project.overlay +++ b/zephyr/program/corsola/tentacruel/project.overlay @@ -10,7 +10,6 @@ #include "../power_signal.dtsi" #include "../usba.dtsi" #include "../ite_adc.dtsi" -#include "../battery_tentacruel.dtsi" #include "../cbi_tentacruel.dtsi" #include "../ite_gpio.dtsi" #include "../ite_keyboard.dtsi" @@ -475,6 +474,12 @@ led-values = <0>; }; }; + + batteries { + default_battery: dynapack_c140254 { + compatible = "dynapack,c140254", "battery-smart"; + }; + }; }; -- cgit v1.2.1