Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit b7bd05b8d546cebbf05e98194b54d7b122aadf0e

Authored by Axel Lin
Committed by Mark Brown
1 parent ef6bd5a3f1
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

regulator: max1586: Use devm_kzalloc() 

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

Showing 1 changed file with 5 additions and 11 deletions Inline Diff

drivers/regulator/max1586.c
Diff comments   View file @ b7bd05b
1 /* 1 /*
2 * max1586.c -- Voltage and current regulation for the Maxim 1586 2 * max1586.c -- Voltage and current regulation for the Maxim 1586
3 * 3 *
4 * Copyright (C) 2008 Robert Jarzmik 4 * Copyright (C) 2008 Robert Jarzmik
5 * 5 *
6 * This program is free software; you can redistribute it and/or modify 6 * This program is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License as published by 7 * it under the terms of the GNU General Public License as published by
8 * the Free Software Foundation; either version 2 of the License, or 8 * the Free Software Foundation; either version 2 of the License, or
9 * (at your option) any later version. 9 * (at your option) any later version.
10 * 10 *
11 * This program is distributed in the hope that it will be useful, 11 * This program is distributed in the hope that it will be useful,
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 * GNU General Public License for more details. 14 * GNU General Public License for more details.
15 * 15 *
16 * You should have received a copy of the GNU General Public License 16 * You should have received a copy of the GNU General Public License
17 * along with this program; if not, write to the Free Software 17 * along with this program; if not, write to the Free Software
18 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 18 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
19 */ 19 */
20 #include <linux/module.h> 20 #include <linux/module.h>
21 #include <linux/err.h> 21 #include <linux/err.h>
22 #include <linux/i2c.h> 22 #include <linux/i2c.h>
23 #include <linux/platform_device.h> 23 #include <linux/platform_device.h>
24 #include <linux/regulator/driver.h> 24 #include <linux/regulator/driver.h>
25 #include <linux/slab.h> 25 #include <linux/slab.h>
26 #include <linux/regulator/max1586.h> 26 #include <linux/regulator/max1586.h>
27 27
28 #define MAX1586_V3_MAX_VSEL 31 28 #define MAX1586_V3_MAX_VSEL 31
29 #define MAX1586_V6_MAX_VSEL 3 29 #define MAX1586_V6_MAX_VSEL 3
30 30
31 #define MAX1586_V3_MIN_UV 700000 31 #define MAX1586_V3_MIN_UV 700000
32 #define MAX1586_V3_MAX_UV 1475000 32 #define MAX1586_V3_MAX_UV 1475000
33 33
34 #define MAX1586_V6_MIN_UV 0 34 #define MAX1586_V6_MIN_UV 0
35 #define MAX1586_V6_MAX_UV 3000000 35 #define MAX1586_V6_MAX_UV 3000000
36 36
37 #define I2C_V3_SELECT (0 << 5) 37 #define I2C_V3_SELECT (0 << 5)
38 #define I2C_V6_SELECT (1 << 5) 38 #define I2C_V6_SELECT (1 << 5)
39 39
40 struct max1586_data { 40 struct max1586_data {
41 struct i2c_client *client; 41 struct i2c_client *client;
42 42
43 /* min/max V3 voltage */ 43 /* min/max V3 voltage */
44 unsigned int min_uV; 44 unsigned int min_uV;
45 unsigned int max_uV; 45 unsigned int max_uV;
46 46
47 struct regulator_dev *rdev[0]; 47 struct regulator_dev *rdev[0];
48 }; 48 };
49 49
50 /* 50 /*
51 * V3 voltage 51 * V3 voltage
52 * On I2C bus, sending a "x" byte to the max1586 means : 52 * On I2C bus, sending a "x" byte to the max1586 means :
53 * set V3 to 0.700V + (x & 0x1f) * 0.025V 53 * set V3 to 0.700V + (x & 0x1f) * 0.025V
54 * This voltage can be increased by external resistors 54 * This voltage can be increased by external resistors
55 * R24 and R25=100kOhm as described in the data sheet. 55 * R24 and R25=100kOhm as described in the data sheet.
56 * The gain is approximately: 1 + R24/R25 + R24/185.5kOhm 56 * The gain is approximately: 1 + R24/R25 + R24/185.5kOhm
57 */ 57 */
58 static int max1586_v3_calc_voltage(struct max1586_data *max1586, 58 static int max1586_v3_calc_voltage(struct max1586_data *max1586,
59 unsigned selector) 59 unsigned selector)
60 { 60 {
61 unsigned range_uV = max1586->max_uV - max1586->min_uV; 61 unsigned range_uV = max1586->max_uV - max1586->min_uV;
62 62
63 return max1586->min_uV + (selector * range_uV / MAX1586_V3_MAX_VSEL); 63 return max1586->min_uV + (selector * range_uV / MAX1586_V3_MAX_VSEL);
64 } 64 }
65 65
66 static int max1586_v3_set(struct regulator_dev *rdev, int min_uV, int max_uV, 66 static int max1586_v3_set(struct regulator_dev *rdev, int min_uV, int max_uV,
67 unsigned *selector) 67 unsigned *selector)
68 { 68 {
69 struct max1586_data *max1586 = rdev_get_drvdata(rdev); 69 struct max1586_data *max1586 = rdev_get_drvdata(rdev);
70 struct i2c_client *client = max1586->client; 70 struct i2c_client *client = max1586->client;
71 unsigned range_uV = max1586->max_uV - max1586->min_uV; 71 unsigned range_uV = max1586->max_uV - max1586->min_uV;
72 u8 v3_prog; 72 u8 v3_prog;
73 73
74 if (min_uV > max1586->max_uV || max_uV < max1586->min_uV) 74 if (min_uV > max1586->max_uV || max_uV < max1586->min_uV)
75 return -EINVAL; 75 return -EINVAL;
76 if (min_uV < max1586->min_uV) 76 if (min_uV < max1586->min_uV)
77 min_uV = max1586->min_uV; 77 min_uV = max1586->min_uV;
78 78
79 *selector = DIV_ROUND_UP((min_uV - max1586->min_uV) * 79 *selector = DIV_ROUND_UP((min_uV - max1586->min_uV) *
80 MAX1586_V3_MAX_VSEL, range_uV); 80 MAX1586_V3_MAX_VSEL, range_uV);
81 if (max1586_v3_calc_voltage(max1586, *selector) > max_uV) 81 if (max1586_v3_calc_voltage(max1586, *selector) > max_uV)
82 return -EINVAL; 82 return -EINVAL;
83 83
84 dev_dbg(&client->dev, "changing voltage v3 to %dmv\n", 84 dev_dbg(&client->dev, "changing voltage v3 to %dmv\n",
85 max1586_v3_calc_voltage(max1586, *selector) / 1000); 85 max1586_v3_calc_voltage(max1586, *selector) / 1000);
86 86
87 v3_prog = I2C_V3_SELECT | (u8) *selector; 87 v3_prog = I2C_V3_SELECT | (u8) *selector;
88 return i2c_smbus_write_byte(client, v3_prog); 88 return i2c_smbus_write_byte(client, v3_prog);
89 } 89 }
90 90
91 static int max1586_v3_list(struct regulator_dev *rdev, unsigned selector) 91 static int max1586_v3_list(struct regulator_dev *rdev, unsigned selector)
92 { 92 {
93 struct max1586_data *max1586 = rdev_get_drvdata(rdev); 93 struct max1586_data *max1586 = rdev_get_drvdata(rdev);
94 94
95 if (selector > MAX1586_V3_MAX_VSEL) 95 if (selector > MAX1586_V3_MAX_VSEL)
96 return -EINVAL; 96 return -EINVAL;
97 return max1586_v3_calc_voltage(max1586, selector); 97 return max1586_v3_calc_voltage(max1586, selector);
98 } 98 }
99 99
100 /* 100 /*
101 * V6 voltage 101 * V6 voltage
102 * On I2C bus, sending a "x" byte to the max1586 means : 102 * On I2C bus, sending a "x" byte to the max1586 means :
103 * set V6 to either 0V, 1.8V, 2.5V, 3V depending on (x & 0x3) 103 * set V6 to either 0V, 1.8V, 2.5V, 3V depending on (x & 0x3)
104 * As regulator framework doesn't accept voltages to be 0V, we use 1uV. 104 * As regulator framework doesn't accept voltages to be 0V, we use 1uV.
105 */ 105 */
106 static int max1586_v6_calc_voltage(unsigned selector) 106 static int max1586_v6_calc_voltage(unsigned selector)
107 { 107 {
108 static int voltages_uv[] = { 1, 1800000, 2500000, 3000000 }; 108 static int voltages_uv[] = { 1, 1800000, 2500000, 3000000 };
109 109
110 return voltages_uv[selector]; 110 return voltages_uv[selector];
111 } 111 }
112 112
113 static int max1586_v6_set(struct regulator_dev *rdev, int min_uV, int max_uV, 113 static int max1586_v6_set(struct regulator_dev *rdev, int min_uV, int max_uV,
114 unsigned int *selector) 114 unsigned int *selector)
115 { 115 {
116 struct i2c_client *client = rdev_get_drvdata(rdev); 116 struct i2c_client *client = rdev_get_drvdata(rdev);
117 u8 v6_prog; 117 u8 v6_prog;
118 118
119 if (min_uV < MAX1586_V6_MIN_UV || min_uV > MAX1586_V6_MAX_UV) 119 if (min_uV < MAX1586_V6_MIN_UV || min_uV > MAX1586_V6_MAX_UV)
120 return -EINVAL; 120 return -EINVAL;
121 if (max_uV < MAX1586_V6_MIN_UV || max_uV > MAX1586_V6_MAX_UV) 121 if (max_uV < MAX1586_V6_MIN_UV || max_uV > MAX1586_V6_MAX_UV)
122 return -EINVAL; 122 return -EINVAL;
123 123
124 if (min_uV < 1800000) 124 if (min_uV < 1800000)
125 *selector = 0; 125 *selector = 0;
126 else if (min_uV < 2500000) 126 else if (min_uV < 2500000)
127 *selector = 1; 127 *selector = 1;
128 else if (min_uV < 3000000) 128 else if (min_uV < 3000000)
129 *selector = 2; 129 *selector = 2;
130 else if (min_uV >= 3000000) 130 else if (min_uV >= 3000000)
131 *selector = 3; 131 *selector = 3;
132 132
133 if (max1586_v6_calc_voltage(*selector) > max_uV) 133 if (max1586_v6_calc_voltage(*selector) > max_uV)
134 return -EINVAL; 134 return -EINVAL;
135 135
136 dev_dbg(&client->dev, "changing voltage v6 to %dmv\n", 136 dev_dbg(&client->dev, "changing voltage v6 to %dmv\n",
137 max1586_v6_calc_voltage(*selector) / 1000); 137 max1586_v6_calc_voltage(*selector) / 1000);
138 138
139 v6_prog = I2C_V6_SELECT | (u8) *selector; 139 v6_prog = I2C_V6_SELECT | (u8) *selector;
140 return i2c_smbus_write_byte(client, v6_prog); 140 return i2c_smbus_write_byte(client, v6_prog);
141 } 141 }
142 142
143 static int max1586_v6_list(struct regulator_dev *rdev, unsigned selector) 143 static int max1586_v6_list(struct regulator_dev *rdev, unsigned selector)
144 { 144 {
145 if (selector > MAX1586_V6_MAX_VSEL) 145 if (selector > MAX1586_V6_MAX_VSEL)
146 return -EINVAL; 146 return -EINVAL;
147 return max1586_v6_calc_voltage(selector); 147 return max1586_v6_calc_voltage(selector);
148 } 148 }
149 149
150 /* 150 /*
151 * The Maxim 1586 controls V3 and V6 voltages, but offers no way of reading back 151 * The Maxim 1586 controls V3 and V6 voltages, but offers no way of reading back
152 * the set up value. 152 * the set up value.
153 */ 153 */
154 static struct regulator_ops max1586_v3_ops = { 154 static struct regulator_ops max1586_v3_ops = {
155 .set_voltage = max1586_v3_set, 155 .set_voltage = max1586_v3_set,
156 .list_voltage = max1586_v3_list, 156 .list_voltage = max1586_v3_list,
157 }; 157 };
158 158
159 static struct regulator_ops max1586_v6_ops = { 159 static struct regulator_ops max1586_v6_ops = {
160 .set_voltage = max1586_v6_set, 160 .set_voltage = max1586_v6_set,
161 .list_voltage = max1586_v6_list, 161 .list_voltage = max1586_v6_list,
162 }; 162 };
163 163
164 static const 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,
168 .ops = &max1586_v3_ops, 168 .ops = &max1586_v3_ops,
169 .type = REGULATOR_VOLTAGE, 169 .type = REGULATOR_VOLTAGE,
170 .n_voltages = MAX1586_V3_MAX_VSEL + 1, 170 .n_voltages = MAX1586_V3_MAX_VSEL + 1,
171 .owner = THIS_MODULE, 171 .owner = THIS_MODULE,
172 }, 172 },
173 { 173 {
174 .name = "Output_V6", 174 .name = "Output_V6",
175 .id = MAX1586_V6, 175 .id = MAX1586_V6,
176 .ops = &max1586_v6_ops, 176 .ops = &max1586_v6_ops,
177 .type = REGULATOR_VOLTAGE, 177 .type = REGULATOR_VOLTAGE,
178 .n_voltages = MAX1586_V6_MAX_VSEL + 1, 178 .n_voltages = MAX1586_V6_MAX_VSEL + 1,
179 .owner = THIS_MODULE, 179 .owner = THIS_MODULE,
180 }, 180 },
181 }; 181 };
182 182
183 static int __devinit max1586_pmic_probe(struct i2c_client *client, 183 static int __devinit max1586_pmic_probe(struct i2c_client *client,
184 const struct i2c_device_id *i2c_id) 184 const struct i2c_device_id *i2c_id)
185 { 185 {
186 struct regulator_dev **rdev; 186 struct regulator_dev **rdev;
187 struct max1586_platform_data *pdata = client->dev.platform_data; 187 struct max1586_platform_data *pdata = client->dev.platform_data;
188 struct regulator_config config = { }; 188 struct regulator_config config = { };
189 struct max1586_data *max1586; 189 struct max1586_data *max1586;
190 int i, id, ret = -ENOMEM; 190 int i, id, ret = -ENOMEM;
191 191
192 max1586 = kzalloc(sizeof(struct max1586_data) + 192 max1586 = devm_kzalloc(&client->dev, sizeof(struct max1586_data) +
193 sizeof(struct regulator_dev *) * (MAX1586_V6 + 1), 193 sizeof(struct regulator_dev *) * (MAX1586_V6 + 1),
194 GFP_KERNEL); 194 GFP_KERNEL);
195 if (!max1586) 195 if (!max1586)
196 goto out; 196 return -ENOMEM;
197 197
198 max1586->client = client; 198 max1586->client = client;
199 199
200 if (!pdata->v3_gain) { 200 if (!pdata->v3_gain)
201 ret = -EINVAL; 201 return -EINVAL;
202 goto out_unmap; 202
203 }
204 max1586->min_uV = MAX1586_V3_MIN_UV / 1000 * pdata->v3_gain / 1000; 203 max1586->min_uV = MAX1586_V3_MIN_UV / 1000 * pdata->v3_gain / 1000;
205 max1586->max_uV = MAX1586_V3_MAX_UV / 1000 * pdata->v3_gain / 1000; 204 max1586->max_uV = MAX1586_V3_MAX_UV / 1000 * pdata->v3_gain / 1000;
206 205
207 rdev = max1586->rdev; 206 rdev = max1586->rdev;
208 for (i = 0; i < pdata->num_subdevs && i <= MAX1586_V6; i++) { 207 for (i = 0; i < pdata->num_subdevs && i <= MAX1586_V6; i++) {
209 id = pdata->subdevs[i].id; 208 id = pdata->subdevs[i].id;
210 if (!pdata->subdevs[i].platform_data) 209 if (!pdata->subdevs[i].platform_data)
211 continue; 210 continue;
212 if (id < MAX1586_V3 || id > MAX1586_V6) { 211 if (id < MAX1586_V3 || id > MAX1586_V6) {
213 dev_err(&client->dev, "invalid regulator id %d\n", id); 212 dev_err(&client->dev, "invalid regulator id %d\n", id);
214 goto err; 213 goto err;
215 } 214 }
216 215
217 config.dev = &client->dev; 216 config.dev = &client->dev;
218 config.init_data = pdata->subdevs[i].platform_data; 217 config.init_data = pdata->subdevs[i].platform_data;
219 config.driver_data = max1586; 218 config.driver_data = max1586;
220 219
221 rdev[i] = regulator_register(&max1586_reg[id], &config); 220 rdev[i] = regulator_register(&max1586_reg[id], &config);
222 if (IS_ERR(rdev[i])) { 221 if (IS_ERR(rdev[i])) {
223 ret = PTR_ERR(rdev[i]); 222 ret = PTR_ERR(rdev[i]);
224 dev_err(&client->dev, "failed to register %s\n", 223 dev_err(&client->dev, "failed to register %s\n",
225 max1586_reg[id].name); 224 max1586_reg[id].name);
226 goto err; 225 goto err;
227 } 226 }
228 } 227 }
229 228
230 i2c_set_clientdata(client, max1586); 229 i2c_set_clientdata(client, max1586);
231 dev_info(&client->dev, "Maxim 1586 regulator driver loaded\n"); 230 dev_info(&client->dev, "Maxim 1586 regulator driver loaded\n");
232 return 0; 231 return 0;
233 232
234 err: 233 err:
235 while (--i >= 0) 234 while (--i >= 0)
236 regulator_unregister(rdev[i]); 235 regulator_unregister(rdev[i]);
237 out_unmap:
238 kfree(max1586);
239 out:
240 return ret; 236 return ret;
241 } 237 }
242 238
243 static int __devexit max1586_pmic_remove(struct i2c_client *client) 239 static int __devexit max1586_pmic_remove(struct i2c_client *client)
244 { 240 {
245 struct max1586_data *max1586 = i2c_get_clientdata(client); 241 struct max1586_data *max1586 = i2c_get_clientdata(client);
246 int i; 242 int i;
247 243
248 for (i = 0; i <= MAX1586_V6; i++) 244 for (i = 0; i <= MAX1586_V6; i++)
249 if (max1586->rdev[i]) 245 if (max1586->rdev[i])
250 regulator_unregister(max1586->rdev[i]); 246 regulator_unregister(max1586->rdev[i]);
251 kfree(max1586);
252
253 return 0; 247 return 0;
254 } 248 }
255 249
256 static const struct i2c_device_id max1586_id[] = { 250 static const struct i2c_device_id max1586_id[] = {
257 { "max1586", 0 }, 251 { "max1586", 0 },
258 { } 252 { }
259 }; 253 };
260 MODULE_DEVICE_TABLE(i2c, max1586_id); 254 MODULE_DEVICE_TABLE(i2c, max1586_id);
261 255
262 static struct i2c_driver max1586_pmic_driver = { 256 static struct i2c_driver max1586_pmic_driver = {
263 .probe = max1586_pmic_probe, 257 .probe = max1586_pmic_probe,
264 .remove = __devexit_p(max1586_pmic_remove), 258 .remove = __devexit_p(max1586_pmic_remove),
265 .driver = { 259 .driver = {
266 .name = "max1586", 260 .name = "max1586",
267 .owner = THIS_MODULE, 261 .owner = THIS_MODULE,
268 }, 262 },
269 .id_table = max1586_id, 263 .id_table = max1586_id,
270 }; 264 };
271 265
272 static int __init max1586_pmic_init(void) 266 static int __init max1586_pmic_init(void)
273 { 267 {
274 return i2c_add_driver(&max1586_pmic_driver); 268 return i2c_add_driver(&max1586_pmic_driver);
275 } 269 }
276 subsys_initcall(max1586_pmic_init); 270 subsys_initcall(max1586_pmic_init);
277 271
278 static void __exit max1586_pmic_exit(void) 272 static void __exit max1586_pmic_exit(void)
279 { 273 {
280 i2c_del_driver(&max1586_pmic_driver); 274 i2c_del_driver(&max1586_pmic_driver);
281 } 275 }
282 module_exit(max1586_pmic_exit); 276 module_exit(max1586_pmic_exit);
283 277
284 /* Module information */ 278 /* Module information */
285 MODULE_DESCRIPTION("MAXIM 1586 voltage regulator driver"); 279 MODULE_DESCRIPTION("MAXIM 1586 voltage regulator driver");
286 MODULE_AUTHOR("Robert Jarzmik"); 280 MODULE_AUTHOR("Robert Jarzmik");
287 MODULE_LICENSE("GPL"); 281 MODULE_LICENSE("GPL");
288 282