Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma

[pandora-kernel.git] / drivers / regulator / tps65910-regulator.c

diff --git a/drivers/regulator/tps65910-regulator.c b/drivers/regulator/tps65910-regulator.c
index 521c925..4e01a42 100644 (file)
--- a/drivers/regulator/tps65910-regulator.c
+++ b/drivers/regulator/tps65910-regulator.c
@@ -31,54 +31,54 @@
                        TPS65910_SLEEP_CONTROL_EXT_INPUT_EN3 |          \
                        TPS65911_SLEEP_CONTROL_EXT_INPUT_SLEEP)
 
-/* supported VIO voltages in milivolts */
+/* supported VIO voltages in millivolts */
 static const u16 VIO_VSEL_table[] = {
        1500, 1800, 2500, 3300,
 };
 
 /* VSEL tables for TPS65910 specific LDOs and dcdc's */
 
-/* supported VDD3 voltages in milivolts */
+/* supported VDD3 voltages in millivolts */
 static const u16 VDD3_VSEL_table[] = {
        5000,
 };
 
-/* supported VDIG1 voltages in milivolts */
+/* supported VDIG1 voltages in millivolts */
 static const u16 VDIG1_VSEL_table[] = {
        1200, 1500, 1800, 2700,
 };
 
-/* supported VDIG2 voltages in milivolts */
+/* supported VDIG2 voltages in millivolts */
 static const u16 VDIG2_VSEL_table[] = {
        1000, 1100, 1200, 1800,
 };
 
-/* supported VPLL voltages in milivolts */
+/* supported VPLL voltages in millivolts */
 static const u16 VPLL_VSEL_table[] = {
        1000, 1100, 1800, 2500,
 };
 
-/* supported VDAC voltages in milivolts */
+/* supported VDAC voltages in millivolts */
 static const u16 VDAC_VSEL_table[] = {
        1800, 2600, 2800, 2850,
 };
 
-/* supported VAUX1 voltages in milivolts */
+/* supported VAUX1 voltages in millivolts */
 static const u16 VAUX1_VSEL_table[] = {
        1800, 2500, 2800, 2850,
 };
 
-/* supported VAUX2 voltages in milivolts */
+/* supported VAUX2 voltages in millivolts */
 static const u16 VAUX2_VSEL_table[] = {
        1800, 2800, 2900, 3300,
 };
 
-/* supported VAUX33 voltages in milivolts */
+/* supported VAUX33 voltages in millivolts */
 static const u16 VAUX33_VSEL_table[] = {
        1800, 2000, 2800, 3300,
 };
 
-/* supported VMMC voltages in milivolts */
+/* supported VMMC voltages in millivolts */
 static const u16 VMMC_VSEL_table[] = {
        1800, 2800, 3000, 3300,
 };
@@ -1071,7 +1071,8 @@ static struct of_regulator_match tps65911_matches[] = {
 };
 
 static struct tps65910_board *tps65910_parse_dt_reg_data(
-                               struct platform_device *pdev)
+               struct platform_device *pdev,
+               struct of_regulator_match **tps65910_reg_matches)
 {
        struct tps65910_board *pmic_plat_data;
        struct tps65910 *tps65910 = dev_get_drvdata(pdev->dev.parent);
@@ -1090,6 +1091,10 @@ static struct tps65910_board *tps65910_parse_dt_reg_data(
        }
 
        regulators = of_find_node_by_name(np, "regulators");
+       if (!regulators) {
+               dev_err(&pdev->dev, "regulator node not found\n");
+               return NULL;
+       }
 
        switch (tps65910_chip_id(tps65910)) {
        case TPS65910:
@@ -1101,7 +1106,7 @@ static struct tps65910_board *tps65910_parse_dt_reg_data(
                matches = tps65911_matches;
                break;
        default:
-               pr_err("Invalid tps chip version\n");
+               dev_err(&pdev->dev, "Invalid tps chip version\n");
                return NULL;
        }
 
@@ -1112,6 +1117,8 @@ static struct tps65910_board *tps65910_parse_dt_reg_data(
                return NULL;
        }
 
+       *tps65910_reg_matches = matches;
+
        for (idx = 0; idx < count; idx++) {
                if (!matches[idx].init_data || !matches[idx].of_node)
                        continue;
@@ -1129,8 +1136,10 @@ static struct tps65910_board *tps65910_parse_dt_reg_data(
 }
 #else
 static inline struct tps65910_board *tps65910_parse_dt_reg_data(
-                               struct platform_device *pdev)
+                       struct platform_device *pdev,
+                       struct of_regulator_match **tps65910_reg_matches)
 {
+       *tps65910_reg_matches = NULL;
        return 0;
 }
 #endif
@@ -1144,18 +1153,24 @@ static __devinit int tps65910_probe(struct platform_device *pdev)
        struct regulator_dev *rdev;
        struct tps65910_reg *pmic;
        struct tps65910_board *pmic_plat_data;
+       struct of_regulator_match *tps65910_reg_matches = NULL;
        int i, err;
 
        pmic_plat_data = dev_get_platdata(tps65910->dev);
        if (!pmic_plat_data && tps65910->dev->of_node)
-               pmic_plat_data = tps65910_parse_dt_reg_data(pdev);
+               pmic_plat_data = tps65910_parse_dt_reg_data(pdev,
+                                               &tps65910_reg_matches);
 
-       if (!pmic_plat_data)
+       if (!pmic_plat_data) {
+               dev_err(&pdev->dev, "Platform data not found\n");
                return -EINVAL;
+       }
 
        pmic = devm_kzalloc(&pdev->dev, sizeof(*pmic), GFP_KERNEL);
-       if (!pmic)
+       if (!pmic) {
+               dev_err(&pdev->dev, "Memory allocation failed for pmic\n");
                return -ENOMEM;
+       }
 
        mutex_init(&pmic->mutex);
        pmic->mfd = tps65910;
@@ -1179,7 +1194,7 @@ static __devinit int tps65910_probe(struct platform_device *pdev)
                info = tps65911_regs;
                break;
        default:
-               pr_err("Invalid tps chip version\n");
+               dev_err(&pdev->dev, "Invalid tps chip version\n");
                return -ENODEV;
        }
 
@@ -1257,10 +1272,8 @@ static __devinit int tps65910_probe(struct platform_device *pdev)
                config.driver_data = pmic;
                config.regmap = tps65910->regmap;
 
-#ifdef CONFIG_OF
-               config.of_node = of_find_node_by_name(tps65910->dev->of_node,
-                                                       info->name);
-#endif
+               if (tps65910_reg_matches)
+                       config.of_node = tps65910_reg_matches[i].of_node;
 
                rdev = regulator_register(&pmic->desc[i], &config);
                if (IS_ERR(rdev)) {