diff options
Diffstat (limited to 'board/reef_mchp/board.c')
-rw-r--r-- | board/reef_mchp/board.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/board/reef_mchp/board.c b/board/reef_mchp/board.c index 206d6dd1d0..3b90eb4934 100644 --- a/board/reef_mchp/board.c +++ b/board/reef_mchp/board.c @@ -283,7 +283,7 @@ struct i2c_stress_test i2c_stress_tests[] = { #ifdef CONFIG_CMD_I2C_STRESS_TEST_TCPC { .port = MCHP_I2C_PORT0, - .addr__7bf = 0x28, + .addr_flags = 0x28, .i2c_test = &anx74xx_i2c_stress_test_dev, }, #endif @@ -291,33 +291,33 @@ struct i2c_stress_test i2c_stress_tests[] = { #ifdef CONFIG_CMD_I2C_STRESS_TEST_TCPC { .port = MCHP_I2C_PORT2, - .addr__7bf = 0x0B, + .addr_flags = 0x0B, .i2c_test = &ps8xxx_i2c_stress_test_dev, }, #endif #ifdef CONFIG_CMD_I2C_STRESS_TEST_ACCEL { .port = I2C_PORT_GYRO, - .addr__7bf = BMI160_ADDR0__7bf, + .addr_flags = BMI160_ADDR0_FLAGS, .i2c_test = &bmi160_i2c_stress_test_dev, }, #endif #ifdef CONFIG_CMD_I2C_STRESS_TEST_ACCEL { .port = I2C_PORT_BARO, - .addr__7bf = BMP280_I2C_ADDRESS1__7bf, + .addr_flags = BMP280_I2C_ADDRESS1_FLAGS, .i2c_test = &bmp280_i2c_stress_test_dev, }, { .port = I2C_PORT_LID_ACCEL, - .addr__7bf = KX022_ADDR1__7bf, + .addr_flags = KX022_ADDR1_FLAGS, .i2c_test = &kionix_i2c_stress_test_dev, }, #endif #ifdef CONFIG_CMD_I2C_STRESS_TEST_ALS { .port = I2C_PORT_ALS, - .addr__7bf = OPT3001_I2C_ADDR1__7bf, + .addr_flags = OPT3001_I2C_ADDR1_FLAGS, .i2c_test = &opt3001_i2c_stress_test_dev, }, #endif @@ -342,7 +342,7 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_COUNT] = { .bus_type = EC_BUS_TYPE_I2C, .i2c_info = { .port = MCHP_I2C_PORT0, - .addr__7bf = 0x28, + .addr_flags = 0x28, }, .drv = &anx74xx_tcpm_drv, }, @@ -350,7 +350,7 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_COUNT] = { .bus_type = EC_BUS_TYPE_I2C, .i2c_info = { .port = MCHP_I2C_PORT2, - .addr__7bf = 0x0B, + .addr_flags = 0x0B, }, .drv = &ps8xxx_tcpm_drv, }, @@ -513,7 +513,7 @@ void board_tcpc_init(void) * address 0x10. Is this another attempt at waking PS8751 * from DRP low power idle mode? */ - i2c_read8__7bf(MCHP_I2C_PORT2, 0x08, 0xA0, ®); + i2c_read8(MCHP_I2C_PORT2, 0x08, 0xA0, ®); /* Enable TCPC0 interrupt */ gpio_enable_interrupt(GPIO_USB_C0_PD_INT_ODL); @@ -961,7 +961,7 @@ struct motion_sensor_t motion_sensors[] = { .mutex = &g_lid_mutex, .drv_data = &g_kx022_data, .port = I2C_PORT_LID_ACCEL, - .i2c_spi_addr__7bf = KX022_ADDR1__7bf, + .i2c_spi_addr_flags = KX022_ADDR1_FLAGS, .rot_standard_ref = NULL, /* Identity matrix. */ .default_range = 2, /* g, enough for laptop. */ .min_frequency = KX022_ACCEL_MIN_FREQ, @@ -988,7 +988,7 @@ struct motion_sensor_t motion_sensors[] = { .mutex = &g_base_mutex, .drv_data = &g_bmi160_data, .port = I2C_PORT_GYRO, - .i2c_spi_addr__7bf = BMI160_ADDR0__7bf, + .i2c_spi_addr_flags = BMI160_ADDR0_FLAGS, .rot_standard_ref = &base_standard_ref, .default_range = 2, /* g, enough for laptop. */ .min_frequency = BMI160_ACCEL_MIN_FREQ, @@ -1017,7 +1017,7 @@ struct motion_sensor_t motion_sensors[] = { .mutex = &g_base_mutex, .drv_data = &g_bmi160_data, .port = I2C_PORT_GYRO, - .i2c_spi_addr__7bf = BMI160_ADDR0__7bf, + .i2c_spi_addr_flags = BMI160_ADDR0_FLAGS, .default_range = 1000, /* dps */ .rot_standard_ref = &base_standard_ref, .min_frequency = BMI160_GYRO_MIN_FREQ, @@ -1033,7 +1033,7 @@ struct motion_sensor_t motion_sensors[] = { .mutex = &g_base_mutex, .drv_data = &g_bmi160_data, .port = I2C_PORT_GYRO, - .i2c_spi_addr__7bf = BMI160_ADDR0__7bf, + .i2c_spi_addr_flags = BMI160_ADDR0_FLAGS, .default_range = BIT(11), /* 16LSB / uT, fixed */ .rot_standard_ref = &mag_standard_ref, .min_frequency = BMM150_MAG_MIN_FREQ, @@ -1048,7 +1048,7 @@ struct motion_sensor_t motion_sensors[] = { .drv = &bmp280_drv, .drv_data = &bmp280_drv_data, .port = I2C_PORT_BARO, - .i2c_spi_addr__7bf = BMP280_I2C_ADDRESS1__7bf, + .i2c_spi_addr_flags = BMP280_I2C_ADDRESS1_FLAGS, .default_range = BIT(18), /* 1bit = 4 Pa, 16bit ~= 2600 hPa */ .min_frequency = BMP280_BARO_MIN_FREQ, .max_frequency = BMP280_BARO_MAX_FREQ, @@ -1062,7 +1062,7 @@ struct motion_sensor_t motion_sensors[] = { .drv = &opt3001_drv, .drv_data = &g_opt3001_data, .port = I2C_PORT_ALS, - .i2c_spi_addr__7bf = OPT3001_I2C_ADDR1__7bf, + .i2c_spi_addr_flags = OPT3001_I2C_ADDR1_FLAGS, .rot_standard_ref = NULL, .default_range = 0x10000, /* scale = 1; uscale = 0 */ .min_frequency = OPT3001_LIGHT_MIN_FREQ, |