Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
regulator: bd96801: Drop IC name from the IRQ resources
The resources generated in the BD96801 MFD driver are only visible to
the sub-drivers whose resource fields they are added. This makes
abbreviating the resource name with the IC name pointless. It just adds
confusion in those sub-drivers which do not really care the exact model
that generates the IRQ but just want to know the purpose IRQ was
generated for. Thus, as a preparatory fix to simplify adding support for
ROHM BD96802 PMIC the IC name "bd96801-" prefix was dropped from the IRQ
resource names. Adapt the regulator driver to this change.
Signed-off-by: Matti Vaittinen <mazziesaccount@gmail.com>
Reviewed-by: Mark Brown <broonie@kernel.org>
Acked-by: Conor Dooley <conor.dooley@microchip.com>
Link: https://lore.kernel.org/r/73ec2425655ab19c9f0cf990419641ad36561590.1744090658.git.mazziesaccount@gmail.com
Signed-off-by: Lee Jones <lee@kernel.org>
authored by
Matti Vaittinen
and committed by
Lee Jones
9cc95754
d082571f
+40
-43
+40
-43
drivers/regulator/bd96801-regulator.c
+40
-43
drivers/regulator/bd96801-regulator.c
···
198
198
199
199
static const struct bd96801_irqinfo buck1_irqinfo[] = {
200
200
BD96801_IRQINFO(BD96801_PROT_OCP, "buck1-over-curr-h", 500,
201
-
"bd96801-buck1-overcurr-h"),
201
+
"buck1-overcurr-h"),
202
202
BD96801_IRQINFO(BD96801_PROT_OCP, "buck1-over-curr-l", 500,
203
-
"bd96801-buck1-overcurr-l"),
203
+
"buck1-overcurr-l"),
204
204
BD96801_IRQINFO(BD96801_PROT_OCP, "buck1-over-curr-n", 500,
205
-
"bd96801-buck1-overcurr-n"),
205
+
"buck1-overcurr-n"),
206
206
BD96801_IRQINFO(BD96801_PROT_OVP, "buck1-over-voltage", 500,
207
-
"bd96801-buck1-overvolt"),
207
+
"buck1-overvolt"),
208
208
BD96801_IRQINFO(BD96801_PROT_UVP, "buck1-under-voltage", 500,
209
-
"bd96801-buck1-undervolt"),
209
+
"buck1-undervolt"),
210
210
BD96801_IRQINFO(BD96801_PROT_TEMP, "buck1-over-temp", 500,
211
-
"bd96801-buck1-thermal")
211
+
"buck1-thermal")
212
212
};
213
213
214
214
static const struct bd96801_irqinfo buck2_irqinfo[] = {
215
215
BD96801_IRQINFO(BD96801_PROT_OCP, "buck2-over-curr-h", 500,
216
-
"bd96801-buck2-overcurr-h"),
216
+
"buck2-overcurr-h"),
217
217
BD96801_IRQINFO(BD96801_PROT_OCP, "buck2-over-curr-l", 500,
218
-
"bd96801-buck2-overcurr-l"),
218
+
"buck2-overcurr-l"),
219
219
BD96801_IRQINFO(BD96801_PROT_OCP, "buck2-over-curr-n", 500,
220
-
"bd96801-buck2-overcurr-n"),
220
+
"buck2-overcurr-n"),
221
221
BD96801_IRQINFO(BD96801_PROT_OVP, "buck2-over-voltage", 500,
222
-
"bd96801-buck2-overvolt"),
222
+
"buck2-overvolt"),
223
223
BD96801_IRQINFO(BD96801_PROT_UVP, "buck2-under-voltage", 500,
224
-
"bd96801-buck2-undervolt"),
224
+
"buck2-undervolt"),
225
225
BD96801_IRQINFO(BD96801_PROT_TEMP, "buck2-over-temp", 500,
226
-
"bd96801-buck2-thermal")
226
+
"buck2-thermal")
227
227
};
228
228
229
229
static const struct bd96801_irqinfo buck3_irqinfo[] = {
230
230
BD96801_IRQINFO(BD96801_PROT_OCP, "buck3-over-curr-h", 500,
231
-
"bd96801-buck3-overcurr-h"),
231
+
"buck3-overcurr-h"),
232
232
BD96801_IRQINFO(BD96801_PROT_OCP, "buck3-over-curr-l", 500,
233
-
"bd96801-buck3-overcurr-l"),
233
+
"buck3-overcurr-l"),
234
234
BD96801_IRQINFO(BD96801_PROT_OCP, "buck3-over-curr-n", 500,
235
-
"bd96801-buck3-overcurr-n"),
235
+
"buck3-overcurr-n"),
236
236
BD96801_IRQINFO(BD96801_PROT_OVP, "buck3-over-voltage", 500,
237
-
"bd96801-buck3-overvolt"),
237
+
"buck3-overvolt"),
238
238
BD96801_IRQINFO(BD96801_PROT_UVP, "buck3-under-voltage", 500,
239
-
"bd96801-buck3-undervolt"),
239
+
"buck3-undervolt"),
240
240
BD96801_IRQINFO(BD96801_PROT_TEMP, "buck3-over-temp", 500,
241
-
"bd96801-buck3-thermal")
241
+
"buck3-thermal")
242
242
};
243
243
244
244
static const struct bd96801_irqinfo buck4_irqinfo[] = {
245
245
BD96801_IRQINFO(BD96801_PROT_OCP, "buck4-over-curr-h", 500,
246
-
"bd96801-buck4-overcurr-h"),
246
+
"buck4-overcurr-h"),
247
247
BD96801_IRQINFO(BD96801_PROT_OCP, "buck4-over-curr-l", 500,
248
-
"bd96801-buck4-overcurr-l"),
248
+
"buck4-overcurr-l"),
249
249
BD96801_IRQINFO(BD96801_PROT_OCP, "buck4-over-curr-n", 500,
250
-
"bd96801-buck4-overcurr-n"),
250
+
"buck4-overcurr-n"),
251
251
BD96801_IRQINFO(BD96801_PROT_OVP, "buck4-over-voltage", 500,
252
-
"bd96801-buck4-overvolt"),
252
+
"buck4-overvolt"),
253
253
BD96801_IRQINFO(BD96801_PROT_UVP, "buck4-under-voltage", 500,
254
-
"bd96801-buck4-undervolt"),
254
+
"buck4-undervolt"),
255
255
BD96801_IRQINFO(BD96801_PROT_TEMP, "buck4-over-temp", 500,
256
-
"bd96801-buck4-thermal")
256
+
"buck4-thermal")
257
257
};
258
258
259
259
static const struct bd96801_irqinfo ldo5_irqinfo[] = {
260
260
BD96801_IRQINFO(BD96801_PROT_OCP, "ldo5-overcurr", 500,
261
-
"bd96801-ldo5-overcurr"),
261
+
"ldo5-overcurr"),
262
262
BD96801_IRQINFO(BD96801_PROT_OVP, "ldo5-over-voltage", 500,
263
-
"bd96801-ldo5-overvolt"),
263
+
"ldo5-overvolt"),
264
264
BD96801_IRQINFO(BD96801_PROT_UVP, "ldo5-under-voltage", 500,
265
-
"bd96801-ldo5-undervolt"),
265
+
"ldo5-undervolt"),
266
266
};
267
267
268
268
static const struct bd96801_irqinfo ldo6_irqinfo[] = {
269
269
BD96801_IRQINFO(BD96801_PROT_OCP, "ldo6-overcurr", 500,
270
-
"bd96801-ldo6-overcurr"),
270
+
"ldo6-overcurr"),
271
271
BD96801_IRQINFO(BD96801_PROT_OVP, "ldo6-over-voltage", 500,
272
-
"bd96801-ldo6-overvolt"),
272
+
"ldo6-overvolt"),
273
273
BD96801_IRQINFO(BD96801_PROT_UVP, "ldo6-under-voltage", 500,
274
-
"bd96801-ldo6-undervolt"),
274
+
"ldo6-undervolt"),
275
275
};
276
276
277
277
static const struct bd96801_irqinfo ldo7_irqinfo[] = {
278
278
BD96801_IRQINFO(BD96801_PROT_OCP, "ldo7-overcurr", 500,
279
-
"bd96801-ldo7-overcurr"),
279
+
"ldo7-overcurr"),
280
280
BD96801_IRQINFO(BD96801_PROT_OVP, "ldo7-over-voltage", 500,
281
-
"bd96801-ldo7-overvolt"),
281
+
"ldo7-overvolt"),
282
282
BD96801_IRQINFO(BD96801_PROT_UVP, "ldo7-under-voltage", 500,
283
-
"bd96801-ldo7-undervolt"),
283
+
"ldo7-undervolt"),
284
284
};
285
285
286
286
struct bd96801_irq_desc {
···
741
741
int i;
742
742
void *retp;
743
743
static const char * const single_out_errb_irqs[] = {
744
-
"bd96801-%s-pvin-err", "bd96801-%s-ovp-err",
745
-
"bd96801-%s-uvp-err", "bd96801-%s-shdn-err",
744
+
"%s-pvin-err", "%s-ovp-err", "%s-uvp-err", "%s-shdn-err",
746
745
};
747
746
748
747
for (i = 0; i < ARRAY_SIZE(single_out_errb_irqs); i++) {
···
778
779
int i, num_irqs;
779
780
void *retp;
780
781
static const char * const global_errb_irqs[] = {
781
-
"bd96801-otp-err", "bd96801-dbist-err", "bd96801-eep-err",
782
-
"bd96801-abist-err", "bd96801-prstb-err", "bd96801-drmoserr1",
783
-
"bd96801-drmoserr2", "bd96801-slave-err", "bd96801-vref-err",
784
-
"bd96801-tsd", "bd96801-uvlo-err", "bd96801-ovlo-err",
785
-
"bd96801-osc-err", "bd96801-pon-err", "bd96801-poff-err",
786
-
"bd96801-cmd-shdn-err", "bd96801-int-shdn-err"
782
+
"otp-err", "dbist-err", "eep-err", "abist-err", "prstb-err",
783
+
"drmoserr1", "drmoserr2", "slave-err", "vref-err", "tsd",
784
+
"uvlo-err", "ovlo-err", "osc-err", "pon-err", "poff-err",
785
+
"cmd-shdn-err", "int-shdn-err"
787
786
};
788
787
789
788
num_irqs = ARRAY_SIZE(global_errb_irqs);
···
953
956
if (temp_notif_ldos) {
954
957
int irq;
955
958
struct regulator_irq_desc tw_desc = {
956
-
.name = "bd96801-core-thermal",
959
+
.name = "core-thermal",
957
960
.irq_off_ms = 500,
958
961
.map_event = ldo_map_notif,
959
962
};
960
963
961
-
irq = platform_get_irq_byname(pdev, "bd96801-core-thermal");
964
+
irq = platform_get_irq_byname(pdev, "core-thermal");
962
965
if (irq < 0)
963
966
return irq;
964
967