|
@@ -359,7 +359,6 @@ static struct regulator_ops tps6507x_pmic_ops = {
|
|
|
.map_voltage = regulator_map_voltage_ascend,
|
|
|
};
|
|
|
|
|
|
-#ifdef CONFIG_OF
|
|
|
static struct of_regulator_match tps6507x_matches[] = {
|
|
|
{ .name = "VDCDC1"},
|
|
|
{ .name = "VDCDC2"},
|
|
@@ -424,15 +423,7 @@ static struct tps6507x_board *tps6507x_parse_dt_reg_data(
|
|
|
|
|
|
return tps_board;
|
|
|
}
|
|
|
-#else
|
|
|
-static inline struct tps6507x_board *tps6507x_parse_dt_reg_data(
|
|
|
- struct platform_device *pdev,
|
|
|
- struct of_regulator_match **tps6507x_reg_matches)
|
|
|
-{
|
|
|
- *tps6507x_reg_matches = NULL;
|
|
|
- return NULL;
|
|
|
-}
|
|
|
-#endif
|
|
|
+
|
|
|
static int tps6507x_pmic_probe(struct platform_device *pdev)
|
|
|
{
|
|
|
struct tps6507x_dev *tps6507x_dev = dev_get_drvdata(pdev->dev.parent);
|
|
@@ -453,9 +444,10 @@ static int tps6507x_pmic_probe(struct platform_device *pdev)
|
|
|
*/
|
|
|
|
|
|
tps_board = dev_get_platdata(tps6507x_dev->dev);
|
|
|
- if (!tps_board && tps6507x_dev->dev->of_node)
|
|
|
+ if (IS_ENABLED(CONFIG_OF) && !tps_board &&
|
|
|
+ tps6507x_dev->dev->of_node)
|
|
|
tps_board = tps6507x_parse_dt_reg_data(pdev,
|
|
|
- &tps6507x_reg_matches);
|
|
|
+ &tps6507x_reg_matches);
|
|
|
if (!tps_board)
|
|
|
return -EINVAL;
|
|
|
|
|
@@ -481,7 +473,7 @@ static int tps6507x_pmic_probe(struct platform_device *pdev)
|
|
|
tps->info[i] = info;
|
|
|
if (init_data->driver_data) {
|
|
|
struct tps6507x_reg_platform_data *data =
|
|
|
- init_data->driver_data;
|
|
|
+ init_data->driver_data;
|
|
|
tps->info[i]->defdcdc_default = data->defdcdc_default;
|
|
|
}
|
|
|
|