diff options
author | Denis Brockus <dbrockus@google.com> | 2021-06-07 09:48:00 -0600 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2021-06-07 18:15:22 +0000 |
commit | 4df10f7b2b0e67d1c36bb69285436ec0d5e3fdfd (patch) | |
tree | 4276acbab14b79df5066770362347e14b0d6380d /zephyr | |
parent | 43fffb5b0292ee1c48015b04ea55793a140d8177 (diff) | |
download | chrome-ec-4df10f7b2b0e67d1c36bb69285436ec0d5e3fdfd.tar.gz |
zephyr: driver: add ST accel_lis2dw12
BUG=b:180980668,b:189857004
BRANCH=none
TEST=make buildall
TEST=zmake configure -b $PROJ_HAYATO
Signed-off-by: Denis Brockus <dbrockus@google.com>
Change-Id: Ib743f0dbcc4a9731ccb575344413f161cd0dbba2
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2944617
Tested-by: Denis Brockus <dbrockus@chromium.org>
Auto-Submit: Denis Brockus <dbrockus@chromium.org>
Reviewed-by: Yuval Peress <peress@chromium.org>
Commit-Queue: Yuval Peress <peress@chromium.org>
Diffstat (limited to 'zephyr')
-rw-r--r-- | zephyr/CMakeLists.txt | 4 | ||||
-rw-r--r-- | zephyr/Kconfig.sensor_devices | 20 | ||||
-rw-r--r-- | zephyr/dts/bindings/motionsense/driver/cros-ec,lis2dw12.yaml | 10 | ||||
-rw-r--r-- | zephyr/dts/bindings/motionsense/drvdata/cros-ec,drvdata-lis2dw12.yaml | 18 | ||||
-rw-r--r-- | zephyr/shim/include/config_chip.h | 10 | ||||
-rw-r--r-- | zephyr/shim/src/motionsense_driver/lis2dw12-drvinfo.inc | 44 | ||||
-rw-r--r-- | zephyr/shim/src/motionsense_driver/sensor_drv_list.inc | 3 |
7 files changed, 109 insertions, 0 deletions
diff --git a/zephyr/CMakeLists.txt b/zephyr/CMakeLists.txt index 9e9af412d8..78f33d1f4f 100644 --- a/zephyr/CMakeLists.txt +++ b/zephyr/CMakeLists.txt @@ -133,6 +133,8 @@ zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_ACCEL_BMA255 "${PLATFORM_EC}/common/math_util.c") zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_ACCEL_KX022 "${PLATFORM_EC}/driver/accel_kionix.c") +zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_ACCEL_LIS2DW12 + "${PLATFORM_EC}/driver/accel_lis2dw12.c") zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_ACCELGYRO_BMI "${PLATFORM_EC}/driver/accelgyro_bmi_common.c" "${PLATFORM_EC}/common/math_util.c") @@ -281,6 +283,8 @@ zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_SWITCHCAP_LN9310 "${PLATFORM_EC}/driver/ln9310.c") zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_SPI_FLASH_REGS "${PLATFORM_EC}/common/spi_flash_reg.c") +zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_STM_MEMS_COMMON + "${PLATFORM_EC}/driver/stm_mems_common.c") zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_TABLET_MODE "${PLATFORM_EC}/common/tablet_mode.c") diff --git a/zephyr/Kconfig.sensor_devices b/zephyr/Kconfig.sensor_devices index d4415af9b4..0dc3eb40d4 100644 --- a/zephyr/Kconfig.sensor_devices +++ b/zephyr/Kconfig.sensor_devices @@ -32,6 +32,21 @@ config PLATFORM_EC_ACCEL_KX022 The driver supports Kionix's KX022 triaxial low-g acceleration sensor. It allows measurements of acceleration in three perpendicular axes. +config PLATFORM_EC_ACCEL_LIS2DW12 + bool "LIS2DW12 Accelerometer Driver" + imply PLATFORM_EC_STM_MEMS_COMMON + help + The driver supports ST's LIS2DW12 3D digital accelerometer sensor. + It allows measurements of acceleration in three perpendicular axes. + +config PLATFORM_EC_ACCEL_LIS2DW12_AS_BASE + bool "LIS2DW12 Interrupt force mode" + depends on PLATFORM_EC_ACCEL_LIS2DW12 + help + The LIS2DW driver supports fifo and interrupt, but letting lid accel + sensor work at polling mode is a common selection in current usage + model. This option will select interrupt (foced mode). + config PLATFORM_EC_ACCELGYRO_BMI160 bool "BMI160 Accelgyrometer Driver" select PLATFORM_EC_ACCELGYRO_BMI @@ -61,6 +76,11 @@ config PLATFORM_EC_ACCELGYRO_ICM426XX The driver supports ICM425XX which provides both accelerometer and gyroscope readings. +config PLATFORM_EC_STM_MEMS_COMMON + bool "STM MEMS Common Driver" + help + The driver supports common STM MEMS devices + rsource "Kconfig.accelgyro_bmi" rsource "Kconfig.accelgyro_icm" diff --git a/zephyr/dts/bindings/motionsense/driver/cros-ec,lis2dw12.yaml b/zephyr/dts/bindings/motionsense/driver/cros-ec,lis2dw12.yaml new file mode 100644 index 0000000000..5f7b0b40e0 --- /dev/null +++ b/zephyr/dts/bindings/motionsense/driver/cros-ec,lis2dw12.yaml @@ -0,0 +1,10 @@ +# Copyright 2021 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +description: motionsense sensor node for LIS2DW12 Accelerometer + +compatible: "cros-ec,lis2dw12" + +# every motionsense sensor node should include motionsense-sensor-base.yaml +include: motionsense-sensor-base.yaml diff --git a/zephyr/dts/bindings/motionsense/drvdata/cros-ec,drvdata-lis2dw12.yaml b/zephyr/dts/bindings/motionsense/drvdata/cros-ec,drvdata-lis2dw12.yaml new file mode 100644 index 0000000000..ecb182a4fd --- /dev/null +++ b/zephyr/dts/bindings/motionsense/drvdata/cros-ec,drvdata-lis2dw12.yaml @@ -0,0 +1,18 @@ +# Copyright 2021 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +description: LIS2DW12 driver data node + +compatible: "cros-ec,drvdata-lis2dw12" + +include: drvdata-base.yaml + +# +# examples: +# +# lis2dw12_data: lis2dw12-drv-data { +# compatible = "cros-ec,drvdata-lis2dw12"; +# status = "okay"; +# }; +# diff --git a/zephyr/shim/include/config_chip.h b/zephyr/shim/include/config_chip.h index 204f3732c9..cc500cd748 100644 --- a/zephyr/shim/include/config_chip.h +++ b/zephyr/shim/include/config_chip.h @@ -1572,4 +1572,14 @@ #define CONFIG_CCD_USBC_PORT_NUMBER CONFIG_PLATFORM_EC_CCD_USBC_PORT_NUMBER #endif +#undef CONFIG_ACCEL_LIS2DW12 +#ifdef CONFIG_PLATFORM_EC_ACCEL_LIS2DW12 +#define CONFIG_ACCEL_LIS2DW12 +#endif + +#undef CONFIG_ACCEL_LIS2DW_AS_BASE +#ifdef CONFIG_PLATFORM_EC_ACCEL_LIS2DW12_AS_BASE +#define CONFIG_ACCEL_LIS2DW_AS_BASE +#endif + #endif /* __CROS_EC_CONFIG_CHIP_H */ diff --git a/zephyr/shim/src/motionsense_driver/lis2dw12-drvinfo.inc b/zephyr/shim/src/motionsense_driver/lis2dw12-drvinfo.inc new file mode 100644 index 0000000000..433a9d4192 --- /dev/null +++ b/zephyr/shim/src/motionsense_driver/lis2dw12-drvinfo.inc @@ -0,0 +1,44 @@ +/* Copyright 2021 The Chromium OS Authors. All rights reserved. + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ + +#include "accel_lis2dw12_public.h" + +/* + * CREATE_SENSOR_DATA which is defined in motionsense_sensors.c is + * the helper to create sensor driver specific data. + * + * CREATE_SENSOR_DATA gets two arguments. One is the compatible + * property value specified in device tree and the other one is the macro + * that actually creates sensor driver specific data. The macro gets + * node id and the name to be used for the sensor driver data. + */ + +/* + * Create driver data for each Kionix drvinfo instance in device tree. + * (compatible = "cros-ec,drvdata-lis2dw12") + */ +/* Declare LIS2DW12 driver data */ +#define CREATE_SENSOR_DATA_LIS2DW12(id, drvdata_name) \ + static struct motion_sensor_t drvdata_name; + +CREATE_SENSOR_DATA(cros_ec_drvdata_lis2dw12, CREATE_SENSOR_DATA_LIS2DW12) + +/* + * CREATE_MOTION_SENSOR which is defined in motionsense_sensors.c is + * the macro to create an entry in motion_sensors array. + * The macro gets value of compatible property of + * the sensor in device tree and sensor specific values like chip ID, + * type of sensor, name of driver, default min/max frequency. + * Then using the values, it creates the corresponding motion_sense_t entry + * in motion_sensors array. + */ + +/* + * Create a motion_sensor_t entry for each LIS2DW12 + * instance(compatible = "cros-ec,lis2dw12") in device tree. + */ +CREATE_MOTION_SENSOR(cros_ec_lis2dw12, MOTIONSENSE_CHIP_LIS2DW12, \ + MOTIONSENSE_TYPE_ACCEL, lis2dw12_drv, \ + LIS2DW12_ODR_MIN_VAL, LIS2DW12_ODR_MAX_VAL) diff --git a/zephyr/shim/src/motionsense_driver/sensor_drv_list.inc b/zephyr/shim/src/motionsense_driver/sensor_drv_list.inc index b9b3a189ad..f8fa4b7e53 100644 --- a/zephyr/shim/src/motionsense_driver/sensor_drv_list.inc +++ b/zephyr/shim/src/motionsense_driver/sensor_drv_list.inc @@ -25,6 +25,9 @@ #ifdef CONFIG_PLATFORM_EC_ACCEL_KX022 #include "kx022-drvinfo.inc" #endif +#ifdef CONFIG_PLATFORM_EC_ACCEL_LIS2DW12 +#include "lis2dw12-drvinfo.inc" +#endif #ifdef CONFIG_PLATFORM_EC_ACCELGYRO_BMI160 #include "bmi160-drvinfo.inc" #endif |