From e05473b236bb953788f77589907da9731f8d00ca Mon Sep 17 00:00:00 2001 From: Diana Z Date: Mon, 25 Jan 2021 22:08:58 -0700 Subject: COIL: Rename variables in MT6360 driver Rename variables in MT6360 driver to match current i2c naming conventions. BRANCH=None BUG=None TEST=make -j buildall Signed-off-by: Diana Z Change-Id: Ifc7cae2f7cb012e4078c6a348219b51199811cc3 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2649356 Reviewed-by: Daisuke Nojiri --- driver/bc12/mt6360.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'driver/bc12/mt6360.c') 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, -- cgit v1.2.1