Merge branch 'next' of git://github.com/kernelslacker/cpufreq

[mv-sheeva.git] / drivers / regulator / wm8994-regulator.c

diff --git a/drivers/regulator/wm8994-regulator.c b/drivers/regulator/wm8994-regulator.c
index 1a6a690f24dbecc415c7c7f9c5006573a767ef0b..b87bf5c841f8216a8867db35b23bab5acd0acce2 100644 (file)
--- a/drivers/regulator/wm8994-regulator.c
+++ b/drivers/regulator/wm8994-regulator.c
@@ -140,6 +140,14 @@ static int wm8994_ldo2_list_voltage(struct regulator_dev *rdev,
                return (selector * 100000) + 900000;
        case WM8958:
                return (selector * 100000) + 1000000;
+       case WM1811:
+               switch (selector) {
+               case 0:
+                       return -EINVAL;
+               default:
+                       return (selector * 100000) + 950000;
+               }
+               break;
        default:
                return -EINVAL;
        }
@@ -170,6 +178,11 @@ static int wm8994_ldo2_set_voltage(struct regulator_dev *rdev,
        case WM8958:
                selector = (min_uV - 1000000) / 100000;
                break;
+       case WM1811:
+               selector = (min_uV - 950000) / 100000;
+               if (selector == 0)
+                       selector = 1;
+               break;
        default:
                return -EINVAL;
        }