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
  ...

6 files changed, 375 insertions, 63 deletions

diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index 7c0f1ecfdd7a..104a7c3153c0 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -72,6 +72,16 @@ config INPUT_AD714X_SPI
           To compile this driver as a module, choose M here: the
           module will be called ad714x-spi.
 
+config INPUT_ARIZONA_HAPTICS
+        tristate "Arizona haptics support"
+        depends on MFD_ARIZONA && SND_SOC
+        select INPUT_FF_MEMLESS
+        help
+          Say Y to enable support for the haptics module in Arizona CODECs.
+
+          To compile this driver as a module, choose M here: the
+          module will be called arizona-haptics.
+
 config INPUT_BMA150
         tristate "BMA150/SMB380 acceleration sensor support"
         depends on I2C
diff --git a/drivers/input/misc/Makefile b/drivers/input/misc/Makefile
index 83fe6f5b77d1..5ea769eda999 100644
--- a/drivers/input/misc/Makefile
+++ b/drivers/input/misc/Makefile
@@ -14,6 +14,7 @@ obj-$(CONFIG_INPUT_ADXL34X)		+= adxl34x.o
 obj-$(CONFIG_INPUT_ADXL34X_I2C)         += adxl34x-i2c.o
 obj-$(CONFIG_INPUT_ADXL34X_SPI)         += adxl34x-spi.o
 obj-$(CONFIG_INPUT_APANEL)              += apanel.o
+obj-$(CONFIG_INPUT_ARIZONA_HAPTICS)     += arizona-haptics.o
 obj-$(CONFIG_INPUT_ATI_REMOTE2)         += ati_remote2.o
 obj-$(CONFIG_INPUT_ATLAS_BTNS)          += atlas_btns.o
 obj-$(CONFIG_INPUT_BFIN_ROTARY)         += bfin_rotary.o
diff --git a/drivers/input/misc/arizona-haptics.c b/drivers/input/misc/arizona-haptics.c
new file mode 100644
index 000000000000..7a04f54ef961
--- /dev/null
+++ b/drivers/input/misc/arizona-haptics.c
@@ -0,0 +1,255 @@
+/*
+ * Arizona haptics driver
+ *
+ * Copyright 2012 Wolfson Microelectronics plc
+ *
+ * Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/input.h>
+#include <linux/slab.h>
+
+#include <sound/soc.h>
+#include <sound/soc-dapm.h>
+
+#include <linux/mfd/arizona/core.h>
+#include <linux/mfd/arizona/pdata.h>
+#include <linux/mfd/arizona/registers.h>
+
+struct arizona_haptics {
+        struct arizona *arizona;
+        struct input_dev *input_dev;
+        struct work_struct work;
+
+        struct mutex mutex;
+        u8 intensity;
+};
+
+static void arizona_haptics_work(struct work_struct *work)
+{
+        struct arizona_haptics *haptics = container_of(work,
+                                                       struct arizona_haptics,
+                                                       work);
+        struct arizona *arizona = haptics->arizona;
+        struct mutex *dapm_mutex = &arizona->dapm->card->dapm_mutex;
+        int ret;
+
+        if (!haptics->arizona->dapm) {
+                dev_err(arizona->dev, "No DAPM context\n");
+                return;
+        }
+
+        if (haptics->intensity) {
+                ret = regmap_update_bits(arizona->regmap,
+                                         ARIZONA_HAPTICS_PHASE_2_INTENSITY,
+                                         ARIZONA_PHASE2_INTENSITY_MASK,
+                                         haptics->intensity);
+                if (ret != 0) {
+                        dev_err(arizona->dev, "Failed to set intensity: %d\n",
+                                ret);
+                        return;
+                }
+
+                /* This enable sequence will be a noop if already enabled */
+                ret = regmap_update_bits(arizona->regmap,
+                                         ARIZONA_HAPTICS_CONTROL_1,
+                                         ARIZONA_HAP_CTRL_MASK,
+                                         1 << ARIZONA_HAP_CTRL_SHIFT);
+                if (ret != 0) {
+                        dev_err(arizona->dev, "Failed to start haptics: %d\n",
+                                ret);
+                        return;
+                }
+
+                mutex_lock_nested(dapm_mutex, SND_SOC_DAPM_CLASS_RUNTIME);
+
+                ret = snd_soc_dapm_enable_pin(arizona->dapm, "HAPTICS");
+                if (ret != 0) {
+                        dev_err(arizona->dev, "Failed to start HAPTICS: %d\n",
+                                ret);
+                        mutex_unlock(dapm_mutex);
+                        return;
+                }
+
+                ret = snd_soc_dapm_sync(arizona->dapm);
+                if (ret != 0) {
+                        dev_err(arizona->dev, "Failed to sync DAPM: %d\n",
+                                ret);
+                        mutex_unlock(dapm_mutex);
+                        return;
+                }
+
+                mutex_unlock(dapm_mutex);
+
+        } else {
+                /* This disable sequence will be a noop if already enabled */
+                mutex_lock_nested(dapm_mutex, SND_SOC_DAPM_CLASS_RUNTIME);
+
+                ret = snd_soc_dapm_disable_pin(arizona->dapm, "HAPTICS");
+                if (ret != 0) {
+                        dev_err(arizona->dev, "Failed to disable HAPTICS: %d\n",
+                                ret);
+                        mutex_unlock(dapm_mutex);
+                        return;
+                }
+
+                ret = snd_soc_dapm_sync(arizona->dapm);
+                if (ret != 0) {
+                        dev_err(arizona->dev, "Failed to sync DAPM: %d\n",
+                                ret);
+                        mutex_unlock(dapm_mutex);
+                        return;
+                }
+
+                mutex_unlock(dapm_mutex);
+
+                ret = regmap_update_bits(arizona->regmap,
+                                         ARIZONA_HAPTICS_CONTROL_1,
+                                         ARIZONA_HAP_CTRL_MASK,
+                                         1 << ARIZONA_HAP_CTRL_SHIFT);
+                if (ret != 0) {
+                        dev_err(arizona->dev, "Failed to stop haptics: %d\n",
+                                ret);
+                        return;
+                }
+        }
+}
+
+static int arizona_haptics_play(struct input_dev *input, void *data,
+                                struct ff_effect *effect)
+{
+        struct arizona_haptics *haptics = input_get_drvdata(input);
+        struct arizona *arizona = haptics->arizona;
+
+        if (!arizona->dapm) {
+                dev_err(arizona->dev, "No DAPM context\n");
+                return -EBUSY;
+        }
+
+        if (effect->u.rumble.strong_magnitude) {
+                /* Scale the magnitude into the range the device supports */
+                if (arizona->pdata.hap_act) {
+                        haptics->intensity =
+                                effect->u.rumble.strong_magnitude >> 9;
+                        if (effect->direction < 0x8000)
+                                haptics->intensity += 0x7f;
+                } else {
+                        haptics->intensity =
+                                effect->u.rumble.strong_magnitude >> 8;
+                }
+        } else {
+                haptics->intensity = 0;
+        }
+
+        schedule_work(&haptics->work);
+
+        return 0;
+}
+
+static void arizona_haptics_close(struct input_dev *input)
+{
+        struct arizona_haptics *haptics = input_get_drvdata(input);
+        struct mutex *dapm_mutex = &haptics->arizona->dapm->card->dapm_mutex;
+
+        cancel_work_sync(&haptics->work);
+
+        mutex_lock_nested(dapm_mutex, SND_SOC_DAPM_CLASS_RUNTIME);
+
+        if (haptics->arizona->dapm)
+                snd_soc_dapm_disable_pin(haptics->arizona->dapm, "HAPTICS");
+
+        mutex_unlock(dapm_mutex);
+}
+
+static int arizona_haptics_probe(struct platform_device *pdev)
+{
+        struct arizona *arizona = dev_get_drvdata(pdev->dev.parent);
+        struct arizona_haptics *haptics;
+        int ret;
+
+        haptics = devm_kzalloc(&pdev->dev, sizeof(*haptics), GFP_KERNEL);
+        if (!haptics)
+                return -ENOMEM;
+
+        haptics->arizona = arizona;
+
+        ret = regmap_update_bits(arizona->regmap, ARIZONA_HAPTICS_CONTROL_1,
+                                 ARIZONA_HAP_ACT, arizona->pdata.hap_act);
+        if (ret != 0) {
+                dev_err(arizona->dev, "Failed to set haptics actuator: %d\n",
+                        ret);
+                return ret;
+        }
+
+        INIT_WORK(&haptics->work, arizona_haptics_work);
+
+        haptics->input_dev = input_allocate_device();
+        if (haptics->input_dev == NULL) {
+                dev_err(arizona->dev, "Failed to allocate input device\n");
+                return -ENOMEM;
+        }
+
+        input_set_drvdata(haptics->input_dev, haptics);
+
+        haptics->input_dev->name = "arizona:haptics";
+        haptics->input_dev->dev.parent = pdev->dev.parent;
+        haptics->input_dev->close = arizona_haptics_close;
+        __set_bit(FF_RUMBLE, haptics->input_dev->ffbit);
+
+        ret = input_ff_create_memless(haptics->input_dev, NULL,
+                                      arizona_haptics_play);
+        if (ret < 0) {
+                dev_err(arizona->dev, "input_ff_create_memless() failed: %d\n",
+                        ret);
+                goto err_ialloc;
+        }
+
+        ret = input_register_device(haptics->input_dev);
+        if (ret < 0) {
+                dev_err(arizona->dev, "couldn't register input device: %d\n",
+                        ret);
+                goto err_iff;
+        }
+
+        platform_set_drvdata(pdev, haptics);
+
+        return 0;
+
+err_iff:
+        if (haptics->input_dev)
+                input_ff_destroy(haptics->input_dev);
+err_ialloc:
+        input_free_device(haptics->input_dev);
+
+        return ret;
+}
+
+static int arizona_haptics_remove(struct platform_device *pdev)
+{
+        struct arizona_haptics *haptics = platform_get_drvdata(pdev);
+
+        input_unregister_device(haptics->input_dev);
+
+        return 0;
+}
+
+static struct platform_driver arizona_haptics_driver = {
+        .probe          = arizona_haptics_probe,
+        .remove         = arizona_haptics_remove,
+        .driver         = {
+                .name   = "arizona-haptics",
+                .owner  = THIS_MODULE,
+        },
+};
+module_platform_driver(arizona_haptics_driver);
+
+MODULE_ALIAS("platform:arizona-haptics");
+MODULE_DESCRIPTION("Arizona haptics driver");
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Mark Brown <broonie@opensource.wolfsonmicro.com>");
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,
diff --git a/drivers/misc/atmel-ssc.c b/drivers/misc/atmel-ssc.c
index c58f9abcb356..158da5a81a66 100644
--- a/drivers/misc/atmel-ssc.c
+++ b/drivers/misc/atmel-ssc.c
@@ -18,6 +18,8 @@
 #include <linux/slab.h>
 #include <linux/module.h>
 
+#include <linux/of.h>
+
 /* Serialize access to ssc_list and user count */
 static DEFINE_SPINLOCK(user_lock);
 static LIST_HEAD(ssc_list);
@@ -29,7 +31,13 @@ struct ssc_device *ssc_request(unsigned int ssc_num)
 
         spin_lock(&user_lock);
         list_for_each_entry(ssc, &ssc_list, list) {
-                if (ssc->pdev->id == ssc_num) {
+                if (ssc->pdev->dev.of_node) {
+                        if (of_alias_get_id(ssc->pdev->dev.of_node, "ssc")
+                                == ssc_num) {
+                                ssc_valid = 1;
+                                break;
+                        }
+                } else if (ssc->pdev->id == ssc_num) {
                         ssc_valid = 1;
                         break;
                 }
@@ -68,39 +76,93 @@ void ssc_free(struct ssc_device *ssc)
 }
 EXPORT_SYMBOL(ssc_free);
 
-static int __init ssc_probe(struct platform_device *pdev)
+static struct atmel_ssc_platform_data at91rm9200_config = {
+        .use_dma = 0,
+};
+
+static struct atmel_ssc_platform_data at91sam9g45_config = {
+        .use_dma = 1,
+};
+
+static const struct platform_device_id atmel_ssc_devtypes[] = {
+        {
+                .name = "at91rm9200_ssc",
+                .driver_data = (unsigned long) &at91rm9200_config,
+        }, {
+                .name = "at91sam9g45_ssc",
+                .driver_data = (unsigned long) &at91sam9g45_config,
+        }, {
+                /* sentinel */
+        }
+};
+
+#ifdef CONFIG_OF
+static const struct of_device_id atmel_ssc_dt_ids[] = {
+        {
+                .compatible = "atmel,at91rm9200-ssc",
+                .data = &at91rm9200_config,
+        }, {
+                .compatible = "atmel,at91sam9g45-ssc",
+                .data = &at91sam9g45_config,
+        }, {
+                /* sentinel */
+        }
+};
+MODULE_DEVICE_TABLE(of, atmel_ssc_dt_ids);
+#endif
+
+static inline const struct atmel_ssc_platform_data * __init
+        atmel_ssc_get_driver_data(struct platform_device *pdev)
+{
+        if (pdev->dev.of_node) {
+                const struct of_device_id *match;
+                match = of_match_node(atmel_ssc_dt_ids, pdev->dev.of_node);
+                if (match == NULL)
+                        return NULL;
+                return match->data;
+        }
+
+        return (struct atmel_ssc_platform_data *)
+                platform_get_device_id(pdev)->driver_data;
+}
+
+static int ssc_probe(struct platform_device *pdev)
 {
-        int retval = 0;
         struct resource *regs;
         struct ssc_device *ssc;
+        const struct atmel_ssc_platform_data *plat_dat;
 
-        ssc = kzalloc(sizeof(struct ssc_device), GFP_KERNEL);
+        ssc = devm_kzalloc(&pdev->dev, sizeof(struct ssc_device), GFP_KERNEL);
         if (!ssc) {
                 dev_dbg(&pdev->dev, "out of memory\n");
-                retval = -ENOMEM;
-                goto out;
+                return -ENOMEM;
         }
 
+        ssc->pdev = pdev;
+
+        plat_dat = atmel_ssc_get_driver_data(pdev);
+        if (!plat_dat)
+                return -ENODEV;
+        ssc->pdata = (struct atmel_ssc_platform_data *)plat_dat;
+
         regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         if (!regs) {
                 dev_dbg(&pdev->dev, "no mmio resource defined\n");
-                retval = -ENXIO;
-                goto out_free;
+                return -ENXIO;
         }
 
-        ssc->clk = clk_get(&pdev->dev, "pclk");
-        if (IS_ERR(ssc->clk)) {
-                dev_dbg(&pdev->dev, "no pclk clock defined\n");
-                retval = -ENXIO;
-                goto out_free;
-        }
-
-        ssc->pdev = pdev;
-        ssc->regs = ioremap(regs->start, resource_size(regs));
+        ssc->regs = devm_request_and_ioremap(&pdev->dev, regs);
         if (!ssc->regs) {
                 dev_dbg(&pdev->dev, "ioremap failed\n");
-                retval = -EINVAL;
-                goto out_clk;
+                return -EINVAL;
+        }
+
+        ssc->phybase = regs->start;
+
+        ssc->clk = devm_clk_get(&pdev->dev, "pclk");
+        if (IS_ERR(ssc->clk)) {
+                dev_dbg(&pdev->dev, "no pclk clock defined\n");
+                return -ENXIO;
         }
 
         /* disable all interrupts */
@@ -112,8 +174,7 @@ static int __init ssc_probe(struct platform_device *pdev)
         ssc->irq = platform_get_irq(pdev, 0);
         if (!ssc->irq) {
                 dev_dbg(&pdev->dev, "could not get irq\n");
-                retval = -ENXIO;
-                goto out_unmap;
+                return -ENXIO;
         }
 
         spin_lock(&user_lock);
@@ -125,16 +186,7 @@ static int __init ssc_probe(struct platform_device *pdev)
         dev_info(&pdev->dev, "Atmel SSC device at 0x%p (irq %d)\n",
                         ssc->regs, ssc->irq);
 
-        goto out;
-
-out_unmap:
-        iounmap(ssc->regs);
-out_clk:
-        clk_put(ssc->clk);
-out_free:
-        kfree(ssc);
-out:
-        return retval;
+        return 0;
 }
 
 static int ssc_remove(struct platform_device *pdev)
@@ -142,34 +194,23 @@ static int ssc_remove(struct platform_device *pdev)
         struct ssc_device *ssc = platform_get_drvdata(pdev);
 
         spin_lock(&user_lock);
-        iounmap(ssc->regs);
-        clk_put(ssc->clk);
         list_del(&ssc->list);
-        kfree(ssc);
         spin_unlock(&user_lock);
 
         return 0;
 }
 
 static struct platform_driver ssc_driver = {
-        .remove         = ssc_remove,
         .driver         = {
                 .name           = "ssc",
                 .owner          = THIS_MODULE,
+                .of_match_table = of_match_ptr(atmel_ssc_dt_ids),
         },
+        .id_table       = atmel_ssc_devtypes,
+        .probe          = ssc_probe,
+        .remove         = ssc_remove,
 };
-
-static int __init ssc_init(void)
-{
-        return platform_driver_probe(&ssc_driver, ssc_probe);
-}
-module_init(ssc_init);
-
-static void __exit ssc_exit(void)
-{
-        platform_driver_unregister(&ssc_driver);
-}
-module_exit(ssc_exit);
+module_platform_driver(ssc_driver);
 
 MODULE_AUTHOR("Hans-Christian Egtvedt <hcegtvedt@atmel.com>");
 MODULE_DESCRIPTION("SSC driver for Atmel AVR32 and AT91");