Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (348 commits)
  ALSA: hda - Fix NULL-derefence with a single mic in STAC auto-mic detection
  ALSA: hda - Add missing NID 0x19 fixup for Sony VAIO
  ALSA: hda - Fix ALC275 enable hardware EQ for SONY VAIO
  ALSA: oxygen: fix Xonar DG input
  ALSA: hda - Fix EAPD on Lenovo NB ALC269 to low
  ALSA: hda - Fix missing EAPD for Acer 4930G
  ALSA: hda: Disable 4/6 channels on some NVIDIA GPUs.
  ALSA: hda - Add static_hdmi_pcm option to HDMI codec parser
  ALSA: hda - Don't refer ELD when unplugged
  ASoC: tpa6130a2: Fix compiler warning
  ASoC: tlv320dac33: Add DAPM selection for LOM invert
  ASoC: DMIC codec: Adding a generic DMIC codec
  ALSA: snd-usb-us122l: Fix missing NULL checks
  ALSA: snd-usb-us122l: Fix MIDI output
  ASoC: soc-cache: Fix invalid memory access during snd_soc_lzo_cache_sync()
  ASoC: Fix section mismatch in wm8995.c
  ALSA: oxygen: add S/PDIF source selection for Claro cards
  ALSA: oxygen: fix CD/MIDI for X-Meridian (2G)
  ASoC: fix migor audio build
  ALSA: include delay.h for msleep in Xonar DG support
  ...

1 files changed, 21 insertions, 2 deletions

diff --git a/drivers/regulator/wm8994-regulator.c b/drivers/regulator/wm8994-regulator.c
index 594f88eb60c3..35b2958d5106 100644
--- a/drivers/regulator/wm8994-regulator.c
+++ b/drivers/regulator/wm8994-regulator.c
@@ -130,10 +130,19 @@ static struct regulator_ops wm8994_ldo1_ops = {
 static int wm8994_ldo2_list_voltage(struct regulator_dev *rdev,
                                     unsigned int selector)
 {
+        struct wm8994_ldo *ldo = rdev_get_drvdata(rdev);
+
         if (selector > WM8994_LDO2_MAX_SELECTOR)
                 return -EINVAL;
 
-        return (selector * 100000) + 900000;
+        switch (ldo->wm8994->type) {
+        case WM8994:
+                return (selector * 100000) + 900000;
+        case WM8958:
+                return (selector * 100000) + 1000000;
+        default:
+                return -EINVAL;
+        }
 }
 
 static int wm8994_ldo2_get_voltage_sel(struct regulator_dev *rdev)
@@ -154,7 +163,17 @@ static int wm8994_ldo2_set_voltage(struct regulator_dev *rdev,
         struct wm8994_ldo *ldo = rdev_get_drvdata(rdev);
         int selector, v;
 
-        selector = (min_uV - 900000) / 100000;
+        switch (ldo->wm8994->type) {
+        case WM8994:
+                selector = (min_uV - 900000) / 100000;
+                break;
+        case WM8958:
+                selector = (min_uV - 1000000) / 100000;
+                break;
+        default:
+                return -EINVAL;
+        }
+
         v = wm8994_ldo2_list_voltage(rdev, selector);
         if (v < 0 || v > max_uV)
                 return -EINVAL;