diff options
author | Diana Z <dzigterman@chromium.org> | 2021-06-07 16:10:42 -0600 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2021-06-09 17:44:19 +0000 |
commit | 7837e2011cf7c4d8690a17f9b7d89768a5a01d4c (patch) | |
tree | 48758199beccadd5b67e5a6f7b749e62c8a4e881 | |
parent | 5927d4ccc51a131e075c1aad44532caa2faa7ef0 (diff) | |
download | chrome-ec-7837e2011cf7c4d8690a17f9b7d89768a5a01d4c.tar.gz |
COIL: Rename motion sense address macros
Update the motion_sense.h address macros to reflect our current i2c
terms, and also to specify that these are used exclusively in the
accelerometer code.
BRANCH=None
BUG=None
TEST=make -j buildall
Signed-off-by: Diana Z <dzigterman@chromium.org>
Change-Id: Ibad287df2ba1ecd0b6f3061599476636ac7a5354
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2946316
Reviewed-by: Gwendal Grignou <gwendal@chromium.org>
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
-rw-r--r-- | board/burnet/board.c | 10 | ||||
-rw-r--r-- | board/cerise/board.c | 6 | ||||
-rw-r--r-- | board/damu/board.c | 6 | ||||
-rw-r--r-- | board/elm/board.c | 4 | ||||
-rw-r--r-- | board/fennel/board.c | 4 | ||||
-rw-r--r-- | board/jacuzzi/board.c | 8 | ||||
-rw-r--r-- | board/makomo/board.c | 4 | ||||
-rw-r--r-- | board/mchpevb1/board.c | 4 | ||||
-rw-r--r-- | board/oak/board.c | 4 | ||||
-rw-r--r-- | board/rainier/board.c | 6 | ||||
-rw-r--r-- | board/scarlet/board.c | 4 | ||||
-rw-r--r-- | board/stern/board.c | 6 | ||||
-rw-r--r-- | board/willow/board.c | 4 | ||||
-rw-r--r-- | driver/accel_kionix.c | 14 | ||||
-rw-r--r-- | driver/accelgyro_bmi_common.c | 10 | ||||
-rw-r--r-- | driver/accelgyro_icm_common.c | 16 | ||||
-rw-r--r-- | include/motion_sense.h | 16 |
17 files changed, 67 insertions, 59 deletions
diff --git a/board/burnet/board.c b/board/burnet/board.c index 8bbd8bb94b..f7d53ac726 100644 --- a/board/burnet/board.c +++ b/board/burnet/board.c @@ -362,7 +362,7 @@ struct motion_sensor_t base_accel_icm426xx = { .mutex = &g_base_mutex, .drv_data = &g_icm426xx_data, .port = CONFIG_SPI_ACCEL_PORT, - .i2c_spi_addr_flags = SLAVE_MK_SPI_ADDR_FLAGS(CONFIG_SPI_ACCEL_PORT), + .i2c_spi_addr_flags = ACCEL_MK_SPI_ADDR_FLAGS(CONFIG_SPI_ACCEL_PORT), .default_range = 4, .rot_standard_ref = &base_icm426xx_ref, .min_frequency = ICM426XX_ACCEL_MIN_FREQ, @@ -389,7 +389,7 @@ struct motion_sensor_t base_gyro_icm426xx = { .mutex = &g_base_mutex, .drv_data = &g_icm426xx_data, .port = CONFIG_SPI_ACCEL_PORT, - .i2c_spi_addr_flags = SLAVE_MK_SPI_ADDR_FLAGS(CONFIG_SPI_ACCEL_PORT), + .i2c_spi_addr_flags = ACCEL_MK_SPI_ADDR_FLAGS(CONFIG_SPI_ACCEL_PORT), .default_range = 1000, /* dps */ .rot_standard_ref = &base_icm426xx_ref, .min_frequency = ICM426XX_GYRO_MIN_FREQ, @@ -436,7 +436,8 @@ struct motion_sensor_t motion_sensors[] = { .mutex = &g_base_mutex, .drv_data = &g_bmi160_data, .port = CONFIG_SPI_ACCEL_PORT, - .i2c_spi_addr_flags = SLAVE_MK_SPI_ADDR_FLAGS(CONFIG_SPI_ACCEL_PORT), + .i2c_spi_addr_flags = + ACCEL_MK_SPI_ADDR_FLAGS(CONFIG_SPI_ACCEL_PORT), .rot_standard_ref = &base_bmi160_ref, .default_range = 4, /* g, to meet CDD 7.3.1/C-1-4 reqs */ .min_frequency = BMI_ACCEL_MIN_FREQ, @@ -464,7 +465,8 @@ struct motion_sensor_t motion_sensors[] = { .mutex = &g_base_mutex, .drv_data = &g_bmi160_data, .port = CONFIG_SPI_ACCEL_PORT, - .i2c_spi_addr_flags = SLAVE_MK_SPI_ADDR_FLAGS(CONFIG_SPI_ACCEL_PORT), + .i2c_spi_addr_flags = + ACCEL_MK_SPI_ADDR_FLAGS(CONFIG_SPI_ACCEL_PORT), .default_range = 1000, /* dps */ .rot_standard_ref = &base_bmi160_ref, .min_frequency = BMI_GYRO_MIN_FREQ, diff --git a/board/cerise/board.c b/board/cerise/board.c index ddad67cd77..8ca775b8e8 100644 --- a/board/cerise/board.c +++ b/board/cerise/board.c @@ -397,7 +397,8 @@ struct motion_sensor_t motion_sensors[] = { .mutex = &g_base_mutex, .drv_data = &g_bmi160_data, .port = CONFIG_SPI_ACCEL_PORT, - .i2c_spi_addr_flags = SLAVE_MK_SPI_ADDR_FLAGS(CONFIG_SPI_ACCEL_PORT), + .i2c_spi_addr_flags = + ACCEL_MK_SPI_ADDR_FLAGS(CONFIG_SPI_ACCEL_PORT), .rot_standard_ref = &base_standard_ref, .default_range = 4, /* g, to meet CDD 7.3.1/C-1-4 reqs */ .min_frequency = BMI_ACCEL_MIN_FREQ, @@ -425,7 +426,8 @@ struct motion_sensor_t motion_sensors[] = { .mutex = &g_base_mutex, .drv_data = &g_bmi160_data, .port = CONFIG_SPI_ACCEL_PORT, - .i2c_spi_addr_flags = SLAVE_MK_SPI_ADDR_FLAGS(CONFIG_SPI_ACCEL_PORT), + .i2c_spi_addr_flags = + ACCEL_MK_SPI_ADDR_FLAGS(CONFIG_SPI_ACCEL_PORT), .default_range = 1000, /* dps */ .rot_standard_ref = &base_standard_ref, .min_frequency = BMI_GYRO_MIN_FREQ, diff --git a/board/damu/board.c b/board/damu/board.c index f55b0f339c..38f354d251 100644 --- a/board/damu/board.c +++ b/board/damu/board.c @@ -394,7 +394,8 @@ struct motion_sensor_t motion_sensors[] = { .mutex = &g_base_mutex, .drv_data = &g_bmi160_data, .port = CONFIG_SPI_ACCEL_PORT, - .i2c_spi_addr_flags = SLAVE_MK_SPI_ADDR_FLAGS(CONFIG_SPI_ACCEL_PORT), + .i2c_spi_addr_flags = + ACCEL_MK_SPI_ADDR_FLAGS(CONFIG_SPI_ACCEL_PORT), .rot_standard_ref = &base_standard_ref, .default_range = 4, /* g, to meet CDD 7.3.1/C-1-4 reqs */ .min_frequency = BMI_ACCEL_MIN_FREQ, @@ -422,7 +423,8 @@ struct motion_sensor_t motion_sensors[] = { .mutex = &g_base_mutex, .drv_data = &g_bmi160_data, .port = CONFIG_SPI_ACCEL_PORT, - .i2c_spi_addr_flags = SLAVE_MK_SPI_ADDR_FLAGS(CONFIG_SPI_ACCEL_PORT), + .i2c_spi_addr_flags = + ACCEL_MK_SPI_ADDR_FLAGS(CONFIG_SPI_ACCEL_PORT), .default_range = 1000, /* dps */ .rot_standard_ref = &base_standard_ref, .min_frequency = BMI_GYRO_MIN_FREQ, diff --git a/board/elm/board.c b/board/elm/board.c index 6baa70b8c8..8918a1cbd4 100644 --- a/board/elm/board.c +++ b/board/elm/board.c @@ -478,7 +478,7 @@ struct motion_sensor_t motion_sensors[] = { .drv = &kionix_accel_drv, .mutex = &g_kx022_mutex[0], .drv_data = &g_kx022_data[0], - .i2c_spi_addr_flags = SLAVE_MK_SPI_ADDR_FLAGS(0), + .i2c_spi_addr_flags = ACCEL_MK_SPI_ADDR_FLAGS(0), .rot_standard_ref = &base_standard_ref, .default_range = 2, /* g, enough for lid angle calculation. */ .min_frequency = KX022_ACCEL_MIN_FREQ, @@ -501,7 +501,7 @@ struct motion_sensor_t motion_sensors[] = { .drv = &kionix_accel_drv, .mutex = &g_kx022_mutex[1], .drv_data = &g_kx022_data[1], - .i2c_spi_addr_flags = SLAVE_MK_SPI_ADDR_FLAGS(1), + .i2c_spi_addr_flags = ACCEL_MK_SPI_ADDR_FLAGS(1), .rot_standard_ref = &lid_standard_ref, .default_range = 4, /* g, to meet CDD 7.3.1/C-1-4 reqs */ .min_frequency = KX022_ACCEL_MIN_FREQ, diff --git a/board/fennel/board.c b/board/fennel/board.c index 0d9e14e1f5..dcc812a4d6 100644 --- a/board/fennel/board.c +++ b/board/fennel/board.c @@ -393,7 +393,7 @@ struct motion_sensor_t motion_sensors[] = { .mutex = &g_base_mutex, .drv_data = &g_bmi160_data, .port = CONFIG_SPI_ACCEL_PORT, - .i2c_spi_addr_flags = SLAVE_MK_SPI_ADDR_FLAGS(CONFIG_SPI_ACCEL_PORT), + .i2c_spi_addr_flags = ACCEL_MK_SPI_ADDR_FLAGS(CONFIG_SPI_ACCEL_PORT), .rot_standard_ref = &base_standard_ref, .default_range = 4, /* g, to meet CDD 7.3.1/C-1-4 reqs */ .min_frequency = BMI_ACCEL_MIN_FREQ, @@ -421,7 +421,7 @@ struct motion_sensor_t motion_sensors[] = { .mutex = &g_base_mutex, .drv_data = &g_bmi160_data, .port = CONFIG_SPI_ACCEL_PORT, - .i2c_spi_addr_flags = SLAVE_MK_SPI_ADDR_FLAGS(CONFIG_SPI_ACCEL_PORT), + .i2c_spi_addr_flags = ACCEL_MK_SPI_ADDR_FLAGS(CONFIG_SPI_ACCEL_PORT), .default_range = 1000, /* dps */ .rot_standard_ref = &base_standard_ref, .min_frequency = BMI_GYRO_MIN_FREQ, diff --git a/board/jacuzzi/board.c b/board/jacuzzi/board.c index c0594decf3..ae4a12b418 100644 --- a/board/jacuzzi/board.c +++ b/board/jacuzzi/board.c @@ -419,7 +419,7 @@ struct motion_sensor_t motion_sensors[] = { .mutex = &g_base_mutex, .drv_data = &g_bmi160_data, .port = CONFIG_SPI_ACCEL_PORT, - .i2c_spi_addr_flags = SLAVE_MK_SPI_ADDR_FLAGS(CONFIG_SPI_ACCEL_PORT), + .i2c_spi_addr_flags = ACCEL_MK_SPI_ADDR_FLAGS(CONFIG_SPI_ACCEL_PORT), .rot_standard_ref = &base_bmi160_ref, .default_range = 4, /* g, to meet CDD 7.3.1/C-1-4 reqs.*/ .min_frequency = BMI_ACCEL_MIN_FREQ, @@ -447,7 +447,7 @@ struct motion_sensor_t motion_sensors[] = { .mutex = &g_base_mutex, .drv_data = &g_bmi160_data, .port = CONFIG_SPI_ACCEL_PORT, - .i2c_spi_addr_flags = SLAVE_MK_SPI_ADDR_FLAGS(CONFIG_SPI_ACCEL_PORT), + .i2c_spi_addr_flags = ACCEL_MK_SPI_ADDR_FLAGS(CONFIG_SPI_ACCEL_PORT), .default_range = 1000, /* dps */ .rot_standard_ref = &base_bmi160_ref, .min_frequency = BMI_GYRO_MIN_FREQ, @@ -466,7 +466,7 @@ struct motion_sensor_t icm426xx_base_accel = { .mutex = &g_base_mutex, .drv_data = &g_icm426xx_data, .port = CONFIG_SPI_ACCEL_PORT, - .i2c_spi_addr_flags = SLAVE_MK_SPI_ADDR_FLAGS(CONFIG_SPI_ACCEL_PORT), + .i2c_spi_addr_flags = ACCEL_MK_SPI_ADDR_FLAGS(CONFIG_SPI_ACCEL_PORT), .default_range = 4, /* g, to meet CDD 7.3.1/C-1-4 reqs.*/ .rot_standard_ref = &base_icm426xx_ref, .min_frequency = ICM426XX_ACCEL_MIN_FREQ, @@ -493,7 +493,7 @@ struct motion_sensor_t icm426xx_base_gyro = { .mutex = &g_base_mutex, .drv_data = &g_icm426xx_data, .port = CONFIG_SPI_ACCEL_PORT, - .i2c_spi_addr_flags = SLAVE_MK_SPI_ADDR_FLAGS(CONFIG_SPI_ACCEL_PORT), + .i2c_spi_addr_flags = ACCEL_MK_SPI_ADDR_FLAGS(CONFIG_SPI_ACCEL_PORT), .default_range = 1000, /* dps */ .rot_standard_ref = &base_icm426xx_ref, .min_frequency = ICM426XX_GYRO_MIN_FREQ, diff --git a/board/makomo/board.c b/board/makomo/board.c index 04d752500b..d0289a945d 100644 --- a/board/makomo/board.c +++ b/board/makomo/board.c @@ -393,7 +393,7 @@ struct motion_sensor_t motion_sensors[] = { .mutex = &g_base_mutex, .drv_data = &g_bmi160_data, .port = CONFIG_SPI_ACCEL_PORT, - .i2c_spi_addr_flags = SLAVE_MK_SPI_ADDR_FLAGS(CONFIG_SPI_ACCEL_PORT), + .i2c_spi_addr_flags = ACCEL_MK_SPI_ADDR_FLAGS(CONFIG_SPI_ACCEL_PORT), .rot_standard_ref = &base_standard_ref, .default_range = 4, /* g, to meet CDD 7.3.1/C-1-4 reqs */ .min_frequency = BMI_ACCEL_MIN_FREQ, @@ -421,7 +421,7 @@ struct motion_sensor_t motion_sensors[] = { .mutex = &g_base_mutex, .drv_data = &g_bmi160_data, .port = CONFIG_SPI_ACCEL_PORT, - .i2c_spi_addr_flags = SLAVE_MK_SPI_ADDR_FLAGS(CONFIG_SPI_ACCEL_PORT), + .i2c_spi_addr_flags = ACCEL_MK_SPI_ADDR_FLAGS(CONFIG_SPI_ACCEL_PORT), .default_range = 1000, /* dps */ .rot_standard_ref = &base_standard_ref, .min_frequency = BMI_GYRO_MIN_FREQ, diff --git a/board/mchpevb1/board.c b/board/mchpevb1/board.c index 2372dbe5f4..9ed7cd19f6 100644 --- a/board/mchpevb1/board.c +++ b/board/mchpevb1/board.c @@ -891,7 +891,7 @@ struct motion_sensor_t motion_sensors[] = { .mutex = &g_base_mutex, .drv_data = &g_bmi160_data, .port = CONFIG_SPI_ACCEL_PORT, - .i2c_spi_addr_flags = SLAVE_MK_SPI_ADDR_FLAGS( + .i2c_spi_addr_flags = ACCEL_MK_SPI_ADDR_FLAGS( CONFIG_SPI_ACCEL_PORT), .rot_standard_ref = NULL, /* Identity matrix. */ .default_range = 4, /* g, to meet CDD 7.3.1/C-1-4 reqs */ @@ -916,7 +916,7 @@ struct motion_sensor_t motion_sensors[] = { .mutex = &g_base_mutex, .drv_data = &g_bmi160_data, .port = CONFIG_SPI_ACCEL_PORT, - .i2c_spi_addr_flags = SLAVE_MK_SPI_ADDR_FLAGS( + .i2c_spi_addr_flags = ACCEL_MK_SPI_ADDR_FLAGS( CONFIG_SPI_ACCEL_PORT), .default_range = 1000, /* dps */ .rot_standard_ref = NULL, /* Identity Matrix. */ diff --git a/board/oak/board.c b/board/oak/board.c index e631395fa2..f5b909b874 100644 --- a/board/oak/board.c +++ b/board/oak/board.c @@ -667,7 +667,7 @@ struct motion_sensor_t motion_sensors[] = { .mutex = &g_base_mutex, .drv_data = &g_bmi160_data, .port = I2C_PORT_ACCEL, - .i2c_spi_addr_flags = SLAVE_MK_SPI_ADDR_FLAGS(0), + .i2c_spi_addr_flags = ACCEL_MK_SPI_ADDR_FLAGS(0), .rot_standard_ref = &base_standard_ref, .default_range = 4, /* g, to meet CDD 7.3.1/C-1-4 reqs */ .min_frequency = BMI_ACCEL_MIN_FREQ, @@ -691,7 +691,7 @@ struct motion_sensor_t motion_sensors[] = { .mutex = &g_base_mutex, .drv_data = &g_bmi160_data, .port = I2C_PORT_ACCEL, - .i2c_spi_addr_flags = SLAVE_MK_SPI_ADDR_FLAGS(0), + .i2c_spi_addr_flags = ACCEL_MK_SPI_ADDR_FLAGS(0), .default_range = 1000, /* dps */ .rot_standard_ref = &base_standard_ref, .min_frequency = BMI_GYRO_MIN_FREQ, diff --git a/board/rainier/board.c b/board/rainier/board.c index ecb42f17d2..ac0a5a928f 100644 --- a/board/rainier/board.c +++ b/board/rainier/board.c @@ -377,7 +377,7 @@ struct motion_sensor_t motion_sensors[] = { .mutex = &g_base_mutex, .drv_data = &g_bmi160_data, .port = CONFIG_SPI_ACCEL_PORT, - .i2c_spi_addr_flags = SLAVE_MK_SPI_ADDR_FLAGS(CONFIG_SPI_ACCEL_PORT), + .i2c_spi_addr_flags = ACCEL_MK_SPI_ADDR_FLAGS(CONFIG_SPI_ACCEL_PORT), .rot_standard_ref = &base_standard_ref, .default_range = 4, /* g, to meet CDD 7.3.1/C-1-4 reqs */ .min_frequency = BMI_ACCEL_MIN_FREQ, @@ -400,7 +400,7 @@ struct motion_sensor_t motion_sensors[] = { .mutex = &g_base_mutex, .drv_data = &g_bmi160_data, .port = CONFIG_SPI_ACCEL_PORT, - .i2c_spi_addr_flags = SLAVE_MK_SPI_ADDR_FLAGS(CONFIG_SPI_ACCEL_PORT), + .i2c_spi_addr_flags = ACCEL_MK_SPI_ADDR_FLAGS(CONFIG_SPI_ACCEL_PORT), .default_range = 1000, /* dps */ .rot_standard_ref = &base_standard_ref, .min_frequency = BMI_GYRO_MIN_FREQ, @@ -422,7 +422,7 @@ struct motion_sensor_t motion_sensors[] = { .drv = &bmp280_drv, .drv_data = &bmp280_drv_data, .port = CONFIG_SPI_ACCEL_PORT, - .i2c_spi_addr_flags = SLAVE_MK_SPI_ADDR_FLAGS(CONFIG_SPI_ACCEL_PORT), + .i2c_spi_addr_flags = ACCEL_MK_SPI_ADDR_FLAGS(CONFIG_SPI_ACCEL_PORT), .default_range = BIT(18), /* 1bit = 4 Pa, 16bit ~= 2600 hPa */ .min_frequency = BMP280_BARO_MIN_FREQ, .max_frequency = BMP280_BARO_MAX_FREQ, diff --git a/board/scarlet/board.c b/board/scarlet/board.c index 78e8935cd2..a2cfdacb97 100644 --- a/board/scarlet/board.c +++ b/board/scarlet/board.c @@ -411,7 +411,7 @@ struct motion_sensor_t motion_sensors[] = { .mutex = &g_base_mutex, .drv_data = &g_bmi160_data, .port = CONFIG_SPI_ACCEL_PORT, - .i2c_spi_addr_flags = SLAVE_MK_SPI_ADDR_FLAGS(CONFIG_SPI_ACCEL_PORT), + .i2c_spi_addr_flags = ACCEL_MK_SPI_ADDR_FLAGS(CONFIG_SPI_ACCEL_PORT), .rot_standard_ref = &base_standard_ref, .default_range = 4, /* g, to meet CDD 7.3.1/C-1-4 reqs */ .min_frequency = BMI_ACCEL_MIN_FREQ, @@ -434,7 +434,7 @@ struct motion_sensor_t motion_sensors[] = { .mutex = &g_base_mutex, .drv_data = &g_bmi160_data, .port = CONFIG_SPI_ACCEL_PORT, - .i2c_spi_addr_flags = SLAVE_MK_SPI_ADDR_FLAGS(CONFIG_SPI_ACCEL_PORT), + .i2c_spi_addr_flags = ACCEL_MK_SPI_ADDR_FLAGS(CONFIG_SPI_ACCEL_PORT), .default_range = 1000, /* dps */ .rot_standard_ref = &base_standard_ref, .min_frequency = BMI_GYRO_MIN_FREQ, diff --git a/board/stern/board.c b/board/stern/board.c index fcbd769f7c..5963d53ab4 100644 --- a/board/stern/board.c +++ b/board/stern/board.c @@ -394,7 +394,8 @@ struct motion_sensor_t motion_sensors[] = { .mutex = &g_base_mutex, .drv_data = &g_bmi160_data, .port = CONFIG_SPI_ACCEL_PORT, - .i2c_spi_addr_flags = SLAVE_MK_SPI_ADDR_FLAGS(CONFIG_SPI_ACCEL_PORT), + .i2c_spi_addr_flags = + ACCEL_MK_SPI_ADDR_FLAGS(CONFIG_SPI_ACCEL_PORT), .rot_standard_ref = &base_standard_ref, .default_range = 4, /* g, to meet CDD 7.3.1/C-1-4 reqs */ .min_frequency = BMI_ACCEL_MIN_FREQ, @@ -422,7 +423,8 @@ struct motion_sensor_t motion_sensors[] = { .mutex = &g_base_mutex, .drv_data = &g_bmi160_data, .port = CONFIG_SPI_ACCEL_PORT, - .i2c_spi_addr_flags = SLAVE_MK_SPI_ADDR_FLAGS(CONFIG_SPI_ACCEL_PORT), + .i2c_spi_addr_flags = + ACCEL_MK_SPI_ADDR_FLAGS(CONFIG_SPI_ACCEL_PORT), .default_range = 1000, /* dps */ .rot_standard_ref = &base_standard_ref, .min_frequency = BMI_GYRO_MIN_FREQ, diff --git a/board/willow/board.c b/board/willow/board.c index b6e62e35ee..fbdc4e10bd 100644 --- a/board/willow/board.c +++ b/board/willow/board.c @@ -382,7 +382,7 @@ struct motion_sensor_t motion_sensors[] = { .mutex = &g_base_mutex, .drv_data = &g_bmi160_data, .port = CONFIG_SPI_ACCEL_PORT, - .i2c_spi_addr_flags = SLAVE_MK_SPI_ADDR_FLAGS(CONFIG_SPI_ACCEL_PORT), + .i2c_spi_addr_flags = ACCEL_MK_SPI_ADDR_FLAGS(CONFIG_SPI_ACCEL_PORT), .rot_standard_ref = &base_standard_ref, .default_range = 4, /* g, to meet CDD 7.3.1/C-1-4 reqs */ .min_frequency = BMI_ACCEL_MIN_FREQ, @@ -410,7 +410,7 @@ struct motion_sensor_t motion_sensors[] = { .mutex = &g_base_mutex, .drv_data = &g_bmi160_data, .port = CONFIG_SPI_ACCEL_PORT, - .i2c_spi_addr_flags = SLAVE_MK_SPI_ADDR_FLAGS(CONFIG_SPI_ACCEL_PORT), + .i2c_spi_addr_flags = ACCEL_MK_SPI_ADDR_FLAGS(CONFIG_SPI_ACCEL_PORT), .default_range = 1000, /* dps */ .rot_standard_ref = &base_standard_ref, .min_frequency = BMI_GYRO_MIN_FREQ, diff --git a/driver/accel_kionix.c b/driver/accel_kionix.c index d92aa71c01..69f0ca9073 100644 --- a/driver/accel_kionix.c +++ b/driver/accel_kionix.c @@ -147,13 +147,13 @@ static int raw_read8(const int port, { int rv = EC_ERROR_INVAL; - if (SLAVE_IS_SPI(i2c_spi_addr_flags)) { + if (ACCEL_ADDR_IS_SPI(i2c_spi_addr_flags)) { #ifdef CONFIG_SPI_ACCEL_PORT uint8_t val; uint8_t cmd = 0x80 | reg; rv = spi_transaction( - &spi_devices[SLAVE_GET_SPI_ADDR(i2c_spi_addr_flags)], + &spi_devices[ACCEL_GET_SPI_ADDR(i2c_spi_addr_flags)], &cmd, 1, &val, 1); if (rv == EC_SUCCESS) *data_ptr = val; @@ -175,12 +175,12 @@ static int raw_write8(const int port, { int rv = EC_ERROR_INVAL; - if (SLAVE_IS_SPI(i2c_spi_addr_flags)) { + if (ACCEL_ADDR_IS_SPI(i2c_spi_addr_flags)) { #ifdef CONFIG_SPI_ACCEL_PORT uint8_t cmd[2] = { reg, data }; rv = spi_transaction( - &spi_devices[SLAVE_GET_SPI_ADDR(i2c_spi_addr_flags)], + &spi_devices[ACCEL_GET_SPI_ADDR(i2c_spi_addr_flags)], cmd, 2, NULL, 0); #endif } else { @@ -196,11 +196,11 @@ static int raw_read_multi(const int port, { int rv = EC_ERROR_INVAL; - if (SLAVE_IS_SPI(i2c_spi_addr_flags)) { + if (ACCEL_ADDR_IS_SPI(i2c_spi_addr_flags)) { #ifdef CONFIG_SPI_ACCEL_PORT reg |= 0x80; rv = spi_transaction( - &spi_devices[SLAVE_GET_SPI_ADDR(i2c_spi_addr_flags)], + &spi_devices[ACCEL_GET_SPI_ADDR(i2c_spi_addr_flags)], ®, 1, rxdata, rxlen); #endif } else { @@ -572,7 +572,7 @@ static int init(struct motion_sensor_t *s) * from the first address, resend the command using * the second address. */ - if (!SLAVE_IS_SPI(s->i2c_spi_addr_flags)) { + if (!ACCEL_ADDR_IS_SPI(s->i2c_spi_addr_flags)) { const uint16_t i2c_alt_addr_flags = I2C_STRIP_FLAGS( s->i2c_spi_addr_flags) diff --git a/driver/accelgyro_bmi_common.c b/driver/accelgyro_bmi_common.c index a3a184da37..b8a9de2422 100644 --- a/driver/accelgyro_bmi_common.c +++ b/driver/accelgyro_bmi_common.c @@ -168,7 +168,7 @@ int bmi_read8(const int port, const uint16_t i2c_spi_addr_flags, { uint8_t val; - rv = bmi_spi_raw_read(SLAVE_GET_SPI_ADDR(i2c_spi_addr_flags), + rv = bmi_spi_raw_read(ACCEL_GET_SPI_ADDR(i2c_spi_addr_flags), reg, &val, 1); if (rv == EC_SUCCESS) *data_ptr = val; @@ -192,7 +192,7 @@ int bmi_write8(const int port, const uint16_t i2c_spi_addr_flags, uint8_t cmd[2] = { reg, data }; rv = spi_transaction( - &spi_devices[SLAVE_GET_SPI_ADDR(i2c_spi_addr_flags)], + &spi_devices[ACCEL_GET_SPI_ADDR(i2c_spi_addr_flags)], cmd, 2, NULL, 0); } #else @@ -216,7 +216,7 @@ int bmi_read16(const int port, const uint16_t i2c_spi_addr_flags, const uint8_t reg, int *data_ptr) { #ifdef CONFIG_ACCELGYRO_BMI_COMM_SPI - return bmi_spi_raw_read(SLAVE_GET_SPI_ADDR(i2c_spi_addr_flags), reg, + return bmi_spi_raw_read(ACCEL_GET_SPI_ADDR(i2c_spi_addr_flags), reg, (uint8_t *)data_ptr, 2); #else return i2c_read16(port, i2c_spi_addr_flags, reg, data_ptr); @@ -253,7 +253,7 @@ int bmi_read32(const int port, const uint16_t i2c_spi_addr_flags, const uint8_t reg, int *data_ptr) { #ifdef CONFIG_ACCELGYRO_BMI_COMM_SPI - return bmi_spi_raw_read(SLAVE_GET_SPI_ADDR(i2c_spi_addr_flags), reg, + return bmi_spi_raw_read(ACCEL_GET_SPI_ADDR(i2c_spi_addr_flags), reg, (uint8_t *)data_ptr, 4); #else return i2c_read32(port, i2c_spi_addr_flags, reg, data_ptr); @@ -267,7 +267,7 @@ int bmi_read_n(const int port, const uint16_t i2c_spi_addr_flags, const uint8_t reg, uint8_t *data_ptr, const int len) { #ifdef CONFIG_ACCELGYRO_BMI_COMM_SPI - return bmi_spi_raw_read(SLAVE_GET_SPI_ADDR(i2c_spi_addr_flags), reg, + return bmi_spi_raw_read(ACCEL_GET_SPI_ADDR(i2c_spi_addr_flags), reg, data_ptr, len); #else return i2c_read_block(port, i2c_spi_addr_flags, reg, data_ptr, len); diff --git a/driver/accelgyro_icm_common.c b/driver/accelgyro_icm_common.c index 13dbe9ce11..94db99407d 100644 --- a/driver/accelgyro_icm_common.c +++ b/driver/accelgyro_icm_common.c @@ -55,7 +55,7 @@ static int icm_bank_sel(const struct motion_sensor_t *s, const int reg) return EC_SUCCESS; #ifdef CONFIG_ACCELGYRO_ICM_COMM_SPI - ret = icm_spi_raw_write(SLAVE_GET_SPI_ADDR(s->i2c_spi_addr_flags), + ret = icm_spi_raw_write(ACCEL_GET_SPI_ADDR(s->i2c_spi_addr_flags), ICM426XX_REG_BANK_SEL, &bank, 1); #else ret = i2c_write8(s->port, s->i2c_spi_addr_flags, ICM426XX_REG_BANK_SEL, @@ -85,7 +85,7 @@ int icm_read8(const struct motion_sensor_t *s, const int reg, int *data_ptr) uint8_t val; ret = icm_spi_raw_read( - SLAVE_GET_SPI_ADDR(s->i2c_spi_addr_flags), addr, &val, + ACCEL_GET_SPI_ADDR(s->i2c_spi_addr_flags), addr, &val, sizeof(val)); if (ret == EC_SUCCESS) *data_ptr = val; @@ -114,7 +114,7 @@ int icm_write8(const struct motion_sensor_t *s, const int reg, int data) uint8_t val = data; ret = icm_spi_raw_write( - SLAVE_GET_SPI_ADDR(s->i2c_spi_addr_flags), addr, &val, + ACCEL_GET_SPI_ADDR(s->i2c_spi_addr_flags), addr, &val, sizeof(val)); } #else @@ -141,7 +141,7 @@ int icm_read16(const struct motion_sensor_t *s, const int reg, int *data_ptr) uint8_t val[2]; ret = icm_spi_raw_read( - SLAVE_GET_SPI_ADDR(s->i2c_spi_addr_flags), addr, val, + ACCEL_GET_SPI_ADDR(s->i2c_spi_addr_flags), addr, val, sizeof(val)); if (ret == EC_SUCCESS) { if (I2C_IS_BIG_ENDIAN(s->i2c_spi_addr_flags)) @@ -182,7 +182,7 @@ int icm_write16(const struct motion_sensor_t *s, const int reg, int data) val[1] = (data >> 8) & 0xFF; } ret = icm_spi_raw_write( - SLAVE_GET_SPI_ADDR(s->i2c_spi_addr_flags), addr, val, + ACCEL_GET_SPI_ADDR(s->i2c_spi_addr_flags), addr, val, sizeof(val)); } #else @@ -206,7 +206,7 @@ int icm_read_n(const struct motion_sensor_t *s, const int reg, return ret; #ifdef CONFIG_ACCELGYRO_ICM_COMM_SPI - ret = icm_spi_raw_read(SLAVE_GET_SPI_ADDR(s->i2c_spi_addr_flags), addr, + ret = icm_spi_raw_read(ACCEL_GET_SPI_ADDR(s->i2c_spi_addr_flags), addr, data_ptr, len); #else ret = i2c_read_block(s->port, s->i2c_spi_addr_flags, addr, data_ptr, @@ -232,7 +232,7 @@ int icm_field_update8(const struct motion_sensor_t *s, const int reg, uint8_t val; ret = icm_spi_raw_read( - SLAVE_GET_SPI_ADDR(s->i2c_spi_addr_flags), addr, &val, + ACCEL_GET_SPI_ADDR(s->i2c_spi_addr_flags), addr, &val, sizeof(val)); if (ret != EC_SUCCESS) return ret; @@ -240,7 +240,7 @@ int icm_field_update8(const struct motion_sensor_t *s, const int reg, val = (val & (~field_mask)) | set_value; ret = icm_spi_raw_write( - SLAVE_GET_SPI_ADDR(s->i2c_spi_addr_flags), addr, &val, + ACCEL_GET_SPI_ADDR(s->i2c_spi_addr_flags), addr, &val, sizeof(val)); } #else diff --git a/include/motion_sense.h b/include/motion_sense.h index 29ac220395..e507a3c799 100644 --- a/include/motion_sense.h +++ b/include/motion_sense.h @@ -78,22 +78,22 @@ enum sensor_config { #define BASE_RANGE(_range) ((_range) & ~ROUND_UP_FLAG) /* - * I2C/SPI Slave Address encoding for motion sensors + * I2C/SPI Address flags encoding for motion sensors * - The generic defines, I2C_ADDR_MASK and I2C_IS_BIG_ENDIAN_MASK * are defined in i2c.h. * - Motion sensors support some sensors on the SPI bus, so this * overloads the I2C Address to use a single bit to indicate * it is a SPI address instead of an I2C. Since SPI does not - * use slave addressing, it is up to the driver to use this + * use peripheral addressing, it is up to the driver to use this * field as it sees fit */ -#define SLAVE_MK_I2C_ADDR_FLAGS(addr) (addr) -#define SLAVE_MK_SPI_ADDR_FLAGS(addr) ((addr) | I2C_FLAG_ADDR_IS_SPI) +#define ACCEL_MK_I2C_ADDR_FLAGS(addr) (addr) +#define ACCEL_MK_SPI_ADDR_FLAGS(addr) ((addr) | I2C_FLAG_ADDR_IS_SPI) -#define SLAVE_GET_I2C_ADDR(addr_flags) (I2C_STRIP_FLAGS(addr_flags)) -#define SLAVE_GET_SPI_ADDR(addr_flags) ((addr_flags) & I2C_ADDR_MASK) +#define ACCEL_GET_I2C_ADDR(addr_flags) (I2C_STRIP_FLAGS(addr_flags)) +#define ACCEL_GET_SPI_ADDR(addr_flags) ((addr_flags) & I2C_ADDR_MASK) -#define SLAVE_IS_SPI(addr_flags) ((addr_flags) & I2C_FLAG_ADDR_IS_SPI) +#define ACCEL_ADDR_IS_SPI(addr_flags) ((addr_flags) & I2C_FLAG_ADDR_IS_SPI) /* * Define the frequency to use in max_frequency based on the maximal frequency @@ -171,7 +171,7 @@ struct motion_sensor_t { /* i2c port */ uint8_t port; - /* i2c address or SPI slave logic GPIO. */ + /* i2c address or SPI port */ uint16_t i2c_spi_addr_flags; /* |