|
@@ -26,10 +26,12 @@
|
|
|
#include <linux/module.h>
|
|
|
#include <linux/init.h>
|
|
|
#include <linux/err.h>
|
|
|
+#include <linux/of.h>
|
|
|
#include <linux/platform_device.h>
|
|
|
#include <linux/regulator/driver.h>
|
|
|
#include <linux/regulator/machine.h>
|
|
|
#include <linux/regulator/max8973-regulator.h>
|
|
|
+#include <linux/regulator/of_regulator.h>
|
|
|
#include <linux/gpio.h>
|
|
|
#include <linux/i2c.h>
|
|
|
#include <linux/slab.h>
|
|
@@ -370,7 +372,8 @@ static int max8973_probe(struct i2c_client *client,
|
|
|
int ret;
|
|
|
|
|
|
pdata = client->dev.platform_data;
|
|
|
- if (!pdata) {
|
|
|
+
|
|
|
+ if (!pdata && !client->dev.of_node) {
|
|
|
dev_err(&client->dev, "No Platform data");
|
|
|
return -EIO;
|
|
|
}
|
|
@@ -400,7 +403,7 @@ static int max8973_probe(struct i2c_client *client,
|
|
|
max->desc.uV_step = MAX8973_VOLATGE_STEP;
|
|
|
max->desc.n_voltages = MAX8973_BUCK_N_VOLTAGE;
|
|
|
|
|
|
- if (!pdata->enable_ext_control) {
|
|
|
+ if (!pdata || !pdata->enable_ext_control) {
|
|
|
max->desc.enable_reg = MAX8973_VOUT;
|
|
|
max->desc.enable_mask = MAX8973_VOUT_ENABLE;
|
|
|
max->ops.enable = regulator_enable_regmap;
|
|
@@ -408,12 +411,17 @@ static int max8973_probe(struct i2c_client *client,
|
|
|
max->ops.is_enabled = regulator_is_enabled_regmap;
|
|
|
}
|
|
|
|
|
|
- max->enable_external_control = pdata->enable_ext_control;
|
|
|
- max->dvs_gpio = pdata->dvs_gpio;
|
|
|
- max->curr_gpio_val = pdata->dvs_def_state;
|
|
|
- max->curr_vout_reg = MAX8973_VOUT + pdata->dvs_def_state;
|
|
|
+ if (pdata) {
|
|
|
+ max->dvs_gpio = pdata->dvs_gpio;
|
|
|
+ max->enable_external_control = pdata->enable_ext_control;
|
|
|
+ max->curr_gpio_val = pdata->dvs_def_state;
|
|
|
+ max->curr_vout_reg = MAX8973_VOUT + pdata->dvs_def_state;
|
|
|
+ } else {
|
|
|
+ max->dvs_gpio = -EINVAL;
|
|
|
+ max->curr_vout_reg = MAX8973_VOUT;
|
|
|
+ }
|
|
|
+
|
|
|
max->lru_index[0] = max->curr_vout_reg;
|
|
|
- max->valid_dvs_gpio = false;
|
|
|
|
|
|
if (gpio_is_valid(max->dvs_gpio)) {
|
|
|
int gpio_flags;
|
|
@@ -439,16 +447,21 @@ static int max8973_probe(struct i2c_client *client,
|
|
|
max->lru_index[i] = i;
|
|
|
max->lru_index[0] = max->curr_vout_reg;
|
|
|
max->lru_index[max->curr_vout_reg] = 0;
|
|
|
+ } else {
|
|
|
+ max->valid_dvs_gpio = false;
|
|
|
}
|
|
|
|
|
|
- ret = max8973_init_dcdc(max, pdata);
|
|
|
- if (ret < 0) {
|
|
|
- dev_err(max->dev, "Max8973 Init failed, err = %d\n", ret);
|
|
|
- return ret;
|
|
|
+ if (pdata) {
|
|
|
+ ret = max8973_init_dcdc(max, pdata);
|
|
|
+ if (ret < 0) {
|
|
|
+ dev_err(max->dev, "Max8973 Init failed, err = %d\n", ret);
|
|
|
+ return ret;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
config.dev = &client->dev;
|
|
|
- config.init_data = pdata->reg_init_data;
|
|
|
+ config.init_data = pdata ? pdata->reg_init_data :
|
|
|
+ of_get_regulator_init_data(&client->dev, client->dev.of_node);
|
|
|
config.driver_data = max;
|
|
|
config.of_node = client->dev.of_node;
|
|
|
config.regmap = max->regmap;
|