Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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>
authored by
Shree Ramamoorthy
and committed by
Mark Brown
8c04144e
5410aa3a
+21
-16
+21
-16
drivers/regulator/tps65219-regulator.c
+21
-16
drivers/regulator/tps65219-regulator.c
···
125
125
REGULATOR_LINEAR_RANGE(3400000, 0x34, 0x3f, 0),
126
126
};
127
127
128
-
static const struct linear_range ldos_1_2_ranges[] = {
128
+
static const struct linear_range ldo_1_range[] = {
129
129
REGULATOR_LINEAR_RANGE(600000, 0x0, 0x37, 50000),
130
130
REGULATOR_LINEAR_RANGE(3400000, 0x38, 0x3f, 0),
131
131
};
132
132
133
-
static const struct linear_range ldos_3_4_ranges[] = {
133
+
static const struct linear_range tps65219_ldo_2_range[] = {
134
+
REGULATOR_LINEAR_RANGE(600000, 0x0, 0x37, 50000),
135
+
REGULATOR_LINEAR_RANGE(3400000, 0x38, 0x3f, 0),
136
+
};
137
+
138
+
static const struct linear_range tps65219_ldos_3_4_range[] = {
134
139
REGULATOR_LINEAR_RANGE(1200000, 0x0, 0xC, 0),
135
140
REGULATOR_LINEAR_RANGE(1250000, 0xD, 0x35, 50000),
136
141
REGULATOR_LINEAR_RANGE(3300000, 0x36, 0x3F, 0),
···
179
174
}
180
175
181
176
/* Operations permitted on BUCK1/2/3 */
182
-
static const struct regulator_ops tps65219_bucks_ops = {
177
+
static const struct regulator_ops bucks_ops = {
183
178
.is_enabled = regulator_is_enabled_regmap,
184
179
.enable = regulator_enable_regmap,
185
180
.disable = regulator_disable_regmap,
···
194
189
};
195
190
196
191
/* Operations permitted on LDO1/2 */
197
-
static const struct regulator_ops tps65219_ldos_1_2_ops = {
192
+
static const struct regulator_ops ldos_1_2_ops = {
198
193
.is_enabled = regulator_is_enabled_regmap,
199
194
.enable = regulator_enable_regmap,
200
195
.disable = regulator_disable_regmap,
···
209
204
};
210
205
211
206
/* Operations permitted on LDO3/4 */
212
-
static const struct regulator_ops tps65219_ldos_3_4_ops = {
207
+
static const struct regulator_ops ldos_3_4_ops = {
213
208
.is_enabled = regulator_is_enabled_regmap,
214
209
.enable = regulator_enable_regmap,
215
210
.disable = regulator_disable_regmap,
···
223
218
224
219
static const struct regulator_desc regulators[] = {
225
220
TPS65219_REGULATOR("BUCK1", "buck1", TPS65219_BUCK_1,
226
-
REGULATOR_VOLTAGE, tps65219_bucks_ops, 64,
221
+
REGULATOR_VOLTAGE, bucks_ops, 64,
227
222
TPS65219_REG_BUCK1_VOUT,
228
223
TPS65219_BUCKS_LDOS_VOUT_VSET_MASK,
229
224
TPS65219_REG_ENABLE_CTRL,
230
225
TPS65219_ENABLE_BUCK1_EN_MASK, 0, 0, bucks_ranges,
231
226
3, 4000, 0, NULL, 0, 0),
232
227
TPS65219_REGULATOR("BUCK2", "buck2", TPS65219_BUCK_2,
233
-
REGULATOR_VOLTAGE, tps65219_bucks_ops, 64,
228
+
REGULATOR_VOLTAGE, bucks_ops, 64,
234
229
TPS65219_REG_BUCK2_VOUT,
235
230
TPS65219_BUCKS_LDOS_VOUT_VSET_MASK,
236
231
TPS65219_REG_ENABLE_CTRL,
237
232
TPS65219_ENABLE_BUCK2_EN_MASK, 0, 0, bucks_ranges,
238
233
3, 4000, 0, NULL, 0, 0),
239
234
TPS65219_REGULATOR("BUCK3", "buck3", TPS65219_BUCK_3,
240
-
REGULATOR_VOLTAGE, tps65219_bucks_ops, 64,
235
+
REGULATOR_VOLTAGE, bucks_ops, 64,
241
236
TPS65219_REG_BUCK3_VOUT,
242
237
TPS65219_BUCKS_LDOS_VOUT_VSET_MASK,
243
238
TPS65219_REG_ENABLE_CTRL,
244
239
TPS65219_ENABLE_BUCK3_EN_MASK, 0, 0, bucks_ranges,
245
240
3, 0, 0, NULL, 0, 0),
246
241
TPS65219_REGULATOR("LDO1", "ldo1", TPS65219_LDO_1,
247
-
REGULATOR_VOLTAGE, tps65219_ldos_1_2_ops, 64,
242
+
REGULATOR_VOLTAGE, ldos_1_2_ops, 64,
248
243
TPS65219_REG_LDO1_VOUT,
249
244
TPS65219_BUCKS_LDOS_VOUT_VSET_MASK,
250
245
TPS65219_REG_ENABLE_CTRL,
251
-
TPS65219_ENABLE_LDO1_EN_MASK, 0, 0, ldos_1_2_ranges,
246
+
TPS65219_ENABLE_LDO1_EN_MASK, 0, 0, ldo_1_range,
252
247
2, 0, 0, NULL, 0, TPS65219_LDOS_BYP_CONFIG_MASK),
253
248
TPS65219_REGULATOR("LDO2", "ldo2", TPS65219_LDO_2,
254
-
REGULATOR_VOLTAGE, tps65219_ldos_1_2_ops, 64,
249
+
REGULATOR_VOLTAGE, ldos_1_2_ops, 64,
255
250
TPS65219_REG_LDO2_VOUT,
256
251
TPS65219_BUCKS_LDOS_VOUT_VSET_MASK,
257
252
TPS65219_REG_ENABLE_CTRL,
258
-
TPS65219_ENABLE_LDO2_EN_MASK, 0, 0, ldos_1_2_ranges,
253
+
TPS65219_ENABLE_LDO2_EN_MASK, 0, 0, tps65219_ldo_2_range,
259
254
2, 0, 0, NULL, 0, TPS65219_LDOS_BYP_CONFIG_MASK),
260
255
TPS65219_REGULATOR("LDO3", "ldo3", TPS65219_LDO_3,
261
-
REGULATOR_VOLTAGE, tps65219_ldos_3_4_ops, 64,
256
+
REGULATOR_VOLTAGE, ldos_3_4_ops, 64,
262
257
TPS65219_REG_LDO3_VOUT,
263
258
TPS65219_BUCKS_LDOS_VOUT_VSET_MASK,
264
259
TPS65219_REG_ENABLE_CTRL,
265
-
TPS65219_ENABLE_LDO3_EN_MASK, 0, 0, ldos_3_4_ranges,
260
+
TPS65219_ENABLE_LDO3_EN_MASK, 0, 0, tps65219_ldos_3_4_range,
266
261
3, 0, 0, NULL, 0, 0),
267
262
TPS65219_REGULATOR("LDO4", "ldo4", TPS65219_LDO_4,
268
-
REGULATOR_VOLTAGE, tps65219_ldos_3_4_ops, 64,
263
+
REGULATOR_VOLTAGE, ldos_3_4_ops, 64,
269
264
TPS65219_REG_LDO4_VOUT,
270
265
TPS65219_BUCKS_LDOS_VOUT_VSET_MASK,
271
266
TPS65219_REG_ENABLE_CTRL,
272
-
TPS65219_ENABLE_LDO4_EN_MASK, 0, 0, ldos_3_4_ranges,
267
+
TPS65219_ENABLE_LDO4_EN_MASK, 0, 0, tps65219_ldos_3_4_range,
273
268
3, 0, 0, NULL, 0, 0),
274
269
};
275
270