diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-04-09 07:30:21 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-04-09 07:30:21 -0400 |
commit | 1474e4dbcae04125ed6e503eadcef266846f4675 (patch) | |
tree | b65a1fb53b4c3c2fb669883faf0b87166b45baaf | |
parent | f604c10cdeba4e068afa96be2bee878fb5227f8b (diff) | |
parent | 09de3473c7724d7a1db7596acc2ce411e5e72f63 (diff) |
Merge branch 'regulator-register' into regulator-drivers
-rw-r--r-- | drivers/regulator/ad5398.c | 2 | ||||
-rw-r--r-- | drivers/regulator/core.c | 3 | ||||
-rw-r--r-- | drivers/regulator/isl6271a-regulator.c | 2 | ||||
-rw-r--r-- | drivers/regulator/lp3971.c | 2 | ||||
-rw-r--r-- | drivers/regulator/lp3972.c | 2 | ||||
-rw-r--r-- | drivers/regulator/max1586.c | 2 | ||||
-rw-r--r-- | drivers/regulator/max8649.c | 2 | ||||
-rw-r--r-- | drivers/regulator/max8660.c | 2 | ||||
-rw-r--r-- | drivers/regulator/max8952.c | 2 | ||||
-rw-r--r-- | drivers/regulator/pcap-regulator.c | 2 | ||||
-rw-r--r-- | drivers/regulator/pcf50633-regulator.c | 2 | ||||
-rw-r--r-- | drivers/regulator/tps6105x-regulator.c | 2 | ||||
-rw-r--r-- | drivers/regulator/tps65217-regulator.c | 2 | ||||
-rw-r--r-- | drivers/regulator/wm8350-regulator.c | 2 | ||||
-rw-r--r-- | drivers/regulator/wm8994-regulator.c | 2 | ||||
-rw-r--r-- | include/linux/regulator/driver.h | 5 |
16 files changed, 19 insertions, 17 deletions
diff --git a/drivers/regulator/ad5398.c b/drivers/regulator/ad5398.c index 7d51793a072a..9ba69c431da8 100644 --- a/drivers/regulator/ad5398.c +++ b/drivers/regulator/ad5398.c | |||
@@ -184,7 +184,7 @@ static struct regulator_ops ad5398_ops = { | |||
184 | .is_enabled = ad5398_is_enabled, | 184 | .is_enabled = ad5398_is_enabled, |
185 | }; | 185 | }; |
186 | 186 | ||
187 | static struct regulator_desc ad5398_reg = { | 187 | static const struct regulator_desc ad5398_reg = { |
188 | .name = "isink", | 188 | .name = "isink", |
189 | .id = 0, | 189 | .id = 0, |
190 | .ops = &ad5398_ops, | 190 | .ops = &ad5398_ops, |
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index c056abd7562a..c4b626789f8e 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c | |||
@@ -2829,7 +2829,8 @@ static void rdev_init_debugfs(struct regulator_dev *rdev) | |||
2829 | * Called by regulator drivers to register a regulator. | 2829 | * Called by regulator drivers to register a regulator. |
2830 | * Returns 0 on success. | 2830 | * Returns 0 on success. |
2831 | */ | 2831 | */ |
2832 | struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc, | 2832 | struct regulator_dev * |
2833 | regulator_register(const struct regulator_desc *regulator_desc, | ||
2833 | struct device *dev, const struct regulator_init_data *init_data, | 2834 | struct device *dev, const struct regulator_init_data *init_data, |
2834 | void *driver_data, struct device_node *of_node) | 2835 | void *driver_data, struct device_node *of_node) |
2835 | { | 2836 | { |
diff --git a/drivers/regulator/isl6271a-regulator.c b/drivers/regulator/isl6271a-regulator.c index 6539ef9337cf..eee6f6b85ebc 100644 --- a/drivers/regulator/isl6271a-regulator.c +++ b/drivers/regulator/isl6271a-regulator.c | |||
@@ -112,7 +112,7 @@ static struct regulator_ops isl_fixed_ops = { | |||
112 | .list_voltage = isl6271a_list_fixed_voltage, | 112 | .list_voltage = isl6271a_list_fixed_voltage, |
113 | }; | 113 | }; |
114 | 114 | ||
115 | static struct regulator_desc isl_rd[] = { | 115 | static const struct regulator_desc isl_rd[] = { |
116 | { | 116 | { |
117 | .name = "Core Buck", | 117 | .name = "Core Buck", |
118 | .id = 0, | 118 | .id = 0, |
diff --git a/drivers/regulator/lp3971.c b/drivers/regulator/lp3971.c index 2013525f4bf9..499986e00fb2 100644 --- a/drivers/regulator/lp3971.c +++ b/drivers/regulator/lp3971.c | |||
@@ -281,7 +281,7 @@ static struct regulator_ops lp3971_dcdc_ops = { | |||
281 | .set_voltage_sel = lp3971_dcdc_set_voltage_sel, | 281 | .set_voltage_sel = lp3971_dcdc_set_voltage_sel, |
282 | }; | 282 | }; |
283 | 283 | ||
284 | static struct regulator_desc regulators[] = { | 284 | static const struct regulator_desc regulators[] = { |
285 | { | 285 | { |
286 | .name = "LDO1", | 286 | .name = "LDO1", |
287 | .id = LP3971_LDO1, | 287 | .id = LP3971_LDO1, |
diff --git a/drivers/regulator/lp3972.c b/drivers/regulator/lp3972.c index 4f28d36600a5..fbe3a58a71f2 100644 --- a/drivers/regulator/lp3972.c +++ b/drivers/regulator/lp3972.c | |||
@@ -444,7 +444,7 @@ static struct regulator_ops lp3972_dcdc_ops = { | |||
444 | .set_voltage_sel = lp3972_dcdc_set_voltage_sel, | 444 | .set_voltage_sel = lp3972_dcdc_set_voltage_sel, |
445 | }; | 445 | }; |
446 | 446 | ||
447 | static struct regulator_desc regulators[] = { | 447 | static const struct regulator_desc regulators[] = { |
448 | { | 448 | { |
449 | .name = "LDO1", | 449 | .name = "LDO1", |
450 | .id = LP3972_LDO1, | 450 | .id = LP3972_LDO1, |
diff --git a/drivers/regulator/max1586.c b/drivers/regulator/max1586.c index 282d2ee0604e..fad0bee10c54 100644 --- a/drivers/regulator/max1586.c +++ b/drivers/regulator/max1586.c | |||
@@ -161,7 +161,7 @@ static struct regulator_ops max1586_v6_ops = { | |||
161 | .list_voltage = max1586_v6_list, | 161 | .list_voltage = max1586_v6_list, |
162 | }; | 162 | }; |
163 | 163 | ||
164 | static struct regulator_desc max1586_reg[] = { | 164 | static const struct regulator_desc max1586_reg[] = { |
165 | { | 165 | { |
166 | .name = "Output_V3", | 166 | .name = "Output_V3", |
167 | .id = MAX1586_V3, | 167 | .id = MAX1586_V3, |
diff --git a/drivers/regulator/max8649.c b/drivers/regulator/max8649.c index 2e9ffbec2e3b..dca7835b381c 100644 --- a/drivers/regulator/max8649.c +++ b/drivers/regulator/max8649.c | |||
@@ -207,7 +207,7 @@ static struct regulator_ops max8649_dcdc_ops = { | |||
207 | 207 | ||
208 | }; | 208 | }; |
209 | 209 | ||
210 | static struct regulator_desc dcdc_desc = { | 210 | static const struct regulator_desc dcdc_desc = { |
211 | .name = "max8649", | 211 | .name = "max8649", |
212 | .ops = &max8649_dcdc_ops, | 212 | .ops = &max8649_dcdc_ops, |
213 | .type = REGULATOR_VOLTAGE, | 213 | .type = REGULATOR_VOLTAGE, |
diff --git a/drivers/regulator/max8660.c b/drivers/regulator/max8660.c index e42db5364ca5..0e327871fd0e 100644 --- a/drivers/regulator/max8660.c +++ b/drivers/regulator/max8660.c | |||
@@ -313,7 +313,7 @@ static struct regulator_ops max8660_ldo67_ops = { | |||
313 | .set_voltage = max8660_ldo67_set, | 313 | .set_voltage = max8660_ldo67_set, |
314 | }; | 314 | }; |
315 | 315 | ||
316 | static struct regulator_desc max8660_reg[] = { | 316 | static const struct regulator_desc max8660_reg[] = { |
317 | { | 317 | { |
318 | .name = "V3(DCDC)", | 318 | .name = "V3(DCDC)", |
319 | .id = MAX8660_V3, | 319 | .id = MAX8660_V3, |
diff --git a/drivers/regulator/max8952.c b/drivers/regulator/max8952.c index c35236a06cbb..b4084314c222 100644 --- a/drivers/regulator/max8952.c +++ b/drivers/regulator/max8952.c | |||
@@ -159,7 +159,7 @@ static struct regulator_ops max8952_ops = { | |||
159 | .set_suspend_disable = max8952_disable, | 159 | .set_suspend_disable = max8952_disable, |
160 | }; | 160 | }; |
161 | 161 | ||
162 | static struct regulator_desc regulator = { | 162 | static const struct regulator_desc regulator = { |
163 | .name = "MAX8952_VOUT", | 163 | .name = "MAX8952_VOUT", |
164 | .id = 0, | 164 | .id = 0, |
165 | .n_voltages = MAX8952_NUM_DVS_MODE, | 165 | .n_voltages = MAX8952_NUM_DVS_MODE, |
diff --git a/drivers/regulator/pcap-regulator.c b/drivers/regulator/pcap-regulator.c index 781bf343453b..b55128db07cc 100644 --- a/drivers/regulator/pcap-regulator.c +++ b/drivers/regulator/pcap-regulator.c | |||
@@ -241,7 +241,7 @@ static struct regulator_ops pcap_regulator_ops = { | |||
241 | .owner = THIS_MODULE, \ | 241 | .owner = THIS_MODULE, \ |
242 | } | 242 | } |
243 | 243 | ||
244 | static struct regulator_desc pcap_regulators[] = { | 244 | static const struct regulator_desc pcap_regulators[] = { |
245 | VREG(V1), VREG(V2), VREG(V3), VREG(V4), VREG(V5), VREG(V6), VREG(V7), | 245 | VREG(V1), VREG(V2), VREG(V3), VREG(V4), VREG(V5), VREG(V6), VREG(V7), |
246 | VREG(V8), VREG(V9), VREG(V10), VREG(VAUX1), VREG(VAUX2), VREG(VAUX3), | 246 | VREG(V8), VREG(V9), VREG(V10), VREG(VAUX1), VREG(VAUX2), VREG(VAUX3), |
247 | VREG(VAUX4), VREG(VSIM), VREG(VSIM2), VREG(VVIB), VREG(SW1), VREG(SW2), | 247 | VREG(VAUX4), VREG(VSIM), VREG(VSIM2), VREG(VVIB), VREG(SW1), VREG(SW2), |
diff --git a/drivers/regulator/pcf50633-regulator.c b/drivers/regulator/pcf50633-regulator.c index b62f4c856821..43163f14bec7 100644 --- a/drivers/regulator/pcf50633-regulator.c +++ b/drivers/regulator/pcf50633-regulator.c | |||
@@ -267,7 +267,7 @@ static struct regulator_ops pcf50633_regulator_ops = { | |||
267 | .is_enabled = pcf50633_regulator_is_enabled, | 267 | .is_enabled = pcf50633_regulator_is_enabled, |
268 | }; | 268 | }; |
269 | 269 | ||
270 | static struct regulator_desc regulators[] = { | 270 | static const struct regulator_desc regulators[] = { |
271 | [PCF50633_REGULATOR_AUTO] = | 271 | [PCF50633_REGULATOR_AUTO] = |
272 | PCF50633_REGULATOR("auto", PCF50633_REGULATOR_AUTO, 128), | 272 | PCF50633_REGULATOR("auto", PCF50633_REGULATOR_AUTO, 128), |
273 | [PCF50633_REGULATOR_DOWN1] = | 273 | [PCF50633_REGULATOR_DOWN1] = |
diff --git a/drivers/regulator/tps6105x-regulator.c b/drivers/regulator/tps6105x-regulator.c index d9278da18a9e..3b788977cb72 100644 --- a/drivers/regulator/tps6105x-regulator.c +++ b/drivers/regulator/tps6105x-regulator.c | |||
@@ -123,7 +123,7 @@ static struct regulator_ops tps6105x_regulator_ops = { | |||
123 | .list_voltage = tps6105x_regulator_list_voltage, | 123 | .list_voltage = tps6105x_regulator_list_voltage, |
124 | }; | 124 | }; |
125 | 125 | ||
126 | static struct regulator_desc tps6105x_regulator_desc = { | 126 | static const struct regulator_desc tps6105x_regulator_desc = { |
127 | .name = "tps6105x-boost", | 127 | .name = "tps6105x-boost", |
128 | .ops = &tps6105x_regulator_ops, | 128 | .ops = &tps6105x_regulator_ops, |
129 | .type = REGULATOR_VOLTAGE, | 129 | .type = REGULATOR_VOLTAGE, |
diff --git a/drivers/regulator/tps65217-regulator.c b/drivers/regulator/tps65217-regulator.c index e39521b42772..80fad2d3479e 100644 --- a/drivers/regulator/tps65217-regulator.c +++ b/drivers/regulator/tps65217-regulator.c | |||
@@ -312,7 +312,7 @@ static struct regulator_ops tps65217_pmic_ldo1_ops = { | |||
312 | .list_voltage = tps65217_pmic_list_voltage, | 312 | .list_voltage = tps65217_pmic_list_voltage, |
313 | }; | 313 | }; |
314 | 314 | ||
315 | static struct regulator_desc regulators[] = { | 315 | static const struct regulator_desc regulators[] = { |
316 | TPS65217_REGULATOR("DCDC1", TPS65217_DCDC_1, tps65217_pmic_ops, 64), | 316 | TPS65217_REGULATOR("DCDC1", TPS65217_DCDC_1, tps65217_pmic_ops, 64), |
317 | TPS65217_REGULATOR("DCDC2", TPS65217_DCDC_2, tps65217_pmic_ops, 64), | 317 | TPS65217_REGULATOR("DCDC2", TPS65217_DCDC_2, tps65217_pmic_ops, 64), |
318 | TPS65217_REGULATOR("DCDC3", TPS65217_DCDC_3, tps65217_pmic_ops, 64), | 318 | TPS65217_REGULATOR("DCDC3", TPS65217_DCDC_3, tps65217_pmic_ops, 64), |
diff --git a/drivers/regulator/wm8350-regulator.c b/drivers/regulator/wm8350-regulator.c index ab1e183a74b5..552b1edf8091 100644 --- a/drivers/regulator/wm8350-regulator.c +++ b/drivers/regulator/wm8350-regulator.c | |||
@@ -1269,7 +1269,7 @@ static struct regulator_ops wm8350_isink_ops = { | |||
1269 | .enable_time = wm8350_isink_enable_time, | 1269 | .enable_time = wm8350_isink_enable_time, |
1270 | }; | 1270 | }; |
1271 | 1271 | ||
1272 | static struct regulator_desc wm8350_reg[NUM_WM8350_REGULATORS] = { | 1272 | static const struct regulator_desc wm8350_reg[NUM_WM8350_REGULATORS] = { |
1273 | { | 1273 | { |
1274 | .name = "DCDC1", | 1274 | .name = "DCDC1", |
1275 | .id = WM8350_DCDC_1, | 1275 | .id = WM8350_DCDC_1, |
diff --git a/drivers/regulator/wm8994-regulator.c b/drivers/regulator/wm8994-regulator.c index 75ed402d9f43..8a4897a35f28 100644 --- a/drivers/regulator/wm8994-regulator.c +++ b/drivers/regulator/wm8994-regulator.c | |||
@@ -209,7 +209,7 @@ static struct regulator_ops wm8994_ldo2_ops = { | |||
209 | .set_voltage = wm8994_ldo2_set_voltage, | 209 | .set_voltage = wm8994_ldo2_set_voltage, |
210 | }; | 210 | }; |
211 | 211 | ||
212 | static struct regulator_desc wm8994_ldo_desc[] = { | 212 | static const struct regulator_desc wm8994_ldo_desc[] = { |
213 | { | 213 | { |
214 | .name = "LDO1", | 214 | .name = "LDO1", |
215 | .id = 1, | 215 | .id = 1, |
diff --git a/include/linux/regulator/driver.h b/include/linux/regulator/driver.h index fa8b55b8191c..1dcdf00e0db2 100644 --- a/include/linux/regulator/driver.h +++ b/include/linux/regulator/driver.h | |||
@@ -184,7 +184,7 @@ struct regulator_desc { | |||
184 | * no other direct access). | 184 | * no other direct access). |
185 | */ | 185 | */ |
186 | struct regulator_dev { | 186 | struct regulator_dev { |
187 | struct regulator_desc *desc; | 187 | const struct regulator_desc *desc; |
188 | int exclusive; | 188 | int exclusive; |
189 | u32 use_count; | 189 | u32 use_count; |
190 | u32 open_count; | 190 | u32 open_count; |
@@ -210,7 +210,8 @@ struct regulator_dev { | |||
210 | struct dentry *debugfs; | 210 | struct dentry *debugfs; |
211 | }; | 211 | }; |
212 | 212 | ||
213 | struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc, | 213 | struct regulator_dev * |
214 | regulator_register(const struct regulator_desc *regulator_desc, | ||
214 | struct device *dev, const struct regulator_init_data *init_data, | 215 | struct device *dev, const struct regulator_init_data *init_data, |
215 | void *driver_data, struct device_node *of_node); | 216 | void *driver_data, struct device_node *of_node); |
216 | void regulator_unregister(struct regulator_dev *rdev); | 217 | void regulator_unregister(struct regulator_dev *rdev); |