aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/regulator
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-08-01 18:36:01 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2016-08-01 18:36:01 -0400
commit43a0a98aa8da71583f84b84fd72e265c24d4c5f8 (patch)
tree3830aff2b36f48a67be5f485f00f56cf4269729d /drivers/regulator
parent6911a5281430cf6897376487698504620f454791 (diff)
parentf8c6d88b2c874295f49b9ad1ca0826b9a8ef3180 (diff)
Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC driver updates from Olof Johansson: "Driver updates for ARM SoCs. A slew of changes this release cycle. The reset driver tree, that we merge through arm-soc for historical reasons, is also sizable this time around. Among the changes: - clps711x: Treewide changes to compatible strings, merged here for simplicity. - Qualcomm: SCM firmware driver cleanups, move to platform driver - ux500: Major cleanups, removal of old mach-specific infrastructure. - Atmel external bus memory driver - Move of brcmstb platform to the rest of bcm - PMC driver updates for tegra, various fixes and improvements - Samsung platform driver updates to support 64-bit Exynos platforms - Reset controller cleanups moving to devm_reset_controller_register() APIs - Reset controller driver for Amlogic Meson - Reset controller driver for Hisilicon hi6220 - ARM SCPI power domain support" * tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (100 commits) ARM: ux500: consolidate base platform files ARM: ux500: move soc_id driver to drivers/soc ARM: ux500: call ux500_setup_id later ARM: ux500: consolidate soc_device code in id.c ARM: ux500: remove cpu_is_u* helpers ARM: ux500: use CLK_OF_DECLARE() ARM: ux500: move l2x0 init to .init_irq mfd: db8500 stop passing around platform data ASoC: ab8500-codec: remove platform data based probe ARM: ux500: move ab8500_regulator_plat_data into driver ARM: ux500: remove unused regulator data soc: raspberrypi-power: add CONFIG_OF dependency firmware: scpi: add CONFIG_OF dependency video: clps711x-fb: Changing the compatibility string to match with the smallest supported chip input: clps711x-keypad: Changing the compatibility string to match with the smallest supported chip pwm: clps711x: Changing the compatibility string to match with the smallest supported chip serial: clps711x: Changing the compatibility string to match with the smallest supported chip irqchip: clps711x: Changing the compatibility string to match with the smallest supported chip clocksource: clps711x: Changing the compatibility string to match with the smallest supported chip clk: clps711x: Changing the compatibility string to match with the smallest supported chip ...
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/ab8500-ext.c465
1 files changed, 451 insertions, 14 deletions
diff --git a/drivers/regulator/ab8500-ext.c b/drivers/regulator/ab8500-ext.c
index 84c1ee39ddae..2ca00045eb99 100644
--- a/drivers/regulator/ab8500-ext.c
+++ b/drivers/regulator/ab8500-ext.c
@@ -25,6 +25,456 @@
25#include <linux/mfd/abx500/ab8500.h> 25#include <linux/mfd/abx500/ab8500.h>
26#include <linux/regulator/ab8500.h> 26#include <linux/regulator/ab8500.h>
27 27
28static struct regulator_consumer_supply ab8500_vaux1_consumers[] = {
29 /* Main display, u8500 R3 uib */
30 REGULATOR_SUPPLY("vddi", "mcde_disp_sony_acx424akp.0"),
31 /* Main display, u8500 uib and ST uib */
32 REGULATOR_SUPPLY("vdd1", "samsung_s6d16d0.0"),
33 /* Secondary display, ST uib */
34 REGULATOR_SUPPLY("vdd1", "samsung_s6d16d0.1"),
35 /* SFH7741 proximity sensor */
36 REGULATOR_SUPPLY("vcc", "gpio-keys.0"),
37 /* BH1780GLS ambient light sensor */
38 REGULATOR_SUPPLY("vcc", "2-0029"),
39 /* lsm303dlh accelerometer */
40 REGULATOR_SUPPLY("vdd", "2-0018"),
41 /* lsm303dlhc accelerometer */
42 REGULATOR_SUPPLY("vdd", "2-0019"),
43 /* lsm303dlh magnetometer */
44 REGULATOR_SUPPLY("vdd", "2-001e"),
45 /* Rohm BU21013 Touchscreen devices */
46 REGULATOR_SUPPLY("avdd", "3-005c"),
47 REGULATOR_SUPPLY("avdd", "3-005d"),
48 /* Synaptics RMI4 Touchscreen device */
49 REGULATOR_SUPPLY("vdd", "3-004b"),
50 /* L3G4200D Gyroscope device */
51 REGULATOR_SUPPLY("vdd", "2-0068"),
52 /* Ambient light sensor device */
53 REGULATOR_SUPPLY("vdd", "3-0029"),
54 /* Pressure sensor device */
55 REGULATOR_SUPPLY("vdd", "2-005c"),
56 /* Cypress TrueTouch Touchscreen device */
57 REGULATOR_SUPPLY("vcpin", "spi8.0"),
58 /* Camera device */
59 REGULATOR_SUPPLY("vaux12v5", "mmio_camera"),
60};
61
62static struct regulator_consumer_supply ab8500_vaux2_consumers[] = {
63 /* On-board eMMC power */
64 REGULATOR_SUPPLY("vmmc", "sdi4"),
65 /* AB8500 audio codec */
66 REGULATOR_SUPPLY("vcc-N2158", "ab8500-codec.0"),
67 /* AB8500 accessory detect 1 */
68 REGULATOR_SUPPLY("vcc-N2158", "ab8500-acc-det.0"),
69 /* AB8500 Tv-out device */
70 REGULATOR_SUPPLY("vcc-N2158", "mcde_tv_ab8500.4"),
71 /* AV8100 HDMI device */
72 REGULATOR_SUPPLY("vcc-N2158", "av8100_hdmi.3"),
73};
74
75static struct regulator_consumer_supply ab8500_vaux3_consumers[] = {
76 REGULATOR_SUPPLY("v-SD-STM", "stm"),
77 /* External MMC slot power */
78 REGULATOR_SUPPLY("vmmc", "sdi0"),
79};
80
81static struct regulator_consumer_supply ab8500_vtvout_consumers[] = {
82 /* TV-out DENC supply */
83 REGULATOR_SUPPLY("vtvout", "ab8500-denc.0"),
84 /* Internal general-purpose ADC */
85 REGULATOR_SUPPLY("vddadc", "ab8500-gpadc.0"),
86 /* ADC for charger */
87 REGULATOR_SUPPLY("vddadc", "ab8500-charger.0"),
88 /* AB8500 Tv-out device */
89 REGULATOR_SUPPLY("vtvout", "mcde_tv_ab8500.4"),
90};
91
92static struct regulator_consumer_supply ab8500_vaud_consumers[] = {
93 /* AB8500 audio-codec main supply */
94 REGULATOR_SUPPLY("vaud", "ab8500-codec.0"),
95};
96
97static struct regulator_consumer_supply ab8500_vamic1_consumers[] = {
98 /* AB8500 audio-codec Mic1 supply */
99 REGULATOR_SUPPLY("vamic1", "ab8500-codec.0"),
100};
101
102static struct regulator_consumer_supply ab8500_vamic2_consumers[] = {
103 /* AB8500 audio-codec Mic2 supply */
104 REGULATOR_SUPPLY("vamic2", "ab8500-codec.0"),
105};
106
107static struct regulator_consumer_supply ab8500_vdmic_consumers[] = {
108 /* AB8500 audio-codec DMic supply */
109 REGULATOR_SUPPLY("vdmic", "ab8500-codec.0"),
110};
111
112static struct regulator_consumer_supply ab8500_vintcore_consumers[] = {
113 /* SoC core supply, no device */
114 REGULATOR_SUPPLY("v-intcore", NULL),
115 /* USB Transceiver */
116 REGULATOR_SUPPLY("vddulpivio18", "ab8500-usb.0"),
117 /* Handled by abx500 clk driver */
118 REGULATOR_SUPPLY("v-intcore", "abx500-clk.0"),
119};
120
121static struct regulator_consumer_supply ab8500_vana_consumers[] = {
122 /* DB8500 DSI */
123 REGULATOR_SUPPLY("vdddsi1v2", "mcde"),
124 REGULATOR_SUPPLY("vdddsi1v2", "b2r2_core"),
125 REGULATOR_SUPPLY("vdddsi1v2", "b2r2_1_core"),
126 REGULATOR_SUPPLY("vdddsi1v2", "dsilink.0"),
127 REGULATOR_SUPPLY("vdddsi1v2", "dsilink.1"),
128 REGULATOR_SUPPLY("vdddsi1v2", "dsilink.2"),
129 /* DB8500 CSI */
130 REGULATOR_SUPPLY("vddcsi1v2", "mmio_camera"),
131};
132
133/* ab8500 regulator register initialization */
134static struct ab8500_regulator_reg_init ab8500_reg_init[] = {
135 /*
136 * VanaRequestCtrl = HP/LP depending on VxRequest
137 * VextSupply1RequestCtrl = HP/LP depending on VxRequest
138 */
139 INIT_REGULATOR_REGISTER(AB8500_REGUREQUESTCTRL2, 0xf0, 0x00),
140 /*
141 * VextSupply2RequestCtrl = HP/LP depending on VxRequest
142 * VextSupply3RequestCtrl = HP/LP depending on VxRequest
143 * Vaux1RequestCtrl = HP/LP depending on VxRequest
144 * Vaux2RequestCtrl = HP/LP depending on VxRequest
145 */
146 INIT_REGULATOR_REGISTER(AB8500_REGUREQUESTCTRL3, 0xff, 0x00),
147 /*
148 * Vaux3RequestCtrl = HP/LP depending on VxRequest
149 * SwHPReq = Control through SWValid disabled
150 */
151 INIT_REGULATOR_REGISTER(AB8500_REGUREQUESTCTRL4, 0x07, 0x00),
152 /*
153 * VanaSysClkReq1HPValid = disabled
154 * Vaux1SysClkReq1HPValid = disabled
155 * Vaux2SysClkReq1HPValid = disabled
156 * Vaux3SysClkReq1HPValid = disabled
157 */
158 INIT_REGULATOR_REGISTER(AB8500_REGUSYSCLKREQ1HPVALID1, 0xe8, 0x00),
159 /*
160 * VextSupply1SysClkReq1HPValid = disabled
161 * VextSupply2SysClkReq1HPValid = disabled
162 * VextSupply3SysClkReq1HPValid = SysClkReq1 controlled
163 */
164 INIT_REGULATOR_REGISTER(AB8500_REGUSYSCLKREQ1HPVALID2, 0x70, 0x40),
165 /*
166 * VanaHwHPReq1Valid = disabled
167 * Vaux1HwHPreq1Valid = disabled
168 * Vaux2HwHPReq1Valid = disabled
169 * Vaux3HwHPReqValid = disabled
170 */
171 INIT_REGULATOR_REGISTER(AB8500_REGUHWHPREQ1VALID1, 0xe8, 0x00),
172 /*
173 * VextSupply1HwHPReq1Valid = disabled
174 * VextSupply2HwHPReq1Valid = disabled
175 * VextSupply3HwHPReq1Valid = disabled
176 */
177 INIT_REGULATOR_REGISTER(AB8500_REGUHWHPREQ1VALID2, 0x07, 0x00),
178 /*
179 * VanaHwHPReq2Valid = disabled
180 * Vaux1HwHPReq2Valid = disabled
181 * Vaux2HwHPReq2Valid = disabled
182 * Vaux3HwHPReq2Valid = disabled
183 */
184 INIT_REGULATOR_REGISTER(AB8500_REGUHWHPREQ2VALID1, 0xe8, 0x00),
185 /*
186 * VextSupply1HwHPReq2Valid = disabled
187 * VextSupply2HwHPReq2Valid = disabled
188 * VextSupply3HwHPReq2Valid = HWReq2 controlled
189 */
190 INIT_REGULATOR_REGISTER(AB8500_REGUHWHPREQ2VALID2, 0x07, 0x04),
191 /*
192 * VanaSwHPReqValid = disabled
193 * Vaux1SwHPReqValid = disabled
194 */
195 INIT_REGULATOR_REGISTER(AB8500_REGUSWHPREQVALID1, 0xa0, 0x00),
196 /*
197 * Vaux2SwHPReqValid = disabled
198 * Vaux3SwHPReqValid = disabled
199 * VextSupply1SwHPReqValid = disabled
200 * VextSupply2SwHPReqValid = disabled
201 * VextSupply3SwHPReqValid = disabled
202 */
203 INIT_REGULATOR_REGISTER(AB8500_REGUSWHPREQVALID2, 0x1f, 0x00),
204 /*
205 * SysClkReq2Valid1 = SysClkReq2 controlled
206 * SysClkReq3Valid1 = disabled
207 * SysClkReq4Valid1 = SysClkReq4 controlled
208 * SysClkReq5Valid1 = disabled
209 * SysClkReq6Valid1 = SysClkReq6 controlled
210 * SysClkReq7Valid1 = disabled
211 * SysClkReq8Valid1 = disabled
212 */
213 INIT_REGULATOR_REGISTER(AB8500_REGUSYSCLKREQVALID1, 0xfe, 0x2a),
214 /*
215 * SysClkReq2Valid2 = disabled
216 * SysClkReq3Valid2 = disabled
217 * SysClkReq4Valid2 = disabled
218 * SysClkReq5Valid2 = disabled
219 * SysClkReq6Valid2 = SysClkReq6 controlled
220 * SysClkReq7Valid2 = disabled
221 * SysClkReq8Valid2 = disabled
222 */
223 INIT_REGULATOR_REGISTER(AB8500_REGUSYSCLKREQVALID2, 0xfe, 0x20),
224 /*
225 * VTVoutEna = disabled
226 * Vintcore12Ena = disabled
227 * Vintcore12Sel = 1.25 V
228 * Vintcore12LP = inactive (HP)
229 * VTVoutLP = inactive (HP)
230 */
231 INIT_REGULATOR_REGISTER(AB8500_REGUMISC1, 0xfe, 0x10),
232 /*
233 * VaudioEna = disabled
234 * VdmicEna = disabled
235 * Vamic1Ena = disabled
236 * Vamic2Ena = disabled
237 */
238 INIT_REGULATOR_REGISTER(AB8500_VAUDIOSUPPLY, 0x1e, 0x00),
239 /*
240 * Vamic1_dzout = high-Z when Vamic1 is disabled
241 * Vamic2_dzout = high-Z when Vamic2 is disabled
242 */
243 INIT_REGULATOR_REGISTER(AB8500_REGUCTRL1VAMIC, 0x03, 0x00),
244 /*
245 * VPll = Hw controlled (NOTE! PRCMU bits)
246 * VanaRegu = force off
247 */
248 INIT_REGULATOR_REGISTER(AB8500_VPLLVANAREGU, 0x0f, 0x02),
249 /*
250 * VrefDDREna = disabled
251 * VrefDDRSleepMode = inactive (no pulldown)
252 */
253 INIT_REGULATOR_REGISTER(AB8500_VREFDDR, 0x03, 0x00),
254 /*
255 * VextSupply1Regu = force LP
256 * VextSupply2Regu = force OFF
257 * VextSupply3Regu = force HP (-> STBB2=LP and TPS=LP)
258 * ExtSupply2Bypass = ExtSupply12LPn ball is 0 when Ena is 0
259 * ExtSupply3Bypass = ExtSupply3LPn ball is 0 when Ena is 0
260 */
261 INIT_REGULATOR_REGISTER(AB8500_EXTSUPPLYREGU, 0xff, 0x13),
262 /*
263 * Vaux1Regu = force HP
264 * Vaux2Regu = force off
265 */
266 INIT_REGULATOR_REGISTER(AB8500_VAUX12REGU, 0x0f, 0x01),
267 /*
268 * Vaux3Regu = force off
269 */
270 INIT_REGULATOR_REGISTER(AB8500_VRF1VAUX3REGU, 0x03, 0x00),
271 /*
272 * Vaux1Sel = 2.8 V
273 */
274 INIT_REGULATOR_REGISTER(AB8500_VAUX1SEL, 0x0f, 0x0C),
275 /*
276 * Vaux2Sel = 2.9 V
277 */
278 INIT_REGULATOR_REGISTER(AB8500_VAUX2SEL, 0x0f, 0x0d),
279 /*
280 * Vaux3Sel = 2.91 V
281 */
282 INIT_REGULATOR_REGISTER(AB8500_VRF1VAUX3SEL, 0x07, 0x07),
283 /*
284 * VextSupply12LP = disabled (no LP)
285 */
286 INIT_REGULATOR_REGISTER(AB8500_REGUCTRL2SPARE, 0x01, 0x00),
287 /*
288 * Vaux1Disch = short discharge time
289 * Vaux2Disch = short discharge time
290 * Vaux3Disch = short discharge time
291 * Vintcore12Disch = short discharge time
292 * VTVoutDisch = short discharge time
293 * VaudioDisch = short discharge time
294 */
295 INIT_REGULATOR_REGISTER(AB8500_REGUCTRLDISCH, 0xfc, 0x00),
296 /*
297 * VanaDisch = short discharge time
298 * VdmicPullDownEna = pulldown disabled when Vdmic is disabled
299 * VdmicDisch = short discharge time
300 */
301 INIT_REGULATOR_REGISTER(AB8500_REGUCTRLDISCH2, 0x16, 0x00),
302};
303
304/* AB8500 regulators */
305static struct regulator_init_data ab8500_regulators[AB8500_NUM_REGULATORS] = {
306 /* supplies to the display/camera */
307 [AB8500_LDO_AUX1] = {
308 .supply_regulator = "ab8500-ext-supply3",
309 .constraints = {
310 .name = "V-DISPLAY",
311 .min_uV = 2800000,
312 .max_uV = 3300000,
313 .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE |
314 REGULATOR_CHANGE_STATUS,
315 .boot_on = 1, /* display is on at boot */
316 },
317 .num_consumer_supplies = ARRAY_SIZE(ab8500_vaux1_consumers),
318 .consumer_supplies = ab8500_vaux1_consumers,
319 },
320 /* supplies to the on-board eMMC */
321 [AB8500_LDO_AUX2] = {
322 .supply_regulator = "ab8500-ext-supply3",
323 .constraints = {
324 .name = "V-eMMC1",
325 .min_uV = 1100000,
326 .max_uV = 3300000,
327 .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE |
328 REGULATOR_CHANGE_STATUS |
329 REGULATOR_CHANGE_MODE,
330 .valid_modes_mask = REGULATOR_MODE_NORMAL |
331 REGULATOR_MODE_IDLE,
332 },
333 .num_consumer_supplies = ARRAY_SIZE(ab8500_vaux2_consumers),
334 .consumer_supplies = ab8500_vaux2_consumers,
335 },
336 /* supply for VAUX3, supplies to SDcard slots */
337 [AB8500_LDO_AUX3] = {
338 .supply_regulator = "ab8500-ext-supply3",
339 .constraints = {
340 .name = "V-MMC-SD",
341 .min_uV = 1100000,
342 .max_uV = 3300000,
343 .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE |
344 REGULATOR_CHANGE_STATUS |
345 REGULATOR_CHANGE_MODE,
346 .valid_modes_mask = REGULATOR_MODE_NORMAL |
347 REGULATOR_MODE_IDLE,
348 },
349 .num_consumer_supplies = ARRAY_SIZE(ab8500_vaux3_consumers),
350 .consumer_supplies = ab8500_vaux3_consumers,
351 },
352 /* supply for tvout, gpadc, TVOUT LDO */
353 [AB8500_LDO_TVOUT] = {
354 .constraints = {
355 .name = "V-TVOUT",
356 .valid_ops_mask = REGULATOR_CHANGE_STATUS,
357 },
358 .num_consumer_supplies = ARRAY_SIZE(ab8500_vtvout_consumers),
359 .consumer_supplies = ab8500_vtvout_consumers,
360 },
361 /* supply for ab8500-vaudio, VAUDIO LDO */
362 [AB8500_LDO_AUDIO] = {
363 .constraints = {
364 .name = "V-AUD",
365 .valid_ops_mask = REGULATOR_CHANGE_STATUS,
366 },
367 .num_consumer_supplies = ARRAY_SIZE(ab8500_vaud_consumers),
368 .consumer_supplies = ab8500_vaud_consumers,
369 },
370 /* supply for v-anamic1 VAMic1-LDO */
371 [AB8500_LDO_ANAMIC1] = {
372 .constraints = {
373 .name = "V-AMIC1",
374 .valid_ops_mask = REGULATOR_CHANGE_STATUS,
375 },
376 .num_consumer_supplies = ARRAY_SIZE(ab8500_vamic1_consumers),
377 .consumer_supplies = ab8500_vamic1_consumers,
378 },
379 /* supply for v-amic2, VAMIC2 LDO, reuse constants for AMIC1 */
380 [AB8500_LDO_ANAMIC2] = {
381 .constraints = {
382 .name = "V-AMIC2",
383 .valid_ops_mask = REGULATOR_CHANGE_STATUS,
384 },
385 .num_consumer_supplies = ARRAY_SIZE(ab8500_vamic2_consumers),
386 .consumer_supplies = ab8500_vamic2_consumers,
387 },
388 /* supply for v-dmic, VDMIC LDO */
389 [AB8500_LDO_DMIC] = {
390 .constraints = {
391 .name = "V-DMIC",
392 .valid_ops_mask = REGULATOR_CHANGE_STATUS,
393 },
394 .num_consumer_supplies = ARRAY_SIZE(ab8500_vdmic_consumers),
395 .consumer_supplies = ab8500_vdmic_consumers,
396 },
397 /* supply for v-intcore12, VINTCORE12 LDO */
398 [AB8500_LDO_INTCORE] = {
399 .constraints = {
400 .name = "V-INTCORE",
401 .min_uV = 1250000,
402 .max_uV = 1350000,
403 .input_uV = 1800000,
404 .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE |
405 REGULATOR_CHANGE_STATUS |
406 REGULATOR_CHANGE_MODE |
407 REGULATOR_CHANGE_DRMS,
408 .valid_modes_mask = REGULATOR_MODE_NORMAL |
409 REGULATOR_MODE_IDLE,
410 },
411 .num_consumer_supplies = ARRAY_SIZE(ab8500_vintcore_consumers),
412 .consumer_supplies = ab8500_vintcore_consumers,
413 },
414 /* supply for U8500 CSI-DSI, VANA LDO */
415 [AB8500_LDO_ANA] = {
416 .constraints = {
417 .name = "V-CSI-DSI",
418 .valid_ops_mask = REGULATOR_CHANGE_STATUS,
419 },
420 .num_consumer_supplies = ARRAY_SIZE(ab8500_vana_consumers),
421 .consumer_supplies = ab8500_vana_consumers,
422 },
423};
424
425/* supply for VextSupply3 */
426static struct regulator_consumer_supply ab8500_ext_supply3_consumers[] = {
427 /* SIM supply for 3 V SIM cards */
428 REGULATOR_SUPPLY("vinvsim", "sim-detect.0"),
429};
430
431/*
432 * AB8500 external regulators
433 */
434static struct regulator_init_data ab8500_ext_regulators[] = {
435 /* fixed Vbat supplies VSMPS1_EXT_1V8 */
436 [AB8500_EXT_SUPPLY1] = {
437 .constraints = {
438 .name = "ab8500-ext-supply1",
439 .min_uV = 1800000,
440 .max_uV = 1800000,
441 .initial_mode = REGULATOR_MODE_IDLE,
442 .boot_on = 1,
443 .always_on = 1,
444 },
445 },
446 /* fixed Vbat supplies VSMPS2_EXT_1V36 and VSMPS5_EXT_1V15 */
447 [AB8500_EXT_SUPPLY2] = {
448 .constraints = {
449 .name = "ab8500-ext-supply2",
450 .min_uV = 1360000,
451 .max_uV = 1360000,
452 },
453 },
454 /* fixed Vbat supplies VSMPS3_EXT_3V4 and VSMPS4_EXT_3V4 */
455 [AB8500_EXT_SUPPLY3] = {
456 .constraints = {
457 .name = "ab8500-ext-supply3",
458 .min_uV = 3400000,
459 .max_uV = 3400000,
460 .valid_ops_mask = REGULATOR_CHANGE_STATUS,
461 .boot_on = 1,
462 },
463 .num_consumer_supplies =
464 ARRAY_SIZE(ab8500_ext_supply3_consumers),
465 .consumer_supplies = ab8500_ext_supply3_consumers,
466 },
467};
468
469static struct ab8500_regulator_platform_data ab8500_regulator_plat_data = {
470 .reg_init = ab8500_reg_init,
471 .num_reg_init = ARRAY_SIZE(ab8500_reg_init),
472 .regulator = ab8500_regulators,
473 .num_regulator = ARRAY_SIZE(ab8500_regulators),
474 .ext_regulator = ab8500_ext_regulators,
475 .num_ext_regulator = ARRAY_SIZE(ab8500_ext_regulators),
476};
477
28/** 478/**
29 * struct ab8500_ext_regulator_info - ab8500 regulator information 479 * struct ab8500_ext_regulator_info - ab8500 regulator information
30 * @dev: device pointer 480 * @dev: device pointer
@@ -344,8 +794,7 @@ static struct of_regulator_match ab8500_ext_regulator_match[] = {
344static int ab8500_ext_regulator_probe(struct platform_device *pdev) 794static int ab8500_ext_regulator_probe(struct platform_device *pdev)
345{ 795{
346 struct ab8500 *ab8500 = dev_get_drvdata(pdev->dev.parent); 796 struct ab8500 *ab8500 = dev_get_drvdata(pdev->dev.parent);
347 struct ab8500_platform_data *ppdata; 797 struct ab8500_regulator_platform_data *pdata = &ab8500_regulator_plat_data;
348 struct ab8500_regulator_platform_data *pdata;
349 struct device_node *np = pdev->dev.of_node; 798 struct device_node *np = pdev->dev.of_node;
350 struct regulator_config config = { }; 799 struct regulator_config config = { };
351 int i, err; 800 int i, err;
@@ -366,18 +815,6 @@ static int ab8500_ext_regulator_probe(struct platform_device *pdev)
366 return -EINVAL; 815 return -EINVAL;
367 } 816 }
368 817
369 ppdata = dev_get_platdata(ab8500->dev);
370 if (!ppdata) {
371 dev_err(&pdev->dev, "null parent pdata\n");
372 return -EINVAL;
373 }
374
375 pdata = ppdata->regulator;
376 if (!pdata) {
377 dev_err(&pdev->dev, "null pdata\n");
378 return -EINVAL;
379 }
380
381 /* make sure the platform data has the correct size */ 818 /* make sure the platform data has the correct size */
382 if (pdata->num_ext_regulator != ARRAY_SIZE(ab8500_ext_regulator_info)) { 819 if (pdata->num_ext_regulator != ARRAY_SIZE(ab8500_ext_regulator_info)) {
383 dev_err(&pdev->dev, "Configuration error: size mismatch.\n"); 820 dev_err(&pdev->dev, "Configuration error: size mismatch.\n");
generated by cgit v1.2.2 (git 2.25.0) at 2025-09-03 18:31:46 -0400