diff options
| -rw-r--r-- | board/asurada/board.c | 2 | ||||
| -rw-r--r-- | driver/bc12/mt6360.c | 12 | ||||
| -rw-r--r-- | driver/bc12/mt6360.h | 8 |
3 files changed, 11 insertions, 11 deletions
diff --git a/board/asurada/board.c b/board/asurada/board.c index 9b3b5077eb..9459169b6c 100644 --- a/board/asurada/board.c +++ b/board/asurada/board.c @@ -178,7 +178,7 @@ BUILD_ASSERT(ARRAY_SIZE(adc_channels) == ADC_CH_COUNT); /* BC12 */ const struct mt6360_config_t mt6360_config = { .i2c_port = 0, - .i2c_addr_flags = MT6360_PMU_SLAVE_ADDR_FLAGS, + .i2c_addr_flags = MT6360_PMU_I2C_ADDR_FLAGS, }; const struct pi3usb9201_config_t diff --git a/driver/bc12/mt6360.c b/driver/bc12/mt6360.c index 26925ece03..4bd780190c 100644 --- a/driver/bc12/mt6360.c +++ b/driver/bc12/mt6360.c @@ -280,7 +280,7 @@ struct mt6360_regulator_data regulator_data[MT6360_REGULATOR_COUNT] = { .name = "mt6360_ldo3", .ldo_vosel_table = MT6360_LDO3_VOSEL_TABLE, .ldo_vosel_table_len = ARRAY_SIZE(MT6360_LDO3_VOSEL_TABLE), - .addr = MT6360_LDO_SLAVE_ADDR_FLAGS, + .addr = MT6360_LDO_I2C_ADDR_FLAGS, .reg_en_ctrl2 = MT6360_REG_LDO3_EN_CTRL2, .reg_ctrl3 = MT6360_REG_LDO3_CTRL3, .mask_vosel = MT6360_MASK_LDO3_VOSEL, @@ -291,7 +291,7 @@ struct mt6360_regulator_data regulator_data[MT6360_REGULATOR_COUNT] = { .name = "mt6360_ldo5", .ldo_vosel_table = MT6360_LDO5_VOSEL_TABLE, .ldo_vosel_table_len = ARRAY_SIZE(MT6360_LDO5_VOSEL_TABLE), - .addr = MT6360_LDO_SLAVE_ADDR_FLAGS, + .addr = MT6360_LDO_I2C_ADDR_FLAGS, .reg_en_ctrl2 = MT6360_REG_LDO5_EN_CTRL2, .reg_ctrl3 = MT6360_REG_LDO5_CTRL3, .mask_vosel = MT6360_MASK_LDO5_VOSEL, @@ -302,7 +302,7 @@ struct mt6360_regulator_data regulator_data[MT6360_REGULATOR_COUNT] = { .name = "mt6360_ldo6", .ldo_vosel_table = MT6360_LDO6_VOSEL_TABLE, .ldo_vosel_table_len = ARRAY_SIZE(MT6360_LDO6_VOSEL_TABLE), - .addr = MT6360_PMIC_SLAVE_ADDR_FLAGS, + .addr = MT6360_PMIC_I2C_ADDR_FLAGS, .reg_en_ctrl2 = MT6360_REG_LDO6_EN_CTRL2, .reg_ctrl3 = MT6360_REG_LDO6_CTRL3, .mask_vosel = MT6360_MASK_LDO6_VOSEL, @@ -313,7 +313,7 @@ struct mt6360_regulator_data regulator_data[MT6360_REGULATOR_COUNT] = { .name = "mt6360_ldo7", .ldo_vosel_table = MT6360_LDO7_VOSEL_TABLE, .ldo_vosel_table_len = MT6360_LDO7_VOSEL_TABLE_SIZE, - .addr = MT6360_PMIC_SLAVE_ADDR_FLAGS, + .addr = MT6360_PMIC_I2C_ADDR_FLAGS, .reg_en_ctrl2 = MT6360_REG_LDO7_EN_CTRL2, .reg_ctrl3 = MT6360_REG_LDO7_CTRL3, .mask_vosel = MT6360_MASK_LDO7_VOSEL, @@ -322,7 +322,7 @@ struct mt6360_regulator_data regulator_data[MT6360_REGULATOR_COUNT] = { }, [MT6360_BUCK1] = { .name = "mt6360_buck1", - .addr = MT6360_PMIC_SLAVE_ADDR_FLAGS, + .addr = MT6360_PMIC_I2C_ADDR_FLAGS, .reg_en_ctrl2 = MT6360_REG_BUCK1_EN_CTRL2, .reg_ctrl3 = MT6360_REG_BUCK1_VOSEL, .mask_vosel = MT6360_MASK_BUCK1_VOSEL, @@ -331,7 +331,7 @@ struct mt6360_regulator_data regulator_data[MT6360_REGULATOR_COUNT] = { }, [MT6360_BUCK2] = { .name = "mt6360_buck2", - .addr = MT6360_PMIC_SLAVE_ADDR_FLAGS, + .addr = MT6360_PMIC_I2C_ADDR_FLAGS, .reg_en_ctrl2 = MT6360_REG_BUCK2_EN_CTRL2, .reg_ctrl3 = MT6360_REG_BUCK2_VOSEL, .mask_vosel = MT6360_MASK_BUCK2_VOSEL, diff --git a/driver/bc12/mt6360.h b/driver/bc12/mt6360.h index e5fb47384c..34642967e1 100644 --- a/driver/bc12/mt6360.h +++ b/driver/bc12/mt6360.h @@ -5,10 +5,10 @@ #ifndef __CROS_EC_MT6360_H -#define MT6360_PMU_SLAVE_ADDR_FLAGS 0x34 -#define MT6360_PMIC_SLAVE_ADDR_FLAGS 0x1A -#define MT6360_LDO_SLAVE_ADDR_FLAGS 0x64 -#define MT6360_PD_SLAVE_ADDR_FLAGS 0x4E +#define MT6360_PMU_I2C_ADDR_FLAGS 0x34 +#define MT6360_PMIC_I2C_ADDR_FLAGS 0x1A +#define MT6360_LDO_I2C_ADDR_FLAGS 0x64 +#define MT6360_PD_I2C_ADDR_FLAGS 0x4E #define MT6360_IRQ_MASK 0x0C |