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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (526 commits)
  ASoC: twl6040 - Add method to query optimum PDM_DL1 gain
  ALSA: hda - Fix the lost power-setup of seconary pins after PM resume
  ALSA: usb-audio: add Yamaha MOX6/MOX8 support
  ALSA: virtuoso: add S/PDIF input support for all Xonars
  ALSA: ice1724 - Support for ooAoo SQ210a
  ALSA: ice1724 - Allow card info based on model only
  ALSA: ice1724 - Create capture pcm only for ADC-enabled configurations
  ALSA: hdspm - Provide unique driver id based on card serial
  ASoC: Dynamically allocate the rtd device for a non-empty release()
  ASoC: Fix recursive dependency due to select ATMEL_SSC in SND_ATMEL_SOC_SSC
  ALSA: hda - Fix the detection of "Loopback Mixing" control for VIA codecs
  ALSA: hda - Return the error from get_wcaps_type() for invalid NIDs
  ALSA: hda - Use auto-parser for HP laptops with cx20459 codec
  ALSA: asihpi - Fix potential Oops in snd_asihpi_cmode_info()
  ALSA: hdsp - Fix potential Oops in snd_hdsp_info_pref_sync_ref()
  ALSA: hda/cirrus - support for iMac12,2 model
  ASoC: cx20442: add bias control over a platform provided regulator
  ALSA: usb-audio - Avoid flood of frame-active debug messages
  ALSA: snd-usb-us122l: Delete calls to preempt_disable
  mfd: Put WM8994 into cache only mode when suspending
  ...

Fix up trivial conflicts in:
 - arch/arm/mach-s3c64xx/mach-crag6410.c:
	renamed speyside_wm8962 to tobermory, added littlemill right
	next to it
 - drivers/base/regmap/{regcache.c,regmap.c}:
	duplicate diff that had already come in with other changes in
	the regmap tree

3 files changed, 0 insertions, 166 deletions

diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig
index efba163595db..9b00072a020f 100644
--- a/drivers/firmware/Kconfig
+++ b/drivers/firmware/Kconfig
@@ -145,18 +145,6 @@ config ISCSI_IBFT
           detect iSCSI boot parameters dynamically during system boot, say Y.
           Otherwise, say N.
 
-config SIGMA
-        tristate "SigmaStudio firmware loader"
-        depends on I2C
-        select CRC32
-        default n
-        help
-          Enable helper functions for working with Analog Devices SigmaDSP
-          parts and binary firmwares produced by Analog Devices SigmaStudio.
-
-          If unsure, say N here.  Drivers that need these helpers will select
-          this option automatically.
-
 source "drivers/firmware/google/Kconfig"
 
 endmenu
diff --git a/drivers/firmware/Makefile b/drivers/firmware/Makefile
index 47338c979126..5a7e27399729 100644
--- a/drivers/firmware/Makefile
+++ b/drivers/firmware/Makefile
@@ -12,6 +12,5 @@ obj-$(CONFIG_DMIID)		+= dmi-id.o
 obj-$(CONFIG_ISCSI_IBFT_FIND)   += iscsi_ibft_find.o
 obj-$(CONFIG_ISCSI_IBFT)        += iscsi_ibft.o
 obj-$(CONFIG_FIRMWARE_MEMMAP)   += memmap.o
-obj-$(CONFIG_SIGMA)             += sigma.o
 
 obj-$(CONFIG_GOOGLE_FIRMWARE)   += google/
diff --git a/drivers/firmware/sigma.c b/drivers/firmware/sigma.c
deleted file mode 100644
index 1eedb6f7fdab..000000000000
--- a/drivers/firmware/sigma.c
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Load Analog Devices SigmaStudio firmware files
- *
- * Copyright 2009-2011 Analog Devices Inc.
- *
- * Licensed under the GPL-2 or later.
- */
-
-#include <linux/crc32.h>
-#include <linux/delay.h>
-#include <linux/firmware.h>
-#include <linux/kernel.h>
-#include <linux/i2c.h>
-#include <linux/module.h>
-#include <linux/sigma.h>
-
-static size_t sigma_action_size(struct sigma_action *sa)
-{
-        size_t payload = 0;
-
-        switch (sa->instr) {
-        case SIGMA_ACTION_WRITEXBYTES:
-        case SIGMA_ACTION_WRITESINGLE:
-        case SIGMA_ACTION_WRITESAFELOAD:
-                payload = sigma_action_len(sa);
-                break;
-        default:
-                break;
-        }
-
-        payload = ALIGN(payload, 2);
-
-        return payload + sizeof(struct sigma_action);
-}
-
-/*
- * Returns a negative error value in case of an error, 0 if processing of
- * the firmware should be stopped after this action, 1 otherwise.
- */
-static int
-process_sigma_action(struct i2c_client *client, struct sigma_action *sa)
-{
-        size_t len = sigma_action_len(sa);
-        int ret;
-
-        pr_debug("%s: instr:%i addr:%#x len:%zu\n", __func__,
-                sa->instr, sa->addr, len);
-
-        switch (sa->instr) {
-        case SIGMA_ACTION_WRITEXBYTES:
-        case SIGMA_ACTION_WRITESINGLE:
-        case SIGMA_ACTION_WRITESAFELOAD:
-                ret = i2c_master_send(client, (void *)&sa->addr, len);
-                if (ret < 0)
-                        return -EINVAL;
-                break;
-        case SIGMA_ACTION_DELAY:
-                udelay(len);
-                len = 0;
-                break;
-        case SIGMA_ACTION_END:
-                return 0;
-        default:
-                return -EINVAL;
-        }
-
-        return 1;
-}
-
-static int
-process_sigma_actions(struct i2c_client *client, struct sigma_firmware *ssfw)
-{
-        struct sigma_action *sa;
-        size_t size;
-        int ret;
-
-        while (ssfw->pos + sizeof(*sa) <= ssfw->fw->size) {
-                sa = (struct sigma_action *)(ssfw->fw->data + ssfw->pos);
-
-                size = sigma_action_size(sa);
-                ssfw->pos += size;
-                if (ssfw->pos > ssfw->fw->size || size == 0)
-                        break;
-
-                ret = process_sigma_action(client, sa);
-
-                pr_debug("%s: action returned %i\n", __func__, ret);
-
-                if (ret <= 0)
-                        return ret;
-        }
-
-        if (ssfw->pos != ssfw->fw->size)
-                return -EINVAL;
-
-        return 0;
-}
-
-int process_sigma_firmware(struct i2c_client *client, const char *name)
-{
-        int ret;
-        struct sigma_firmware_header *ssfw_head;
-        struct sigma_firmware ssfw;
-        const struct firmware *fw;
-        u32 crc;
-
-        pr_debug("%s: loading firmware %s\n", __func__, name);
-
-        /* first load the blob */
-        ret = request_firmware(&fw, name, &client->dev);
-        if (ret) {
-                pr_debug("%s: request_firmware() failed with %i\n", __func__, ret);
-                return ret;
-        }
-        ssfw.fw = fw;
-
-        /* then verify the header */
-        ret = -EINVAL;
-
-        /*
-         * Reject too small or unreasonable large files. The upper limit has been
-         * chosen a bit arbitrarily, but it should be enough for all practical
-         * purposes and having the limit makes it easier to avoid integer
-         * overflows later in the loading process.
-         */
-        if (fw->size < sizeof(*ssfw_head) || fw->size >= 0x4000000)
-                goto done;
-
-        ssfw_head = (void *)fw->data;
-        if (memcmp(ssfw_head->magic, SIGMA_MAGIC, ARRAY_SIZE(ssfw_head->magic)))
-                goto done;
-
-        crc = crc32(0, fw->data + sizeof(*ssfw_head),
-                        fw->size - sizeof(*ssfw_head));
-        pr_debug("%s: crc=%x\n", __func__, crc);
-        if (crc != le32_to_cpu(ssfw_head->crc))
-                goto done;
-
-        ssfw.pos = sizeof(*ssfw_head);
-
-        /* finally process all of the actions */
-        ret = process_sigma_actions(client, &ssfw);
-
- done:
-        release_firmware(fw);
-
-        pr_debug("%s: loaded %s\n", __func__, name);
-
-        return ret;
-}
-EXPORT_SYMBOL(process_sigma_firmware);
-
-MODULE_LICENSE("GPL");