Merge tag 'sound-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

Pull sound updates from Takashi Iwai:
 "This update contains a fairly wide range of changes all over in sound
  subdirectory, mainly because of UAPI header moves by David and __dev*
  annotation removals by Bill.  Other highlights are:

   - Introduced the support for wallclock timestamps in ALSA PCM core

   - Add the poll loop implementation for HD-audio jack detection

   - Yet more VGA-switcheroo fixes for HD-audio

   - New VIA HD-audio codec support

   - More fixes on resource management in USB audio and MIDI drivers

   - More quirks for USB-audio ASUS Xonar U3, Reloop Play, Focusrite,
     Roland VG-99, etc

   - Add support for FastTrack C400 usb-audio

   - Clean ups in many drivers regarding firmware loading

   - Add PSC724 Ultiimate Edge support to ice1712

   - A few hdspm driver updates

   - New Stanton SCS.1d/1m FireWire driver

   - Standardisation of the logging in ASoC codes

   - DT and dmaengine support for ASoC Atmel

   - Support for Wolfson ADSP cores

   - New drivers for Freescale/iVeia P1022 and Maxim MAX98090

   - Lots of other ASoC driver fixes and developments"

Fix up trivial conflicts.  And go out on a limb and assume the dts file
'status' field of one of the conflicting things was supposed to be
"disabled", not "disable" like in pretty much all other cases.

* tag 'sound-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (341 commits)
  ALSA: hda - Move runtime PM check to runtime_idle callback
  ALSA: hda - Add stereo-dmic fixup for Acer Aspire One 522
  ALSA: hda - Avoid doubly suspend after vga switcheroo
  ALSA: usb-audio: Enable S/PDIF on the ASUS Xonar U3
  ALSA: hda - Check validity of CORB/RIRB WP reads
  ALSA: hda - use usleep_range in link reset and change timeout check
  ALSA: HDA: VIA: Add support for codec VT1808.
  ALSA: HDA: VIA Add support for codec VT1705CF.
  ASoC: codecs: remove __dev* attributes
  ASoC: utils: remove __dev* attributes
  ASoC: ux500: remove __dev* attributes
  ASoC: txx9: remove __dev* attributes
  ASoC: tegra: remove __dev* attributes
  ASoC: spear: remove __dev* attributes
  ASoC: sh: remove __dev* attributes
  ASoC: s6000: remove __dev* attributes
  ASoC: OMAP: remove __dev* attributes
  ASoC: nuc900: remove __dev* attributes
  ASoC: mxs: remove __dev* attributes
  ASoC: kirkwood: remove __dev* attributes
  ...

2 files changed, 21 insertions, 16 deletions

diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
index 1a6f943f7337..c784f4602a74 100644
--- a/drivers/mfd/arizona-core.c
+++ b/drivers/mfd/arizona-core.c
@@ -272,6 +272,7 @@ static struct mfd_cell early_devs[] = {
 static struct mfd_cell wm5102_devs[] = {
         { .name = "arizona-extcon" },
         { .name = "arizona-gpio" },
+        { .name = "arizona-haptics" },
         { .name = "arizona-micsupp" },
         { .name = "arizona-pwm" },
         { .name = "wm5102-codec" },
@@ -280,6 +281,7 @@ static struct mfd_cell wm5102_devs[] = {
 static struct mfd_cell wm5110_devs[] = {
         { .name = "arizona-extcon" },
         { .name = "arizona-gpio" },
+        { .name = "arizona-haptics" },
         { .name = "arizona-micsupp" },
         { .name = "arizona-pwm" },
         { .name = "wm5110-codec" },
diff --git a/drivers/mfd/wm8994-core.c b/drivers/mfd/wm8994-core.c
index c7f62ac544ad..bcb226ff9d2b 100644
--- a/drivers/mfd/wm8994-core.c
+++ b/drivers/mfd/wm8994-core.c
@@ -401,13 +401,19 @@ static const struct reg_default wm1811_reva_patch[] = {
  */
 static int wm8994_device_init(struct wm8994 *wm8994, int irq)
 {
-        struct wm8994_pdata *pdata = wm8994->dev->platform_data;
+        struct wm8994_pdata *pdata;
         struct regmap_config *regmap_config;
         const struct reg_default *regmap_patch = NULL;
         const char *devname;
         int ret, i, patch_regs;
         int pulls = 0;
 
+        if (dev_get_platdata(wm8994->dev)) {
+                pdata = dev_get_platdata(wm8994->dev);
+                wm8994->pdata = *pdata;
+        }
+        pdata = &wm8994->pdata;
+
         dev_set_drvdata(wm8994->dev, wm8994);
 
         /* Add the on-chip regulators first for bootstrapping */
@@ -604,24 +610,21 @@ static int wm8994_device_init(struct wm8994 *wm8994, int irq)
                 }
         }
 
-        if (pdata) {
-                wm8994->irq_base = pdata->irq_base;
-                wm8994->gpio_base = pdata->gpio_base;
-
-                /* GPIO configuration is only applied if it's non-zero */
-                for (i = 0; i < ARRAY_SIZE(pdata->gpio_defaults); i++) {
-                        if (pdata->gpio_defaults[i]) {
-                                wm8994_set_bits(wm8994, WM8994_GPIO_1 + i,
-                                                0xffff,
-                                                pdata->gpio_defaults[i]);
-                        }
+        wm8994->irq_base = pdata->irq_base;
+        wm8994->gpio_base = pdata->gpio_base;
+
+        /* GPIO configuration is only applied if it's non-zero */
+        for (i = 0; i < ARRAY_SIZE(pdata->gpio_defaults); i++) {
+                if (pdata->gpio_defaults[i]) {
+                        wm8994_set_bits(wm8994, WM8994_GPIO_1 + i,
+                                        0xffff, pdata->gpio_defaults[i]);
                 }
+        }
 
-                wm8994->ldo_ena_always_driven = pdata->ldo_ena_always_driven;
+        wm8994->ldo_ena_always_driven = pdata->ldo_ena_always_driven;
 
-                if (pdata->spkmode_pu)
-                        pulls |= WM8994_SPKMODE_PU;
-        }
+        if (pdata->spkmode_pu)
+                pulls |= WM8994_SPKMODE_PU;
 
         /* Disable unneeded pulls */
         wm8994_set_bits(wm8994, WM8994_PULL_CONTROL_2,