regulator: tps65219: Update struct names

Isolate changes that involve renaming to indicate this resource is only for
TPS65219 or if it will be common for both devices. The renames are in
preparation for adding TPS65215 support.

Signed-off-by: Shree Ramamoorthy <s-ramamoorthy@ti.com>
Link: https://patch.msgid.link/20250425205736.76433-2-s-ramamoorthy@ti.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/regulator/tps65219-regulator.c b/drivers/regulator/tps65219-regulator.c
index aa65077f9d4189484412b99cf3c42a8848c3fd17..3c7c3a6d4c15ffe327ea454e15b3baa0d54e5428 100644 (file)
--- a/drivers/regulator/tps65219-regulator.c
+++ b/drivers/regulator/tps65219-regulator.c
@@ -125,12 +125,17 @@ static const struct linear_range bucks_ranges[] = {
        REGULATOR_LINEAR_RANGE(3400000, 0x34, 0x3f, 0),
 };
 
-static const struct linear_range ldos_1_2_ranges[] = {
+static const struct linear_range ldo_1_range[] = {
        REGULATOR_LINEAR_RANGE(600000, 0x0, 0x37, 50000),
        REGULATOR_LINEAR_RANGE(3400000, 0x38, 0x3f, 0),
 };
 
-static const struct linear_range ldos_3_4_ranges[] = {
+static const struct linear_range tps65219_ldo_2_range[] = {
+       REGULATOR_LINEAR_RANGE(600000, 0x0, 0x37, 50000),
+       REGULATOR_LINEAR_RANGE(3400000, 0x38, 0x3f, 0),
+};
+
+static const struct linear_range tps65219_ldos_3_4_range[] = {
        REGULATOR_LINEAR_RANGE(1200000, 0x0, 0xC, 0),
        REGULATOR_LINEAR_RANGE(1250000, 0xD, 0x35, 50000),
        REGULATOR_LINEAR_RANGE(3300000, 0x36, 0x3F, 0),
@@ -174,7 +179,7 @@ static unsigned int tps65219_get_mode(struct regulator_dev *dev)
 }
 
 /* Operations permitted on BUCK1/2/3 */
-static const struct regulator_ops tps65219_bucks_ops = {
+static const struct regulator_ops bucks_ops = {
        .is_enabled             = regulator_is_enabled_regmap,
        .enable                 = regulator_enable_regmap,
        .disable                = regulator_disable_regmap,
@@ -189,7 +194,7 @@ static const struct regulator_ops tps65219_bucks_ops = {
 };
 
 /* Operations permitted on LDO1/2 */
-static const struct regulator_ops tps65219_ldos_1_2_ops = {
+static const struct regulator_ops ldos_1_2_ops = {
        .is_enabled             = regulator_is_enabled_regmap,
        .enable                 = regulator_enable_regmap,
        .disable                = regulator_disable_regmap,
@@ -204,7 +209,7 @@ static const struct regulator_ops tps65219_ldos_1_2_ops = {
 };
 
 /* Operations permitted on LDO3/4 */
-static const struct regulator_ops tps65219_ldos_3_4_ops = {
+static const struct regulator_ops ldos_3_4_ops = {
        .is_enabled             = regulator_is_enabled_regmap,
        .enable                 = regulator_enable_regmap,
        .disable                = regulator_disable_regmap,
@@ -218,53 +223,53 @@ static const struct regulator_ops tps65219_ldos_3_4_ops = {
 
 static const struct regulator_desc regulators[] = {
        TPS65219_REGULATOR("BUCK1", "buck1", TPS65219_BUCK_1,
-                          REGULATOR_VOLTAGE, tps65219_bucks_ops, 64,
+                          REGULATOR_VOLTAGE, bucks_ops, 64,
                           TPS65219_REG_BUCK1_VOUT,
                           TPS65219_BUCKS_LDOS_VOUT_VSET_MASK,
                           TPS65219_REG_ENABLE_CTRL,
                           TPS65219_ENABLE_BUCK1_EN_MASK, 0, 0, bucks_ranges,
                           3, 4000, 0, NULL, 0, 0),
        TPS65219_REGULATOR("BUCK2", "buck2", TPS65219_BUCK_2,
-                          REGULATOR_VOLTAGE, tps65219_bucks_ops, 64,
+                          REGULATOR_VOLTAGE, bucks_ops, 64,
                           TPS65219_REG_BUCK2_VOUT,
                           TPS65219_BUCKS_LDOS_VOUT_VSET_MASK,
                           TPS65219_REG_ENABLE_CTRL,
                           TPS65219_ENABLE_BUCK2_EN_MASK, 0, 0, bucks_ranges,
                           3, 4000, 0, NULL, 0, 0),
        TPS65219_REGULATOR("BUCK3", "buck3", TPS65219_BUCK_3,
-                          REGULATOR_VOLTAGE, tps65219_bucks_ops, 64,
+                          REGULATOR_VOLTAGE, bucks_ops, 64,
                           TPS65219_REG_BUCK3_VOUT,
                           TPS65219_BUCKS_LDOS_VOUT_VSET_MASK,
                           TPS65219_REG_ENABLE_CTRL,
                           TPS65219_ENABLE_BUCK3_EN_MASK, 0, 0, bucks_ranges,
                           3, 0, 0, NULL, 0, 0),
        TPS65219_REGULATOR("LDO1", "ldo1", TPS65219_LDO_1,
-                          REGULATOR_VOLTAGE, tps65219_ldos_1_2_ops, 64,
+                          REGULATOR_VOLTAGE, ldos_1_2_ops, 64,
                           TPS65219_REG_LDO1_VOUT,
                           TPS65219_BUCKS_LDOS_VOUT_VSET_MASK,
                           TPS65219_REG_ENABLE_CTRL,
-                          TPS65219_ENABLE_LDO1_EN_MASK, 0, 0, ldos_1_2_ranges,
+                          TPS65219_ENABLE_LDO1_EN_MASK, 0, 0, ldo_1_range,
                           2, 0, 0, NULL, 0, TPS65219_LDOS_BYP_CONFIG_MASK),
        TPS65219_REGULATOR("LDO2", "ldo2", TPS65219_LDO_2,
-                          REGULATOR_VOLTAGE, tps65219_ldos_1_2_ops, 64,
+                          REGULATOR_VOLTAGE, ldos_1_2_ops, 64,
                           TPS65219_REG_LDO2_VOUT,
                           TPS65219_BUCKS_LDOS_VOUT_VSET_MASK,
                           TPS65219_REG_ENABLE_CTRL,
-                          TPS65219_ENABLE_LDO2_EN_MASK, 0, 0, ldos_1_2_ranges,
+                          TPS65219_ENABLE_LDO2_EN_MASK, 0, 0, tps65219_ldo_2_range,
                           2, 0, 0, NULL, 0, TPS65219_LDOS_BYP_CONFIG_MASK),
        TPS65219_REGULATOR("LDO3", "ldo3", TPS65219_LDO_3,
-                          REGULATOR_VOLTAGE, tps65219_ldos_3_4_ops, 64,
+                          REGULATOR_VOLTAGE, ldos_3_4_ops, 64,
                           TPS65219_REG_LDO3_VOUT,
                           TPS65219_BUCKS_LDOS_VOUT_VSET_MASK,
                           TPS65219_REG_ENABLE_CTRL,
-                          TPS65219_ENABLE_LDO3_EN_MASK, 0, 0, ldos_3_4_ranges,
+                          TPS65219_ENABLE_LDO3_EN_MASK, 0, 0, tps65219_ldos_3_4_range,
                           3, 0, 0, NULL, 0, 0),
        TPS65219_REGULATOR("LDO4", "ldo4", TPS65219_LDO_4,
-                          REGULATOR_VOLTAGE, tps65219_ldos_3_4_ops, 64,
+                          REGULATOR_VOLTAGE, ldos_3_4_ops, 64,
                           TPS65219_REG_LDO4_VOUT,
                           TPS65219_BUCKS_LDOS_VOUT_VSET_MASK,
                           TPS65219_REG_ENABLE_CTRL,
-                          TPS65219_ENABLE_LDO4_EN_MASK, 0, 0, ldos_3_4_ranges,
+                          TPS65219_ENABLE_LDO4_EN_MASK, 0, 0, tps65219_ldos_3_4_range,
                           3, 0, 0, NULL, 0, 0),
 };