summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabio Baltieri <fabiobaltieri@google.com>2022-11-14 16:55:29 +0000
committerChromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com>2022-11-18 13:49:23 +0000
commit6d80b51050df216c0589f31b1ff457f7f5308910 (patch)
tree6a34dd9031d37f2cc276300b79574c882decb886
parent9322a632b37e0efd0d1239c96b25be944dbc1c61 (diff)
downloadchrome-ec-6d80b51050df216c0589f31b1ff457f7f5308910.tar.gz
zephyr: temp: enable few temperature Kconfig options automatically
Enable few temperature sensor options automatically based devicetree compatible nodes, drop few explicit config entries. BRANCH=none BUG=none TEST=cq dry run Signed-off-by: Fabio Baltieri <fabiobaltieri@google.com> Change-Id: I8c6cbcadd14001c3ed62631da85b038d55fab090 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4022161 Code-Coverage: Zoss <zoss-cl-coverage@prod.google.com> Reviewed-by: Sam Hurst <shurst@google.com>
Diffstat
-rw-r--r--zephyr/Kconfig.temperature10
-rw-r--r--zephyr/program/brya/prj.conf2
-rw-r--r--zephyr/program/corsola/magikarp/project.conf4
-rw-r--r--zephyr/program/corsola/tentacruel/project.conf4
-rw-r--r--zephyr/program/intelrvp/adlrvp/prj.conf2
-rw-r--r--zephyr/program/intelrvp/mtlrvp/prj.conf2
-rw-r--r--zephyr/program/nissa/program.conf2
-rw-r--r--zephyr/program/rex/prj.conf2
-rw-r--r--zephyr/program/skyrim/prj.conf3
-rw-r--r--zephyr/program/skyrim/prj_frostflow.conf2
-rw-r--r--zephyr/program/skyrim/prj_morthal.conf3
-rw-r--r--zephyr/program/skyrim/prj_skyrim.conf3
-rw-r--r--zephyr/program/skyrim/prj_winterhold.conf3
-rw-r--r--zephyr/test/drivers/prj.conf2
-rw-r--r--zephyr/test/krabby/testcase.yaml2
15 files changed, 10 insertions, 36 deletions
diff --git a/zephyr/Kconfig.temperature b/zephyr/Kconfig.temperature
index 8b46d323a8..9bea40d274 100644
--- a/zephyr/Kconfig.temperature
+++ b/zephyr/Kconfig.temperature
@@ -4,6 +4,8 @@
menuconfig PLATFORM_EC_TEMP_SENSOR
bool "Temperature sensors"
+ default y
+ depends on DT_HAS_CROS_EC_TEMP_SENSORS_ENABLED
help
Support for temperature sensors. Once enabled, "temps" console
command and EC_CMD_TEMP_SENSOR_GET_INFO host command are available.
@@ -33,6 +35,8 @@ config PLATFORM_EC_DPTF
config PLATFORM_EC_THERMISTOR
bool "Thermistor support"
+ default y
+ depends on DT_HAS_CROS_EC_THERMISTOR_ENABLED
depends on ADC
help
Enables support for thermistors (resistor whose resistance is
@@ -40,18 +44,24 @@ config PLATFORM_EC_THERMISTOR
config PLATFORM_EC_TEMP_SENSOR_PCT2075
bool "PCT2075 support"
+ default y
+ depends on DT_HAS_NXP_PCT2075_ENABLED
help
Enables support for the CrosEC PCT2075 sensor, an i2c peripheral
temperature sensor from NXP.
config PLATFORM_EC_TEMP_SENSOR_SB_TSI
bool "SB TSI support"
+ default y
+ depends on DT_HAS_AMD_SB_TSI_ENABLED
help
Enables support for the Side Band Temperature Sensor Interface,
an i2c peripheral available on AMD platforms.
config PLATFORM_EC_TEMP_SENSOR_TMP112
bool "TMP112 support"
+ default y
+ depends on DT_HAS_CROS_EC_TEMP_SENSOR_TMP112_ENABLED
help
Enables support for the CrosEC TMP112 driver, an i2c peripheral
temperature sensor from TI.
diff --git a/zephyr/program/brya/prj.conf b/zephyr/program/brya/prj.conf
index 4a814c9ab8..e0e62ac85a 100644
--- a/zephyr/program/brya/prj.conf
+++ b/zephyr/program/brya/prj.conf
@@ -72,8 +72,6 @@ CONFIG_PLATFORM_EC_ACCEL_LIS2DW12=y
CONFIG_PLATFORM_EC_ALS_TCS3400=y
# Temperature sensors
-CONFIG_PLATFORM_EC_TEMP_SENSOR=y
-CONFIG_PLATFORM_EC_THERMISTOR=y
CONFIG_PLATFORM_EC_TEMP_SENSOR_POWER=y
# MKBP event
diff --git a/zephyr/program/corsola/magikarp/project.conf b/zephyr/program/corsola/magikarp/project.conf
index a5ec9ede3b..73433b242a 100644
--- a/zephyr/program/corsola/magikarp/project.conf
+++ b/zephyr/program/corsola/magikarp/project.conf
@@ -19,9 +19,5 @@ CONFIG_PLATFORM_EC_KEYBOARD_PWRBTN_ASSERTS_KSI3=y
CONFIG_PLATFORM_EC_ACCELGYRO_BMI3XX=y
CONFIG_PLATFORM_EC_ACCELGYRO_BMI_COMM_I2C=y
-# Temperature sensors
-CONFIG_PLATFORM_EC_TEMP_SENSOR=y
-CONFIG_PLATFORM_EC_THERMISTOR=y
-
# Battery
CONFIG_PLATFORM_EC_BATTERY_REVIVE_DISCONNECT=y
diff --git a/zephyr/program/corsola/tentacruel/project.conf b/zephyr/program/corsola/tentacruel/project.conf
index 71cc9d9694..239fc339fb 100644
--- a/zephyr/program/corsola/tentacruel/project.conf
+++ b/zephyr/program/corsola/tentacruel/project.conf
@@ -18,9 +18,5 @@ CONFIG_PLATFORM_EC_KEYBOARD_PWRBTN_ASSERTS_KSI3=y
CONFIG_PLATFORM_EC_ACCELGYRO_BMI3XX=y
CONFIG_PLATFORM_EC_ACCELGYRO_BMI_COMM_I2C=y
-# Temperature sensors
-CONFIG_PLATFORM_EC_TEMP_SENSOR=y
-CONFIG_PLATFORM_EC_THERMISTOR=y
-
# Battery
CONFIG_PLATFORM_EC_CHARGER_PROFILE_OVERRIDE=y
diff --git a/zephyr/program/intelrvp/adlrvp/prj.conf b/zephyr/program/intelrvp/adlrvp/prj.conf
index a5f2ad34a5..df0811ecdd 100644
--- a/zephyr/program/intelrvp/adlrvp/prj.conf
+++ b/zephyr/program/intelrvp/adlrvp/prj.conf
@@ -34,8 +34,6 @@ CONFIG_PLATFORM_EC_LED_COMMON=y
CONFIG_PLATFORM_EC_LED_PWM_TASK_DISABLED=y
# Temperature sensors
-CONFIG_PLATFORM_EC_TEMP_SENSOR=y
-CONFIG_PLATFORM_EC_THERMISTOR=y
CONFIG_PLATFORM_EC_TEMP_SENSOR_POWER=y
# USB-C and PD
diff --git a/zephyr/program/intelrvp/mtlrvp/prj.conf b/zephyr/program/intelrvp/mtlrvp/prj.conf
index 281d40a271..1270712f99 100644
--- a/zephyr/program/intelrvp/mtlrvp/prj.conf
+++ b/zephyr/program/intelrvp/mtlrvp/prj.conf
@@ -36,8 +36,6 @@ CONFIG_PLATFORM_EC_IOEX_IT8801=y
CONFIG_CROS_KB_RAW_NPCX=n
# Temperature sensors
-CONFIG_PLATFORM_EC_TEMP_SENSOR=y
-CONFIG_PLATFORM_EC_THERMISTOR=y
CONFIG_PLATFORM_EC_TEMP_SENSOR_POWER=y
# USB CONFIG
diff --git a/zephyr/program/nissa/program.conf b/zephyr/program/nissa/program.conf
index a8a2ec3319..a803dadc4c 100644
--- a/zephyr/program/nissa/program.conf
+++ b/zephyr/program/nissa/program.conf
@@ -72,8 +72,6 @@ CONFIG_PLATFORM_EC_MKBP_INPUT_DEVICES=y
CONFIG_PLATFORM_EC_MKBP_USE_GPIO_AND_HOST_EVENT=y
# Temperature sensor support
-CONFIG_PLATFORM_EC_TEMP_SENSOR=y
-CONFIG_PLATFORM_EC_THERMISTOR=y
CONFIG_PLATFORM_EC_TEMP_SENSOR_FIRST_READ_DELAY=y
# CBI EEPROM support
diff --git a/zephyr/program/rex/prj.conf b/zephyr/program/rex/prj.conf
index e52812c001..38b55aa783 100644
--- a/zephyr/program/rex/prj.conf
+++ b/zephyr/program/rex/prj.conf
@@ -59,8 +59,6 @@ CONFIG_PWM=y
# Temperature sensors
CONFIG_SENSOR=y
-CONFIG_PLATFORM_EC_TEMP_SENSOR=y
-CONFIG_PLATFORM_EC_THERMISTOR=y
CONFIG_PLATFORM_EC_TEMP_SENSOR_POWER=y
# CBI EEPROM support
diff --git a/zephyr/program/skyrim/prj.conf b/zephyr/program/skyrim/prj.conf
index 63f2a54ae1..587d191358 100644
--- a/zephyr/program/skyrim/prj.conf
+++ b/zephyr/program/skyrim/prj.conf
@@ -34,9 +34,6 @@ CONFIG_PLATFORM_EC_BOARD_VERSION_CBI=y
# Temperature Sensors
CONFIG_PLATFORM_EC_AMD_SB_RMI=y
CONFIG_PLATFORM_EC_AMD_STT=y
-CONFIG_PLATFORM_EC_TEMP_SENSOR=y
-CONFIG_PLATFORM_EC_TEMP_SENSOR_SB_TSI=y
-CONFIG_PLATFORM_EC_THERMISTOR=y
CONFIG_PLATFORM_EC_THROTTLE_AP=y
# External power
diff --git a/zephyr/program/skyrim/prj_frostflow.conf b/zephyr/program/skyrim/prj_frostflow.conf
index 835230be67..675c387aae 100644
--- a/zephyr/program/skyrim/prj_frostflow.conf
+++ b/zephyr/program/skyrim/prj_frostflow.conf
@@ -18,8 +18,6 @@ CONFIG_PLATFORM_EC_PD_MAX_POWER_MW=45000
CONFIG_PLATFORM_EC_PD_MAX_CURRENT_MA=3000
CONFIG_PLATFORM_EC_PD_MAX_VOLTAGE_MV=20000
CONFIG_PLATFORM_EC_CHARGER_MIN_POWER_MW_FOR_POWER_ON=15000
-# Only Frostflow has the PCT2075
-CONFIG_PLATFORM_EC_TEMP_SENSOR_PCT2075=y
# Keyboard
CONFIG_PLATFORM_EC_KEYBOARD_CUSTOMIZATION=y
diff --git a/zephyr/program/skyrim/prj_morthal.conf b/zephyr/program/skyrim/prj_morthal.conf
index f0833418ca..8a22f58ab8 100644
--- a/zephyr/program/skyrim/prj_morthal.conf
+++ b/zephyr/program/skyrim/prj_morthal.conf
@@ -17,9 +17,6 @@ CONFIG_PLATFORM_EC_PD_MAX_POWER_MW=100000
CONFIG_PLATFORM_EC_PD_MAX_CURRENT_MA=5000
CONFIG_PLATFORM_EC_PD_MAX_VOLTAGE_MV=20000
-# Only Morthal has the PCT2075
-CONFIG_PLATFORM_EC_TEMP_SENSOR_PCT2075=y
-
CONFIG_PLATFORM_EC_USBC_RETIMER_ANX7483=y
# Battery
diff --git a/zephyr/program/skyrim/prj_skyrim.conf b/zephyr/program/skyrim/prj_skyrim.conf
index 0ebd1e91fa..67b3f0f142 100644
--- a/zephyr/program/skyrim/prj_skyrim.conf
+++ b/zephyr/program/skyrim/prj_skyrim.conf
@@ -16,9 +16,6 @@ CONFIG_PLATFORM_EC_PD_MAX_POWER_MW=100000
CONFIG_PLATFORM_EC_PD_MAX_CURRENT_MA=5000
CONFIG_PLATFORM_EC_PD_MAX_VOLTAGE_MV=20000
-# Only Skyrim has the PCT2075
-CONFIG_PLATFORM_EC_TEMP_SENSOR_PCT2075=y
-
CONFIG_PLATFORM_EC_USBC_RETIMER_ANX7483=y
# Enable alternative charger chip
diff --git a/zephyr/program/skyrim/prj_winterhold.conf b/zephyr/program/skyrim/prj_winterhold.conf
index 4501e0e6ff..0703a50b14 100644
--- a/zephyr/program/skyrim/prj_winterhold.conf
+++ b/zephyr/program/skyrim/prj_winterhold.conf
@@ -12,9 +12,6 @@ CONFIG_PLATFORM_EC_SYSTEM_UNLOCKED=y
# LED
CONFIG_PLATFORM_EC_LED_DT=y
-# Only Winterhold has the PCT2075
-CONFIG_PLATFORM_EC_TEMP_SENSOR_PCT2075=y
-
CONFIG_PLATFORM_EC_USBC_RETIMER_ANX7483=y
# Enable charger chip
diff --git a/zephyr/test/drivers/prj.conf b/zephyr/test/drivers/prj.conf
index 68a13a1f9d..ffb5af8281 100644
--- a/zephyr/test/drivers/prj.conf
+++ b/zephyr/test/drivers/prj.conf
@@ -100,9 +100,7 @@ CONFIG_PLATFORM_EC_USB_PD_TCPM_TUSB422=y
CONFIG_PLATFORM_EC_USB_MUX_RUNTIME_CONFIG=y
CONFIG_PLATFORM_EC_USB_MUX_VIRTUAL=y
CONFIG_PLATFORM_EC_USBC_PPC_SN5S330=y
-CONFIG_PLATFORM_EC_TEMP_SENSOR=y
CONFIG_PLATFORM_EC_TEMP_SENSOR_POWER=y
-CONFIG_PLATFORM_EC_THERMISTOR=y
CONFIG_PLATFORM_EC_SWITCH=y
CONFIG_PLATFORM_EC_SWITCHCAP_LN9310=y
CONFIG_PLATFORM_EC_ACCEL_BMA255=y
diff --git a/zephyr/test/krabby/testcase.yaml b/zephyr/test/krabby/testcase.yaml
index 6e202c92c8..54a8ce59d4 100644
--- a/zephyr/test/krabby/testcase.yaml
+++ b/zephyr/test/krabby/testcase.yaml
@@ -14,7 +14,5 @@ tests:
extra_args: DTC_OVERLAY_FILE="common.dts;adc_temp.dts;../program/corsola/interrupts_tentacruel.dtsi;../program/corsola/gpio_tentacruel.dtsi;../program/corsola/thermistor_tentacruel.dtsi;pinctrl.dts"
extra_configs:
- CONFIG_TEST_TENTACRUEL=y
- - CONFIG_PLATFORM_EC_TEMP_SENSOR=y
- - CONFIG_PLATFORM_EC_THERMISTOR=y
- CONFIG_PLATFORM_EC_CHARGER_PROFILE_OVERRIDE=y
- CONFIG_ADC_EMUL=y
View Lorry Controller Status