write in 30M

hc

2024-02-20 ea08eeccae9297f7aabd2ef7f0c2517ac4549acc

 kernel/drivers/regulator/mc13783-regulator.c
..
..
@@ -226,69 +226,69 @@
226
226
 	5500000,
227
227
 };
228
228
 
229
-static struct regulator_ops mc13783_gpo_regulator_ops;
229
+static const struct regulator_ops mc13783_gpo_regulator_ops;
230
230
 
231
-#define MC13783_DEFINE(prefix, name, reg, vsel_reg, voltages)	\
232
-	MC13xxx_DEFINE(MC13783_REG_, name, reg, vsel_reg, voltages, \
231
+#define MC13783_DEFINE(prefix, name, node, reg, vsel_reg, voltages)	\
232
+	MC13xxx_DEFINE(MC13783_REG_, name, node, reg, vsel_reg, voltages, \
233
233
 			mc13xxx_regulator_ops)
234
234
 
235
-#define MC13783_FIXED_DEFINE(prefix, name, reg, voltages)		\
236
-	MC13xxx_FIXED_DEFINE(MC13783_REG_, name, reg, voltages, \
235
+#define MC13783_FIXED_DEFINE(prefix, name, node, reg, voltages)		\
236
+	MC13xxx_FIXED_DEFINE(MC13783_REG_, name, node, reg, voltages,	\
237
237
 			mc13xxx_fixed_regulator_ops)
238
238
 
239
-#define MC13783_GPO_DEFINE(prefix, name, reg, voltages)		\
240
-	MC13xxx_GPO_DEFINE(MC13783_REG_, name, reg, voltages, \
239
+#define MC13783_GPO_DEFINE(prefix, name, node, reg, voltages)		\
240
+	MC13xxx_GPO_DEFINE(MC13783_REG_, name, node, reg, voltages,	\
241
241
 			mc13783_gpo_regulator_ops)
242
242
 
243
-#define MC13783_DEFINE_SW(_name, _reg, _vsel_reg, _voltages)		\
244
-	MC13783_DEFINE(REG, _name, _reg, _vsel_reg, _voltages)
245
-#define MC13783_DEFINE_REGU(_name, _reg, _vsel_reg, _voltages)		\
246
-	MC13783_DEFINE(REG, _name, _reg, _vsel_reg, _voltages)
243
+#define MC13783_DEFINE_SW(_name, _node, _reg, _vsel_reg, _voltages)	\
244
+	MC13783_DEFINE(REG, _name, _node, _reg, _vsel_reg, _voltages)
245
+#define MC13783_DEFINE_REGU(_name, _node, _reg, _vsel_reg, _voltages)	\
246
+	MC13783_DEFINE(REG, _name, _node, _reg, _vsel_reg, _voltages)
247
247
 
248
248
 static struct mc13xxx_regulator mc13783_regulators[] = {
249
-	MC13783_DEFINE_SW(SW1A, SWITCHERS0, SWITCHERS0, mc13783_sw1x_val),
250
-	MC13783_DEFINE_SW(SW1B, SWITCHERS1, SWITCHERS1, mc13783_sw1x_val),
251
-	MC13783_DEFINE_SW(SW2A, SWITCHERS2, SWITCHERS2, mc13783_sw2x_val),
252
-	MC13783_DEFINE_SW(SW2B, SWITCHERS3, SWITCHERS3, mc13783_sw2x_val),
253
-	MC13783_DEFINE_SW(SW3, SWITCHERS5, SWITCHERS5, mc13783_sw3_val),
249
+	MC13783_DEFINE_SW(SW1A, sw1a, SWITCHERS0, SWITCHERS0, mc13783_sw1x_val),
250
+	MC13783_DEFINE_SW(SW1B, sw1b, SWITCHERS1, SWITCHERS1, mc13783_sw1x_val),
251
+	MC13783_DEFINE_SW(SW2A, sw2a, SWITCHERS2, SWITCHERS2, mc13783_sw2x_val),
252
+	MC13783_DEFINE_SW(SW2B, sw2b, SWITCHERS3, SWITCHERS3, mc13783_sw2x_val),
253
+	MC13783_DEFINE_SW(SW3, sw3, SWITCHERS5, SWITCHERS5, mc13783_sw3_val),
254
254
 
255
-	MC13783_FIXED_DEFINE(REG, VAUDIO, REGULATORMODE0, mc13783_vaudio_val),
256
-	MC13783_FIXED_DEFINE(REG, VIOHI, REGULATORMODE0, mc13783_viohi_val),
257
-	MC13783_DEFINE_REGU(VIOLO, REGULATORMODE0, REGULATORSETTING0,
255
+	MC13783_FIXED_DEFINE(REG, VAUDIO, vaudio, REGULATORMODE0, mc13783_vaudio_val),
256
+	MC13783_FIXED_DEFINE(REG, VIOHI, viohi, REGULATORMODE0, mc13783_viohi_val),
257
+	MC13783_DEFINE_REGU(VIOLO, violo, REGULATORMODE0, REGULATORSETTING0,
258
258
 			    mc13783_violo_val),
259
-	MC13783_DEFINE_REGU(VDIG, REGULATORMODE0, REGULATORSETTING0,
259
+	MC13783_DEFINE_REGU(VDIG, vdig, REGULATORMODE0, REGULATORSETTING0,
260
260
 			    mc13783_vdig_val),
261
-	MC13783_DEFINE_REGU(VGEN, REGULATORMODE0, REGULATORSETTING0,
261
+	MC13783_DEFINE_REGU(VGEN, vgen, REGULATORMODE0, REGULATORSETTING0,
262
262
 			    mc13783_vgen_val),
263
-	MC13783_DEFINE_REGU(VRFDIG, REGULATORMODE0, REGULATORSETTING0,
263
+	MC13783_DEFINE_REGU(VRFDIG, vrfdig, REGULATORMODE0, REGULATORSETTING0,
264
264
 			    mc13783_vrfdig_val),
265
-	MC13783_DEFINE_REGU(VRFREF, REGULATORMODE0, REGULATORSETTING0,
265
+	MC13783_DEFINE_REGU(VRFREF, vrfref, REGULATORMODE0, REGULATORSETTING0,
266
266
 			    mc13783_vrfref_val),
267
-	MC13783_DEFINE_REGU(VRFCP, REGULATORMODE0, REGULATORSETTING0,
267
+	MC13783_DEFINE_REGU(VRFCP, vrfcp, REGULATORMODE0, REGULATORSETTING0,
268
268
 			    mc13783_vrfcp_val),
269
-	MC13783_DEFINE_REGU(VSIM, REGULATORMODE1, REGULATORSETTING0,
269
+	MC13783_DEFINE_REGU(VSIM, vsim, REGULATORMODE1, REGULATORSETTING0,
270
270
 			    mc13783_vsim_val),
271
-	MC13783_DEFINE_REGU(VESIM, REGULATORMODE1, REGULATORSETTING0,
271
+	MC13783_DEFINE_REGU(VESIM, vesim, REGULATORMODE1, REGULATORSETTING0,
272
272
 			    mc13783_vesim_val),
273
-	MC13783_DEFINE_REGU(VCAM, REGULATORMODE1, REGULATORSETTING0,
273
+	MC13783_DEFINE_REGU(VCAM, vcam, REGULATORMODE1, REGULATORSETTING0,
274
274
 			    mc13783_vcam_val),
275
-	MC13783_FIXED_DEFINE(REG, VRFBG, REGULATORMODE1, mc13783_vrfbg_val),
276
-	MC13783_DEFINE_REGU(VVIB, REGULATORMODE1, REGULATORSETTING1,
275
+	MC13783_FIXED_DEFINE(REG, VRFBG, vrfbg, REGULATORMODE1, mc13783_vrfbg_val),
276
+	MC13783_DEFINE_REGU(VVIB, vvib, REGULATORMODE1, REGULATORSETTING1,
277
277
 			    mc13783_vvib_val),
278
-	MC13783_DEFINE_REGU(VRF1, REGULATORMODE1, REGULATORSETTING1,
278
+	MC13783_DEFINE_REGU(VRF1, vrf1, REGULATORMODE1, REGULATORSETTING1,
279
279
 			    mc13783_vrf_val),
280
-	MC13783_DEFINE_REGU(VRF2, REGULATORMODE1, REGULATORSETTING1,
280
+	MC13783_DEFINE_REGU(VRF2, vrf2, REGULATORMODE1, REGULATORSETTING1,
281
281
 			    mc13783_vrf_val),
282
-	MC13783_DEFINE_REGU(VMMC1, REGULATORMODE1, REGULATORSETTING1,
282
+	MC13783_DEFINE_REGU(VMMC1, vmmc1, REGULATORMODE1, REGULATORSETTING1,
283
283
 			    mc13783_vmmc_val),
284
-	MC13783_DEFINE_REGU(VMMC2, REGULATORMODE1, REGULATORSETTING1,
284
+	MC13783_DEFINE_REGU(VMMC2, vmmc2, REGULATORMODE1, REGULATORSETTING1,
285
285
 			    mc13783_vmmc_val),
286
-	MC13783_GPO_DEFINE(REG, GPO1, POWERMISC, mc13783_gpo_val),
287
-	MC13783_GPO_DEFINE(REG, GPO2, POWERMISC, mc13783_gpo_val),
288
-	MC13783_GPO_DEFINE(REG, GPO3, POWERMISC, mc13783_gpo_val),
289
-	MC13783_GPO_DEFINE(REG, GPO4, POWERMISC, mc13783_gpo_val),
290
-	MC13783_GPO_DEFINE(REG, PWGT1SPI, POWERMISC, mc13783_pwgtdrv_val),
291
-	MC13783_GPO_DEFINE(REG, PWGT2SPI, POWERMISC, mc13783_pwgtdrv_val),
286
+	MC13783_GPO_DEFINE(REG, GPO1, gpo1, POWERMISC, mc13783_gpo_val),
287
+	MC13783_GPO_DEFINE(REG, GPO2, gpo1, POWERMISC, mc13783_gpo_val),
288
+	MC13783_GPO_DEFINE(REG, GPO3, gpo1, POWERMISC, mc13783_gpo_val),
289
+	MC13783_GPO_DEFINE(REG, GPO4, gpo1, POWERMISC, mc13783_gpo_val),
290
+	MC13783_GPO_DEFINE(REG, PWGT1SPI, pwgt1spi, POWERMISC, mc13783_pwgtdrv_val),
291
+	MC13783_GPO_DEFINE(REG, PWGT2SPI, pwgt2spi, POWERMISC, mc13783_pwgtdrv_val),
292
292
 };
293
293
 
294
294
 static int mc13783_powermisc_rmw(struct mc13xxx_regulator_priv *priv, u32 mask,
..
..
@@ -380,7 +380,7 @@
380
380
 	return (val & mc13xxx_regulators[id].enable_bit) != 0;
381
381
 }
382
382
 
383
-static struct regulator_ops mc13783_gpo_regulator_ops = {
383
+static const struct regulator_ops mc13783_gpo_regulator_ops = {
384
384
 	.enable = mc13783_gpo_regulator_enable,
385
385
 	.disable = mc13783_gpo_regulator_disable,
386
386
 	.is_enabled = mc13783_gpo_regulator_is_enabled,