Skip to content

Commit 50b7bae

Browse files
brooniebroonie
committed
Merge remote-tracking branches 'regulator/topic/da9211', 'regulator/topic/pfuze100' and 'regulator/topic/tps65218' into regulator-next
4 parents 9b272e6 + 707ce9e + 26284ca + 125b119 commit 50b7bae

File tree

8 files changed

+95
-37
lines changed

8 files changed

+95
-37
lines changed

‎Documentation/devicetree/bindings/regulator/da9211.txt

Lines changed: 75 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
* Dialog Semiconductor DA9211/DA9212/DA9213/DA9214/DA9215 Voltage Regulator
1+
* Dialog Semiconductor DA9211/DA9212/DA9213/DA9223/DA9214/DA9224/DA9215/DA9225
2+
Voltage Regulator
23

34
Required properties:
4-
- compatible: "dlg,da9211" or "dlg,da9212" or "dlg,da9213"
5-
or "dlg,da9214" or "dlg,da9215"
5+
- compatible: "dlg,da9211" or "dlg,da9212" or "dlg,da9213" or "dlg,da9223"
6+
or "dlg,da9214" or "dlg,da9224" or "dlg,da9215" or "dlg,da9225"
67
- reg: I2C slave address, usually 0x68.
78
- interrupts: the interrupt outputs of the controller
89
- regulators: A node that houses a sub-node for each regulator within the
@@ -16,7 +17,6 @@ Optional properties:
1617
- Any optional property defined in regulator.txt
1718

1819
Example 1) DA9211
19-
2020
pmic: da9211@68 {
2121
compatible = "dlg,da9211";
2222
reg = <0x68>;
@@ -35,7 +35,6 @@ Example 1) DA9211
3535
};
3636

3737
Example 2) DA9212
38-
3938
pmic: da9212@68 {
4039
compatible = "dlg,da9212";
4140
reg = <0x68>;
@@ -79,7 +78,25 @@ Example 3) DA9213
7978
};
8079
};
8180

82-
Example 4) DA9214
81+
Example 4) DA9223
82+
pmic: da9223@68 {
83+
compatible = "dlg,da9223";
84+
reg = <0x68>;
85+
interrupts = <3 27>;
86+
87+
regulators {
88+
BUCKA {
89+
regulator-name = "VBUCKA";
90+
regulator-min-microvolt = < 300000>;
91+
regulator-max-microvolt = <1570000>;
92+
regulator-min-microamp = <3000000>;
93+
regulator-max-microamp = <6000000>;
94+
enable-gpios = <&gpio 27 0>;
95+
};
96+
};
97+
};
98+
99+
Example 5) DA9214
83100
pmic: da9214@68 {
84101
compatible = "dlg,da9214";
85102
reg = <0x68>;
@@ -105,7 +122,33 @@ Example 4) DA9214
105122
};
106123
};
107124

108-
Example 5) DA9215
125+
Example 6) DA9224
126+
pmic: da9224@68 {
127+
compatible = "dlg,da9224";
128+
reg = <0x68>;
129+
interrupts = <3 27>;
130+
131+
regulators {
132+
BUCKA {
133+
regulator-name = "VBUCKA";
134+
regulator-min-microvolt = < 300000>;
135+
regulator-max-microvolt = <1570000>;
136+
regulator-min-microamp = <3000000>;
137+
regulator-max-microamp = <6000000>;
138+
enable-gpios = <&gpio 27 0>;
139+
};
140+
BUCKB {
141+
regulator-name = "VBUCKB";
142+
regulator-min-microvolt = < 300000>;
143+
regulator-max-microvolt = <1570000>;
144+
regulator-min-microamp = <3000000>;
145+
regulator-max-microamp = <6000000>;
146+
enable-gpios = <&gpio 17 0>;
147+
};
148+
};
149+
};
150+
151+
Example 7) DA9215
109152
pmic: da9215@68 {
110153
compatible = "dlg,da9215";
111154
reg = <0x68>;
@@ -131,3 +174,28 @@ Example 5) DA9215
131174
};
132175
};
133176

177+
Example 8) DA9225
178+
pmic: da9225@68 {
179+
compatible = "dlg,da9225";
180+
reg = <0x68>;
181+
interrupts = <3 27>;
182+
183+
regulators {
184+
BUCKA {
185+
regulator-name = "VBUCKA";
186+
regulator-min-microvolt = < 300000>;
187+
regulator-max-microvolt = <1570000>;
188+
regulator-min-microamp = <4000000>;
189+
regulator-max-microamp = <7000000>;
190+
enable-gpios = <&gpio 27 0>;
191+
};
192+
BUCKB {
193+
regulator-name = "VBUCKB";
194+
regulator-min-microvolt = < 300000>;
195+
regulator-max-microvolt = <1570000>;
196+
regulator-min-microamp = <4000000>;
197+
regulator-max-microamp = <7000000>;
198+
enable-gpios = <&gpio 17 0>;
199+
};
200+
};
201+
};

‎Documentation/devicetree/bindings/regulator/pfuze100.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Each regulator is defined using the standard binding for regulators.
2121

2222
Example 1: PFUZE100
2323

24-
pmic: pfuze100@08 {
24+
pmic: pfuze100@8 {
2525
compatible = "fsl,pfuze100";
2626
reg = <0x08>;
2727

@@ -122,7 +122,7 @@ Example 1: PFUZE100
122122

123123
Example 2: PFUZE200
124124

125-
pmic: pfuze200@08 {
125+
pmic: pfuze200@8 {
126126
compatible = "fsl,pfuze200";
127127
reg = <0x08>;
128128

@@ -216,7 +216,7 @@ Example 2: PFUZE200
216216

217217
Example 3: PFUZE3000
218218

219-
pmic: pfuze3000@08 {
219+
pmic: pfuze3000@8 {
220220
compatible = "fsl,pfuze3000";
221221
reg = <0x08>;
222222

‎drivers/regulator/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ config REGULATOR_DA9210
244244
interface.
245245

246246
config REGULATOR_DA9211
247-
tristate "Dialog Semiconductor DA9211/DA9212/DA9213/DA9214/DA9215 regulator"
247+
tristate "Dialog Semiconductor DA9211/DA9212/DA9213/DA9223/DA9214/DA9224/DA9215/DA9225 regulator"
248248
depends on I2C
249249
select REGMAP_I2C
250250
help

‎drivers/regulator/da9211-regulator.c

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* da9211-regulator.c - Regulator device driver for DA9211/DA9212
3-
* /DA9213/DA9214/DA9215
3+
* /DA9213/DA9223/DA9214/DA9224/DA9215/DA9225
44
* Copyright (C) 2015 Dialog Semiconductor Ltd.
55
*
66
* This library is free software; you can redistribute it and/or
@@ -496,8 +496,11 @@ static const struct i2c_device_id da9211_i2c_id[] = {
496496
{"da9211", DA9211},
497497
{"da9212", DA9212},
498498
{"da9213", DA9213},
499+
{"da9223", DA9223},
499500
{"da9214", DA9214},
501+
{"da9224", DA9224},
500502
{"da9215", DA9215},
503+
{"da9225", DA9225},
501504
{},
502505
};
503506
MODULE_DEVICE_TABLE(i2c, da9211_i2c_id);
@@ -507,8 +510,11 @@ static const struct of_device_id da9211_dt_ids[] = {
507510
{ .compatible = "dlg,da9211", .data = &da9211_i2c_id[0] },
508511
{ .compatible = "dlg,da9212", .data = &da9211_i2c_id[1] },
509512
{ .compatible = "dlg,da9213", .data = &da9211_i2c_id[2] },
510-
{ .compatible = "dlg,da9214", .data = &da9211_i2c_id[3] },
511-
{ .compatible = "dlg,da9215", .data = &da9211_i2c_id[4] },
513+
{ .compatible = "dlg,da9223", .data = &da9211_i2c_id[3] },
514+
{ .compatible = "dlg,da9214", .data = &da9211_i2c_id[4] },
515+
{ .compatible = "dlg,da9224", .data = &da9211_i2c_id[5] },
516+
{ .compatible = "dlg,da9215", .data = &da9211_i2c_id[6] },
517+
{ .compatible = "dlg,da9225", .data = &da9211_i2c_id[7] },
512518
{},
513519
};
514520
MODULE_DEVICE_TABLE(of, da9211_dt_ids);
@@ -526,5 +532,5 @@ static struct i2c_driver da9211_regulator_driver = {
526532
module_i2c_driver(da9211_regulator_driver);
527533

528534
MODULE_AUTHOR("James Ban <[email protected]>");
529-
MODULE_DESCRIPTION("DA9211/DA9212/DA9213/DA9214/DA9215 regulator driver");
535+
MODULE_DESCRIPTION("DA9211/DA9212/DA9213/DA9223/DA9214/DA9224/DA9215/DA9225 regulator driver");
530536
MODULE_LICENSE("GPL");

‎drivers/regulator/da9211-regulator.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* da9211-regulator.h - Regulator definitions for DA9211/DA9212
3-
* /DA9213/DA9214/DA9215
3+
* /DA9213/DA9223/DA9214/DA9224/DA9215/DA9225
44
* Copyright (C) 2015 Dialog Semiconductor Ltd.
55
*
66
* This program is free software; you can redistribute it and/or

‎drivers/regulator/tps65218-regulator.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ static int tps65218_pmic_set_suspend_disable(struct regulator_dev *dev)
154154

155155
if (!tps->strobes[rid]) {
156156
if (rid == TPS65218_DCDC_3)
157-
tps->info[rid]->strobe = 3;
157+
tps->strobes[rid] = 3;
158158
else
159159
return -EINVAL;
160160
}

‎include/linux/mfd/tps65218.h

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -245,24 +245,6 @@ enum tps65218_irqs {
245245
TPS65218_INVALID4_IRQ,
246246
};
247247

248-
/**
249-
* struct tps_info - packages regulator constraints
250-
* @id: Id of the regulator
251-
* @name: Voltage regulator name
252-
* @min_uV: minimum micro volts
253-
* @max_uV: minimum micro volts
254-
* @strobe: sequencing strobe value for the regulator
255-
*
256-
* This data is used to check the regualtor voltage limits while setting.
257-
*/
258-
struct tps_info {
259-
int id;
260-
const char *name;
261-
int min_uV;
262-
int max_uV;
263-
int strobe;
264-
};
265-
266248
/**
267249
* struct tps65218 - tps65218 sub-driver chip access routines
268250
*
@@ -280,7 +262,6 @@ struct tps65218 {
280262
u32 irq_mask;
281263
struct regmap_irq_chip_data *irq_data;
282264
struct regulator_desc desc[TPS65218_NUM_REGULATOR];
283-
struct tps_info *info[TPS65218_NUM_REGULATOR];
284265
struct regmap *regmap;
285266
u8 *strobes;
286267
};

‎include/linux/regulator/da9211.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* da9211.h - Regulator device driver for DA9211/DA9212
3-
* /DA9213/DA9214/DA9215
3+
* /DA9213/DA9223/DA9214/DA9224/DA9215/DA9225
44
* Copyright (C) 2015 Dialog Semiconductor Ltd.
55
*
66
* This program is free software; you can redistribute it and/or
@@ -25,8 +25,11 @@ enum da9211_chip_id {
2525
DA9211,
2626
DA9212,
2727
DA9213,
28+
DA9223,
2829
DA9214,
30+
DA9224,
2931
DA9215,
32+
DA9225,
3033
};
3134

3235
struct da9211_pdata {

0 commit comments

Comments
 (0)