diff options
author | Javier Martinez Canillas <javier.martinez@collabora.co.uk> | 2014-11-10 08:43:53 -0500 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2014-11-26 13:58:14 -0500 |
commit | 072e78b12bf5182a3e2e460388214a291023ef1c (patch) | |
tree | dea7a9970709db752d8b998adcc5615e844ddb87 /drivers/regulator/arizona-ldo1.c | |
parent | 87e1e0f29f703e91c54e81f05d831432ec659dde (diff) |
regulator: of: Add regulator desc param to of_get_regulator_init_data()
The of_get_regulator_init_data() function is used to extract the regulator
init_data but information on how to extract certain data is defined in the
static regulator descriptor (e.g: how to map the hardware operating modes).
Add a const struct regulator_desc * parameter to the function signature so
the parsing logic could use the information in the struct regulator_desc.
of_get_regulator_init_data() relies on of_get_regulation_constraints() to
actually extract the init_data so it has to pass the struct regulator_desc
but that is modified on a later patch.
Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/regulator/arizona-ldo1.c')
-rw-r--r-- | drivers/regulator/arizona-ldo1.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/regulator/arizona-ldo1.c b/drivers/regulator/arizona-ldo1.c index 4c9db589f6c1..b1eea7f76489 100644 --- a/drivers/regulator/arizona-ldo1.c +++ b/drivers/regulator/arizona-ldo1.c | |||
@@ -179,7 +179,8 @@ static const struct regulator_init_data arizona_ldo1_default = { | |||
179 | }; | 179 | }; |
180 | 180 | ||
181 | static int arizona_ldo1_of_get_pdata(struct arizona *arizona, | 181 | static int arizona_ldo1_of_get_pdata(struct arizona *arizona, |
182 | struct regulator_config *config) | 182 | struct regulator_config *config, |
183 | const struct regulator_desc *desc) | ||
183 | { | 184 | { |
184 | struct arizona_pdata *pdata = &arizona->pdata; | 185 | struct arizona_pdata *pdata = &arizona->pdata; |
185 | struct arizona_ldo1 *ldo1 = config->driver_data; | 186 | struct arizona_ldo1 *ldo1 = config->driver_data; |
@@ -194,7 +195,8 @@ static int arizona_ldo1_of_get_pdata(struct arizona *arizona, | |||
194 | if (init_node) { | 195 | if (init_node) { |
195 | config->of_node = init_node; | 196 | config->of_node = init_node; |
196 | 197 | ||
197 | init_data = of_get_regulator_init_data(arizona->dev, init_node); | 198 | init_data = of_get_regulator_init_data(arizona->dev, init_node, |
199 | desc); | ||
198 | 200 | ||
199 | if (init_data) { | 201 | if (init_data) { |
200 | init_data->consumer_supplies = &ldo1->supply; | 202 | init_data->consumer_supplies = &ldo1->supply; |
@@ -257,7 +259,7 @@ static int arizona_ldo1_probe(struct platform_device *pdev) | |||
257 | 259 | ||
258 | if (IS_ENABLED(CONFIG_OF)) { | 260 | if (IS_ENABLED(CONFIG_OF)) { |
259 | if (!dev_get_platdata(arizona->dev)) { | 261 | if (!dev_get_platdata(arizona->dev)) { |
260 | ret = arizona_ldo1_of_get_pdata(arizona, &config); | 262 | ret = arizona_ldo1_of_get_pdata(arizona, &config, desc); |
261 | if (ret < 0) | 263 | if (ret < 0) |
262 | return ret; | 264 | return ret; |
263 | } | 265 | } |