|
@@ -1493,10 +1493,12 @@ static int palmas_dt_to_pdata(struct device *dev,
|
|
for (idx = 0; idx < ddata->max_reg; idx++) {
|
|
for (idx = 0; idx < ddata->max_reg; idx++) {
|
|
static struct of_regulator_match *match;
|
|
static struct of_regulator_match *match;
|
|
struct palmas_reg_init *rinit;
|
|
struct palmas_reg_init *rinit;
|
|
|
|
+ struct device_node *np;
|
|
|
|
|
|
match = &ddata->palmas_matches[idx];
|
|
match = &ddata->palmas_matches[idx];
|
|
|
|
+ np = match->of_node;
|
|
|
|
|
|
- if (!match->init_data || !match->of_node)
|
|
|
|
|
|
+ if (!match->init_data || !np)
|
|
continue;
|
|
continue;
|
|
|
|
|
|
rinit = devm_kzalloc(dev, sizeof(*rinit), GFP_KERNEL);
|
|
rinit = devm_kzalloc(dev, sizeof(*rinit), GFP_KERNEL);
|
|
@@ -1506,11 +1508,8 @@ static int palmas_dt_to_pdata(struct device *dev,
|
|
pdata->reg_data[idx] = match->init_data;
|
|
pdata->reg_data[idx] = match->init_data;
|
|
pdata->reg_init[idx] = rinit;
|
|
pdata->reg_init[idx] = rinit;
|
|
|
|
|
|
- rinit->warm_reset = of_property_read_bool(match->of_node,
|
|
|
|
- "ti,warm-reset");
|
|
|
|
-
|
|
|
|
- ret = of_property_read_u32(match->of_node, "ti,roof-floor",
|
|
|
|
- &prop);
|
|
|
|
|
|
+ rinit->warm_reset = of_property_read_bool(np, "ti,warm-reset");
|
|
|
|
+ ret = of_property_read_u32(np, "ti,roof-floor", &prop);
|
|
/* EINVAL: Property not found */
|
|
/* EINVAL: Property not found */
|
|
if (ret != -EINVAL) {
|
|
if (ret != -EINVAL) {
|
|
int econtrol;
|
|
int econtrol;
|
|
@@ -1539,19 +1538,17 @@ static int palmas_dt_to_pdata(struct device *dev,
|
|
rinit->roof_floor = econtrol;
|
|
rinit->roof_floor = econtrol;
|
|
}
|
|
}
|
|
|
|
|
|
- ret = of_property_read_u32(match->of_node, "ti,mode-sleep",
|
|
|
|
- &prop);
|
|
|
|
|
|
+ ret = of_property_read_u32(np, "ti,mode-sleep", &prop);
|
|
if (!ret)
|
|
if (!ret)
|
|
rinit->mode_sleep = prop;
|
|
rinit->mode_sleep = prop;
|
|
|
|
|
|
- ret = of_property_read_bool(match->of_node, "ti,smps-range");
|
|
|
|
|
|
+ ret = of_property_read_bool(np, "ti,smps-range");
|
|
if (ret)
|
|
if (ret)
|
|
rinit->vsel = PALMAS_SMPS12_VOLTAGE_RANGE;
|
|
rinit->vsel = PALMAS_SMPS12_VOLTAGE_RANGE;
|
|
|
|
|
|
if (idx == PALMAS_REG_LDO8)
|
|
if (idx == PALMAS_REG_LDO8)
|
|
pdata->enable_ldo8_tracking = of_property_read_bool(
|
|
pdata->enable_ldo8_tracking = of_property_read_bool(
|
|
- match->of_node,
|
|
|
|
- "ti,enable-ldo8-tracking");
|
|
|
|
|
|
+ np, "ti,enable-ldo8-tracking");
|
|
}
|
|
}
|
|
|
|
|
|
pdata->ldo6_vibrator = of_property_read_bool(node, "ti,ldo6-vibrator");
|
|
pdata->ldo6_vibrator = of_property_read_bool(node, "ti,ldo6-vibrator");
|