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

Pull sound updates from Takashi Iwai:
 "There are no too intrusive changes in this update batch.  The biggest
  LOC is found in the new DICE driver, and other small changes are
  scattered over the whole sound subtree (which is a common pattern).

  Below are highlights:

   - ALSA core:
     * Memory allocation support with genpool
     * Fix blocking in drain ioctl of compress_offload

   - HD-audio:
     * Improved AMD HDMI supports
     * Intel HDMI detection improvements
     * thinkpad_acpi mute-key integration
     * New PCI ID, New ALC255,285,293 codecs, CX20952

   - USB-audio:
     * New buffer size management
     * Clean up endpoint handling codes

   - ASoC:
     * Further work on the dmaengine helpers, including support for
       configuring the parameters for DMA by reading the capabilities of
       the DMA controller which removes some guesswork and magic numbers
       from drivers.
     * A refresh of the documentation.
     * Conversions of many drivers to direct regmap API usage in order
       to allow the ASoC level register I/O code to be removed, this
       will hopefully be completed by v3.14.
     * Support for using async register I/O in DAPM, reducing the time
       taken to implement power transitions on systems that support it.

   - Firewire: DICE driver

   - Lots of small fixes for bugs reported by Coverity"

* tag 'sound-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (382 commits)
  ALSA: hda/realtek - Add new codec ALC255/ALC3234 UAJ supported
  ALSA: hda - Apply MacBook fixups for CS4208 correctly
  ASoC: fsl: imx-wm8962: remove an unneeded check
  ASoC: fsl: imx-pcm-fiq: Remove unused 'runtime' variable
  ALSA: hda/realtek - Make fixup regs persist after resume
  ALSA: hda_intel: ratelimit "spurious response" message
  ASoC: generic-dmaengine-pcm: Use SNDRV_DMA_TYPE_DEV_IRAM as default
  ASoC: dapm: Use WARN_ON() instead of BUG_ON()
  ASoC: wm_adsp: Fix BUG_ON() and WARN_ON() usages
  ASoC: Replace BUG() with WARN()
  ASoC: wm_hubs: Replace BUG() with WARN()
  ASoC: wm8996: Replace BUG() with WARN()
  ASoC: wm8962: Replace BUG() with WARN()
  ASoC: wm8958: Replace BUG() with WARN()
  ASoC: wm8904: Replace BUG() with WARN()
  ASoC: wm8900: Replace BUG() with WARN()
  ASoC: wm8350: Replace BUG() with WARN()
  ASoC: txx9: Use WARN_ON() instead of BUG_ON()
  ASoC: sh: Use WARN_ON() instead of BUG_ON()
  ASoC: rcar: Use WARN_ON() instead of BUG_ON()
  ...

1 files changed, 91 insertions, 1 deletions

diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index 03ca6c139f1a..0b7efb269cf1 100644
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -23,7 +23,7 @@
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
-#define TPACPI_VERSION "0.24"
+#define TPACPI_VERSION "0.25"
 #define TPACPI_SYSFS_VERSION 0x020700
 
 /*
@@ -88,6 +88,7 @@
 
 #include <linux/pci_ids.h>
 
+#include <linux/thinkpad_acpi.h>
 
 /* ThinkPad CMOS commands */
 #define TP_CMOS_VOLUME_DOWN     0
@@ -8350,6 +8351,91 @@ static struct ibm_struct fan_driver_data = {
         .resume = fan_resume,
 };
 
+/*************************************************************************
+ * Mute LED subdriver
+ */
+
+
+struct tp_led_table {
+        acpi_string name;
+        int on_value;
+        int off_value;
+        int state;
+};
+
+static struct tp_led_table led_tables[] = {
+        [TPACPI_LED_MUTE] = {
+                .name = "SSMS",
+                .on_value = 1,
+                .off_value = 0,
+        },
+        [TPACPI_LED_MICMUTE] = {
+                .name = "MMTS",
+                .on_value = 2,
+                .off_value = 0,
+        },
+};
+
+static int mute_led_on_off(struct tp_led_table *t, bool state)
+{
+        acpi_handle temp;
+        int output;
+
+        if (!ACPI_SUCCESS(acpi_get_handle(hkey_handle, t->name, &temp))) {
+                pr_warn("Thinkpad ACPI has no %s interface.\n", t->name);
+                return -EIO;
+        }
+
+        if (!acpi_evalf(hkey_handle, &output, t->name, "dd",
+                        state ? t->on_value : t->off_value))
+                return -EIO;
+
+        t->state = state;
+        return state;
+}
+
+int tpacpi_led_set(int whichled, bool on)
+{
+        struct tp_led_table *t;
+
+        if (whichled < 0 || whichled >= TPACPI_LED_MAX)
+                return -EINVAL;
+
+        t = &led_tables[whichled];
+        if (t->state < 0 || t->state == on)
+                return t->state;
+        return mute_led_on_off(t, on);
+}
+EXPORT_SYMBOL_GPL(tpacpi_led_set);
+
+static int mute_led_init(struct ibm_init_struct *iibm)
+{
+        acpi_handle temp;
+        int i;
+
+        for (i = 0; i < TPACPI_LED_MAX; i++) {
+                struct tp_led_table *t = &led_tables[i];
+                if (ACPI_SUCCESS(acpi_get_handle(hkey_handle, t->name, &temp)))
+                        mute_led_on_off(t, false);
+                else
+                        t->state = -ENODEV;
+        }
+        return 0;
+}
+
+static void mute_led_exit(void)
+{
+        int i;
+
+        for (i = 0; i < TPACPI_LED_MAX; i++)
+                tpacpi_led_set(i, false);
+}
+
+static struct ibm_struct mute_led_driver_data = {
+        .name = "mute_led",
+        .exit = mute_led_exit,
+};
+
 /****************************************************************************
  ****************************************************************************
  *
@@ -8768,6 +8854,10 @@ static struct ibm_init_struct ibms_init[] __initdata = {
                 .init = fan_init,
                 .data = &fan_driver_data,
         },
+        {
+                .init = mute_led_init,
+                .data = &mute_led_driver_data,
+        },
 };
 
 static int __init set_ibm_param(const char *val, struct kernel_param *kp)