diff options
author | Michał Barnaś <mb@semihalf.com> | 2021-10-04 16:11:06 +0200 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2021-10-04 17:26:23 +0000 |
commit | 5c7654b7002f4bcf44beaca5eba94f5264535511 (patch) | |
tree | 30afb0d77726cb0e35d2a30f8b85193e0ecd13ff | |
parent | 7b5b661b1f38feb3ff5297290bcb4c321d8f9701 (diff) | |
download | chrome-ec-5c7654b7002f4bcf44beaca5eba94f5264535511.tar.gz |
Revert "zephyr: add motion sensors probing to lazor board"
This reverts commit ab9796b35d33623c098f9ac497be7373c0726e25.
It is needed due to the invalid order of commits in CL that
caused the lazor board to be stuck in boot loop.
BRANCH=main
BUG=none
TEST=EC on lazor should no longer be stuck in boot loop.
Change-Id: Ie05328b50e86e5ab0e508789e86d2e112509f020
Signed-off-by: Michał Barnaś <mb@semihalf.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3202195
Reviewed-by: Keith Short <keithshort@chromium.org>
Commit-Queue: Keith Short <keithshort@chromium.org>
-rw-r--r-- | zephyr/projects/trogdor/lazor/include/gpio_map.h | 2 | ||||
-rw-r--r-- | zephyr/projects/trogdor/lazor/motionsense.dts | 75 | ||||
-rw-r--r-- | zephyr/projects/trogdor/lazor/prj.conf | 3 |
3 files changed, 10 insertions, 70 deletions
diff --git a/zephyr/projects/trogdor/lazor/include/gpio_map.h b/zephyr/projects/trogdor/lazor/include/gpio_map.h index e2c3531fe4..00ee9c48e1 100644 --- a/zephyr/projects/trogdor/lazor/include/gpio_map.h +++ b/zephyr/projects/trogdor/lazor/include/gpio_map.h @@ -61,7 +61,7 @@ GPIO_INT(GPIO_CCD_MODE_ODL, GPIO_INT_EDGE_FALLING, \ board_connect_c0_sbu) \ GPIO_INT(GPIO_ACCEL_GYRO_INT_L, GPIO_INT_EDGE_FALLING, \ - GPIO_ACCEL_GYRO_INT_L_ISR) \ + bmi160_interrupt) \ GPIO_INT(GPIO_TABLET_MODE_L, GPIO_INT_EDGE_BOTH, gmr_tablet_switch_isr) #endif /* __ZEPHYR_GPIO_MAP_H */ diff --git a/zephyr/projects/trogdor/lazor/motionsense.dts b/zephyr/projects/trogdor/lazor/motionsense.dts index b3d3345acd..51d8505078 100644 --- a/zephyr/projects/trogdor/lazor/motionsense.dts +++ b/zephyr/projects/trogdor/lazor/motionsense.dts @@ -14,7 +14,6 @@ * its own <>_INT_EVENT. */ bmi160-int = &base_accel; - icm426xx-int = &base_accel; }; /* @@ -30,8 +29,8 @@ label = "LID_MUTEX"; }; - base_mutex: base-mutex { - label = "BASE_MUTEX"; + mutex_bmi160: bmi160-mutex { + label = "BMI160_MUTEX"; }; }; @@ -44,17 +43,11 @@ 0 0 1>; }; - base_rot_ref_bmi160: base-rotation-ref-bmi160 { + base_rot_ref: base-rotation-ref { mat33 = <1 0 0 0 (-1) 0 0 0 (-1)>; }; - - base_rot_ref_icm426xx: base-rotation-ref-icm426xx { - mat33 = <0 1 0 - 1 0 0 - 0 0 (-1)>; - }; }; /* @@ -81,11 +74,6 @@ compatible = "cros-ec,drvdata-kionix"; status = "okay"; }; - - icm426xx_data: icm426xx-drv-data { - compatible = "cros-ec,drvdata-icm426xx"; - status = "okay"; - }; }; /* @@ -128,9 +116,9 @@ label = "Base Accel"; active-mask = "SENSOR_ACTIVE_S0_S3_S5"; location = "MOTIONSENSE_LOC_BASE"; - mutex = <&base_mutex>; + mutex = <&mutex_bmi160>; port = <&i2c_sensor>; - rot-standard-ref = <&base_rot_ref_bmi160>; + rot-standard-ref = <&base_rot_ref>; drv-data = <&bmi160_data>; configs { compatible = @@ -146,16 +134,16 @@ }; }; - base_gyro: base-gyro { + base-gyro { compatible = "cros-ec,bmi160-gyro"; status = "okay"; - int-signal = <&gpio_accel_gyro_int_l>; + label = "Base Gyro"; active-mask = "SENSOR_ACTIVE_S0_S3_S5"; location = "MOTIONSENSE_LOC_BASE"; - mutex = <&base_mutex>; + mutex = <&mutex_bmi160>; port = <&i2c_sensor>; - rot-standard-ref = <&base_rot_ref_bmi160>; + rot-standard-ref = <&base_rot_ref>; drv-data = <&bmi160_data>; }; }; @@ -176,7 +164,6 @@ rot-standard-ref = <&lid_rot_ref>; drv-data = <&kx022_data>; alternate-for = <&lid_accel>; - runtime-probe; configs { compatible = "cros-ec,motionsense-sensor-config"; @@ -190,50 +177,6 @@ }; }; }; - - alt_base_accel { - compatible = "cros-ec,icm426xx-accel"; - status = "okay"; - - label = "Base Accel"; - active-mask = "SENSOR_ACTIVE_S0_S3_S5"; - location = "MOTIONSENSE_LOC_BASE"; - mutex = <&base_mutex>; - port = <&i2c_sensor>; - rot-standard-ref = <&base_rot_ref_icm426xx>; - drv-data = <&icm426xx_data>; - alternate-for = <&base_accel>; - runtime-probe; - int-signal = <&gpio_accel_gyro_int_l>; - configs { - compatible = - "cros-ec,motionsense-sensor-config"; - ec-s0 { - label = "SENSOR_CONFIG_EC_S0"; - odr = <(10000 | ROUND_UP_FLAG)>; - }; - ec-s3 { - label = "SENSOR_CONFIG_EC_S3"; - odr = <(10000 | ROUND_UP_FLAG)>; - }; - }; - }; - - alt_base_gyro { - compatible = "cros-ec,icm426xx-gyro"; - status = "okay"; - - label = "Base Gyro"; - active-mask = "SENSOR_ACTIVE_S0_S3_S5"; - location = "MOTIONSENSE_LOC_BASE"; - mutex = <&base_mutex>; - port = <&i2c_sensor>; - rot-standard-ref = <&base_rot_ref_icm426xx>; - drv-data = <&icm426xx_data>; - alternate-for = <&base_gyro>; - runtime-probe; - int-signal = <&gpio_accel_gyro_int_l>; - }; }; motionsense-sensor-info { diff --git a/zephyr/projects/trogdor/lazor/prj.conf b/zephyr/projects/trogdor/lazor/prj.conf index 0025ac8ad7..e16994e327 100644 --- a/zephyr/projects/trogdor/lazor/prj.conf +++ b/zephyr/projects/trogdor/lazor/prj.conf @@ -147,11 +147,8 @@ CONFIG_PLATFORM_EC_TABLET_MODE_SWITCH=y # Sensor Drivers CONFIG_PLATFORM_EC_ACCEL_BMA255=y -CONFIG_PLATFORM_EC_ACCEL_KX022=y CONFIG_PLATFORM_EC_ACCELGYRO_BMI160=y CONFIG_PLATFORM_EC_ACCELGYRO_BMI_COMM_I2C=y -CONFIG_PLATFORM_EC_ACCELGYRO_ICM426XX=y -CONFIG_PLATFORM_EC_ACCELGYRO_ICM_COMM_I2C=y # Console history CONFIG_SHELL_HISTORY=y |