diff options
| author | Denis Brockus <dbrockus@chromium.org> | 2019-07-16 15:10:11 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-07-20 23:09:18 +0000 |
| commit | 473bd883b60fd5b00377766dae2bacad246de0d2 (patch) | |
| tree | 992d9f03104277934c22c869eceb634e2cf5f7ec /board/flapjack | |
| parent | 053491b560d2c4e374bb739373d8ae25c41f6315 (diff) | |
| download | chrome-ec-473bd883b60fd5b00377766dae2bacad246de0d2.tar.gz | |
Remove __7b, __8b and __7bf
The extentions were added to make the compiler perform most
of the verification that the conversion was being done correctly
to remove 8bit addressing as the standard I2C/SPI address type.
Now that the compiler has verified the code, the extra
extentions are being removed
BUG=chromium:971296
BRANCH=none
TEST=make buildall -j
TEST=verify sensor functionality on arcada_ish
Change-Id: I36894f8bb9daefb5b31b5e91577708f6f9af2a4f
Signed-off-by: Denis Brockus <dbrockus@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1704792
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
Diffstat (limited to 'board/flapjack')
| -rw-r--r-- | board/flapjack/battery.c | 4 | ||||
| -rw-r--r-- | board/flapjack/board.c | 14 | ||||
| -rw-r--r-- | board/flapjack/board.h | 4 |
3 files changed, 11 insertions, 11 deletions
diff --git a/board/flapjack/battery.c b/board/flapjack/battery.c index 5bb6b07a9f..981edea013 100644 --- a/board/flapjack/battery.c +++ b/board/flapjack/battery.c @@ -398,10 +398,10 @@ int charger_profile_override(struct charge_state_data *curr) * Pull down WPC VBUS. Need to use raw i2c APIs because RO * doesn't have p9221 driver. If WPC is off, this is a no-op. */ - if (i2c_read_offset16__7bf(I2C_PORT_WPC, P9221_R7_ADDR__7bf, + if (i2c_read_offset16(I2C_PORT_WPC, P9221_R7_ADDR_FLAGS, P9221R7_VOUT_SET_REG, &val, 1) == EC_SUCCESS && val * 100 != wpc_mv) - i2c_write_offset16__7bf(I2C_PORT_WPC, P9221_R7_ADDR__7bf, + i2c_write_offset16(I2C_PORT_WPC, P9221_R7_ADDR_FLAGS, P9221R7_VOUT_SET_REG, wpc_mv / 100, 1); if ((curr->batt.flags & BATT_FLAG_BAD_TEMPERATURE) || diff --git a/board/flapjack/board.c b/board/flapjack/board.c index fcbf71938c..7ea93796be 100644 --- a/board/flapjack/board.c +++ b/board/flapjack/board.c @@ -138,11 +138,11 @@ static void board_setup_panel(void) dim = sku & SKU_ID_PANEL_SIZE_MASK ? 0xc4 : 0xc8; } - rv |= i2c_write8__7bf(I2C_PORT_CHARGER, RT946X_ADDR__7bf, + rv |= i2c_write8(I2C_PORT_CHARGER, RT946X_ADDR_FLAGS, MT6370_BACKLIGHT_BLEN, channel); - rv |= i2c_write8__7bf(I2C_PORT_CHARGER, RT946X_ADDR__7bf, + rv |= i2c_write8(I2C_PORT_CHARGER, RT946X_ADDR_FLAGS, MT6370_BACKLIGHT_BLDIM, dim); - rv |= i2c_write8__7bf(I2C_PORT_CHARGER, RT946X_ADDR__7bf, + rv |= i2c_write8(I2C_PORT_CHARGER, RT946X_ADDR_FLAGS, MT6370_BACKLIGHT_BLPWM, 0xac); if (rv) CPRINTS("Board setup panel failed"); @@ -288,7 +288,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 = MT6370_TCPC_I2C_ADDR__7bf, + .addr_flags = MT6370_TCPC_I2C_ADDR_FLAGS, }, .drv = &mt6370_tcpm_drv}, }; @@ -500,7 +500,7 @@ struct motion_sensor_t motion_sensors[] = { .mutex = &g_lid_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 = &lid_standard_ref, .default_range = 4, /* g */ .min_frequency = BMI160_ACCEL_MIN_FREQ, @@ -523,7 +523,7 @@ struct motion_sensor_t motion_sensors[] = { .mutex = &g_lid_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 = &lid_standard_ref, .min_frequency = BMI160_GYRO_MIN_FREQ, @@ -538,7 +538,7 @@ struct motion_sensor_t motion_sensors[] = { .drv = &tcs3400_drv, .drv_data = &g_tcs3400_data, .port = I2C_PORT_ALS, - .i2c_spi_addr__7bf = TCS3400_I2C_ADDR__7bf, + .i2c_spi_addr_flags = TCS3400_I2C_ADDR_FLAGS, .rot_standard_ref = NULL, .default_range = 0x10000, /* scale = 1x, uscale = 0 */ .min_frequency = TCS3400_LIGHT_MIN_FREQ, diff --git a/board/flapjack/board.h b/board/flapjack/board.h index 13a010f416..e76a82f444 100644 --- a/board/flapjack/board.h +++ b/board/flapjack/board.h @@ -225,10 +225,10 @@ #define I2C_PORT_EEPROM 1 /* I2C addresses */ -#define I2C_ADDR_EEPROM__7bf 0x50 +#define I2C_ADDR_EEPROM_FLAGS 0x50 /* Route sbs host requests to virtual battery driver */ -#define VIRTUAL_BATTERY_ADDR__7bf 0x0B +#define VIRTUAL_BATTERY_ADDR_FLAGS 0x0B /* Enable Accel over SPI */ #define CONFIG_SPI_ACCEL_PORT 0 /* The first SPI master port (SPI2) */ |