diff options
Diffstat (limited to 'board/helios')
-rw-r--r-- | board/helios/board.c | 16 | ||||
-rw-r--r-- | board/helios/board.h | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/board/helios/board.c b/board/helios/board.c index 6a47979565..033056618f 100644 --- a/board/helios/board.c +++ b/board/helios/board.c @@ -119,7 +119,7 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_COUNT] = { .bus_type = EC_BUS_TYPE_I2C, .i2c_info = { .port = I2C_PORT_TCPC0, - .addr__7bf = PS8751_I2C_ADDR1__7bf, + .addr_flags = PS8751_I2C_ADDR1_FLAGS, }, .drv = &ps8xxx_tcpm_drv, }, @@ -127,7 +127,7 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_COUNT] = { .bus_type = EC_BUS_TYPE_I2C, .i2c_info = { .port = I2C_PORT_TCPC1, - .addr__7bf = PS8751_I2C_ADDR1__7bf, + .addr_flags = PS8751_I2C_ADDR1_FLAGS, }, .drv = &ps8xxx_tcpm_drv, }, @@ -147,12 +147,12 @@ struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_COUNT] = { const struct pi3usb2901_config_t pi3usb2901_bc12_chips[] = { [USB_PD_PORT_TCPC_0] = { .i2c_port = I2C_PORT_PPC0, - .i2c_addr__7bf = PI3USB9201_I2C_ADDR_3__7bf, + .i2c_addr_flags = PI3USB9201_I2C_ADDR_3_FLAGS, }, [USB_PD_PORT_TCPC_1] = { .i2c_port = I2C_PORT_TCPC1, - .i2c_addr__7bf = PI3USB9201_I2C_ADDR_3__7bf, + .i2c_addr_flags = PI3USB9201_I2C_ADDR_3_FLAGS, }, }; @@ -198,7 +198,7 @@ struct motion_sensor_t motion_sensors[] = { .mutex = &g_lid_mutex, .drv_data = &g_bma255_data, .port = I2C_PORT_ACCEL, - .i2c_spi_addr__7bf = BMA2x2_I2C_ADDR1__7bf, + .i2c_spi_addr_flags = BMA2x2_I2C_ADDR1_FLAGS, .rot_standard_ref = &lid_standard_ref, .min_frequency = BMA255_ACCEL_MIN_FREQ, .max_frequency = BMA255_ACCEL_MAX_FREQ, @@ -225,7 +225,7 @@ struct motion_sensor_t motion_sensors[] = { .mutex = &g_base_mutex, .drv_data = &g_bmi160_data, .port = I2C_PORT_ACCEL, - .i2c_spi_addr__7bf = BMI160_ADDR0__7bf, + .i2c_spi_addr_flags = BMI160_ADDR0_FLAGS, .rot_standard_ref = &base_standard_ref, .min_frequency = BMI160_ACCEL_MIN_FREQ, .max_frequency = BMI160_ACCEL_MAX_FREQ, @@ -251,7 +251,7 @@ struct motion_sensor_t motion_sensors[] = { .mutex = &g_base_mutex, .drv_data = &g_bmi160_data, .port = I2C_PORT_ACCEL, - .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, @@ -267,7 +267,7 @@ struct motion_sensor_t motion_sensors[] = { .drv = &opt3001_drv, .drv_data = &g_opt3001_data, .port = I2C_PORT_ACCEL, - .i2c_spi_addr__7bf = OPT3001_I2C_ADDR__7bf, + .i2c_spi_addr_flags = OPT3001_I2C_ADDR_FLAGS, .rot_standard_ref = NULL, .default_range = 0x2b11a1, .min_frequency = OPT3001_LIGHT_MIN_FREQ, diff --git a/board/helios/board.h b/board/helios/board.h index b85299e19d..e609249bd4 100644 --- a/board/helios/board.h +++ b/board/helios/board.h @@ -48,7 +48,7 @@ #define CONFIG_ALS #define ALS_COUNT 1 #define CONFIG_ALS_OPT3001 -#define OPT3001_I2C_ADDR__7bf OPT3001_I2C_ADDR1__7bf +#define OPT3001_I2C_ADDR_FLAGS OPT3001_I2C_ADDR1_FLAGS /* USB Type C and USB PD defines */ #define CONFIG_USB_PD_TCPM_PS8751 |