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

Pull updates of sound stuff from Takashi Iwai:
 "Here is the first big update chunk of sound stuff for 3.4-rc1.

  In the common sound infrastructure, there are a few changes for
  dynamic PCM support (used in ASoC) and a few clean-ups.  Majority of
  changes are found, as usual, in HD-audio and ASoC.

  Some highlights of HD-audio changes:

   - All the long-standing static quirk codes for Realtek codec were
     finally removed by fixing and extending the Realtek auto-parser.

   - The mute-LED control is standardized over all HD-audio codec
     drivers using the extended vmaster hook.

   - The vmaster slave mixer elements are initialized to 0dB as default
     so that the user won't be annoyed by the silent output after
     updates, e.g.  due to the additions of new elements.

   - Other many fix-ups for the misc HD-audio devices.

  In the ASoC side, this is a very active release, including a quite a
  few framework enhancements.  Some highlights:

   - Support for widgets not associated with a CODEC, an important part
     of the dynamic PCM framework.

   - A library factoring out the common code shared by dmaengine based
     DMA drivers contributed by Lars-Peter Clausen.  This will save a
     lot of code and make it much easier to deploy enhancements to
     dmaengine.

   - Support for binary controls, used for providing runtime
     configuration of algorithm coefficients.

   - A new DAPM widget type for regulator supplies allowing drivers for
     devices that can power down unused supplies while active to do
     without any per-driver code.

   - DAPM widgets for DAIs, initially giving a speed boost for playback
     startup and shutdown and also the basis for CODEC<->CODEC DAI link
     support.

   - Support for specifying the number of significant bits on audio
     interfaces, useful for allowing applications to know how much
     effort to put into generating data for a larger sample format.

   - Conversion of the FSI driver used on some SH processors to
     DMAEngine.

   - Conversion of EP93xx drivers to DMAEngine.

   - New CODEC drivers for Maxim MAX9768 and Wolfson Microelectronics
     WM2200.

   - Move audmux driver from arc/arm to sound/soc

   - McBSP move from arch/ to sound/ and updates

  Also, a few small updates and fixes for other drivers like au88x0,
  ymfpci, USB 6fire, USB usx2yaudio are included."

* tag 'sound-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (446 commits)
  ASoC: wm8994: Provide VMID mode control and fix default sequence
  ASoC: wm8994: Add missing break in resume
  ASoC: wm_hubs: Don't actively manage LINEOUT_VMID_BUF
  ASoC: pxa-ssp: atomically set stream active masks
  ASoC: fsl: p1022ds: tell the WM8776 codec driver that it's the master
  ASoC: Samsung: Added to support mono recording
  ALSA: hda - Fix build with CONFIG_PM=n
  ALSA: au88x0 - Avoid possible Oops at unbinding
  ALSA: usb-audio - Fix build error by consitification of rate list
  ASoC: core: Fix obscure leak of runtime array
  ALSA: pcm - Avoid GFP_ATOMIC in snd_pcm_link()
  ALSA: pcm: Constify the list in snd_pcm_hw_constraint_list
  ASoC: wm8996: Add 44.1kHz support
  ALSA: hda - Fix build of patch_sigmatel.c without CONFIG_SND_HDA_POWER_SAVE
  ASoC: mx27vis-aic32x4: Convert it to platform driver
  ALSA: hda - fix printing of high HDMI sample rates
  ALSA: ymfpci - Fix legacy registers on S3/S4 resume
  ALSA: control - Fixe a trailing white space error
  ALSA: hda - Add expose_enum_ctl flag to snd_hda_add_vmaster_hook()
  ALSA: hda - Add "Mute-LED Mode" enum control
  ...

5 files changed, 0 insertions, 351 deletions

diff --git a/arch/arm/plat-mxc/Kconfig b/arch/arm/plat-mxc/Kconfig
index dcebb1230f7f..c722f9ce6918 100644
--- a/arch/arm/plat-mxc/Kconfig
+++ b/arch/arm/plat-mxc/Kconfig
@@ -88,12 +88,6 @@ config IMX_HAVE_IOMUX_V1
 config ARCH_MXC_IOMUX_V3
         bool
 
-config ARCH_MXC_AUDMUX_V1
-        bool
-
-config ARCH_MXC_AUDMUX_V2
-        bool
-
 config IRAM_ALLOC
         bool
         select GENERIC_ALLOCATOR
diff --git a/arch/arm/plat-mxc/Makefile b/arch/arm/plat-mxc/Makefile
index 076db84f3e31..e81290c27c65 100644
--- a/arch/arm/plat-mxc/Makefile
+++ b/arch/arm/plat-mxc/Makefile
@@ -14,8 +14,6 @@ obj-$(CONFIG_IRAM_ALLOC) += iram_alloc.o
 obj-$(CONFIG_MXC_PWM)  += pwm.o
 obj-$(CONFIG_MXC_ULPI) += ulpi.o
 obj-$(CONFIG_MXC_USE_EPIT) += epit.o
-obj-$(CONFIG_ARCH_MXC_AUDMUX_V1) += audmux-v1.o
-obj-$(CONFIG_ARCH_MXC_AUDMUX_V2) += audmux-v2.o
 obj-$(CONFIG_MXC_DEBUG_BOARD) += 3ds_debugboard.o
 obj-$(CONFIG_CPU_FREQ_IMX)    += cpufreq.o
 ifdef CONFIG_SND_IMX_SOC
diff --git a/arch/arm/plat-mxc/audmux-v1.c b/arch/arm/plat-mxc/audmux-v1.c
deleted file mode 100644
index 1180bef7664b..000000000000
--- a/arch/arm/plat-mxc/audmux-v1.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright 2009 Pengutronix, Sascha Hauer <s.hauer@pengutronix.de>
- *
- * Initial development of this code was funded by
- * Phytec Messtechnik GmbH, http://www.phytec.de
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#include <linux/module.h>
-#include <linux/err.h>
-#include <linux/io.h>
-#include <linux/clk.h>
-#include <mach/audmux.h>
-#include <mach/hardware.h>
-
-static void __iomem *audmux_base;
-
-static unsigned char port_mapping[] = {
-        0x0, 0x4, 0x8, 0x10, 0x14, 0x1c,
-};
-
-int mxc_audmux_v1_configure_port(unsigned int port, unsigned int pcr)
-{
-        if (!audmux_base) {
-                printk("%s: not configured\n", __func__);
-                return -ENOSYS;
-        }
-
-        if (port >= ARRAY_SIZE(port_mapping))
-                return -EINVAL;
-
-        writel(pcr, audmux_base + port_mapping[port]);
-
-        return 0;
-}
-EXPORT_SYMBOL_GPL(mxc_audmux_v1_configure_port);
-
-static int mxc_audmux_v1_init(void)
-{
-#ifdef CONFIG_MACH_MX21
-        if (cpu_is_mx21())
-                audmux_base = MX21_IO_ADDRESS(MX21_AUDMUX_BASE_ADDR);
-        else
-#endif
-#ifdef CONFIG_MACH_MX27
-        if (cpu_is_mx27())
-                audmux_base = MX27_IO_ADDRESS(MX27_AUDMUX_BASE_ADDR);
-        else
-#endif
-                (void)0;
-        
-        return 0;
-}
-
-postcore_initcall(mxc_audmux_v1_init);
diff --git a/arch/arm/plat-mxc/audmux-v2.c b/arch/arm/plat-mxc/audmux-v2.c
deleted file mode 100644
index 8cced35009bd..000000000000
--- a/arch/arm/plat-mxc/audmux-v2.c
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- * Copyright 2009 Pengutronix, Sascha Hauer <s.hauer@pengutronix.de>
- *
- * Initial development of this code was funded by
- * Phytec Messtechnik GmbH, http://www.phytec.de
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#include <linux/module.h>
-#include <linux/err.h>
-#include <linux/io.h>
-#include <linux/clk.h>
-#include <linux/debugfs.h>
-#include <linux/slab.h>
-#include <mach/audmux.h>
-#include <mach/hardware.h>
-
-static struct clk *audmux_clk;
-static void __iomem *audmux_base;
-
-#define MXC_AUDMUX_V2_PTCR(x)           ((x) * 8)
-#define MXC_AUDMUX_V2_PDCR(x)           ((x) * 8 + 4)
-
-#ifdef CONFIG_DEBUG_FS
-static struct dentry *audmux_debugfs_root;
-
-static int audmux_open_file(struct inode *inode, struct file *file)
-{
-        file->private_data = inode->i_private;
-        return 0;
-}
-
-/* There is an annoying discontinuity in the SSI numbering with regard
- * to the Linux number of the devices */
-static const char *audmux_port_string(int port)
-{
-        switch (port) {
-        case MX31_AUDMUX_PORT1_SSI0:
-                return "imx-ssi.0";
-        case MX31_AUDMUX_PORT2_SSI1:
-                return "imx-ssi.1";
-        case MX31_AUDMUX_PORT3_SSI_PINS_3:
-                return "SSI3";
-        case MX31_AUDMUX_PORT4_SSI_PINS_4:
-                return "SSI4";
-        case MX31_AUDMUX_PORT5_SSI_PINS_5:
-                return "SSI5";
-        case MX31_AUDMUX_PORT6_SSI_PINS_6:
-                return "SSI6";
-        default:
-                return "UNKNOWN";
-        }
-}
-
-static ssize_t audmux_read_file(struct file *file, char __user *user_buf,
-                                size_t count, loff_t *ppos)
-{
-        ssize_t ret;
-        char *buf = kmalloc(PAGE_SIZE, GFP_KERNEL);
-        int port = (int)file->private_data;
-        u32 pdcr, ptcr;
-
-        if (!buf)
-                return -ENOMEM;
-
-        if (audmux_clk)
-                clk_enable(audmux_clk);
-
-        ptcr = readl(audmux_base + MXC_AUDMUX_V2_PTCR(port));
-        pdcr = readl(audmux_base + MXC_AUDMUX_V2_PDCR(port));
-
-        if (audmux_clk)
-                clk_disable(audmux_clk);
-
-        ret = snprintf(buf, PAGE_SIZE, "PDCR: %08x\nPTCR: %08x\n",
-                       pdcr, ptcr);
-
-        if (ptcr & MXC_AUDMUX_V2_PTCR_TFSDIR)
-                ret += snprintf(buf + ret, PAGE_SIZE - ret,
-                                "TxFS output from %s, ",
-                                audmux_port_string((ptcr >> 27) & 0x7));
-        else
-                ret += snprintf(buf + ret, PAGE_SIZE - ret,
-                                "TxFS input, ");
-
-        if (ptcr & MXC_AUDMUX_V2_PTCR_TCLKDIR)
-                ret += snprintf(buf + ret, PAGE_SIZE - ret,
-                                "TxClk output from %s",
-                                audmux_port_string((ptcr >> 22) & 0x7));
-        else
-                ret += snprintf(buf + ret, PAGE_SIZE - ret,
-                                "TxClk input");
-
-        ret += snprintf(buf + ret, PAGE_SIZE - ret, "\n");
-
-        if (ptcr & MXC_AUDMUX_V2_PTCR_SYN) {
-                ret += snprintf(buf + ret, PAGE_SIZE - ret,
-                                "Port is symmetric");
-        } else {
-                if (ptcr & MXC_AUDMUX_V2_PTCR_RFSDIR)
-                        ret += snprintf(buf + ret, PAGE_SIZE - ret,
-                                        "RxFS output from %s, ",
-                                        audmux_port_string((ptcr >> 17) & 0x7));
-                else
-                        ret += snprintf(buf + ret, PAGE_SIZE - ret,
-                                        "RxFS input, ");
-
-                if (ptcr & MXC_AUDMUX_V2_PTCR_RCLKDIR)
-                        ret += snprintf(buf + ret, PAGE_SIZE - ret,
-                                        "RxClk output from %s",
-                                        audmux_port_string((ptcr >> 12) & 0x7));
-                else
-                        ret += snprintf(buf + ret, PAGE_SIZE - ret,
-                                        "RxClk input");
-        }
-
-        ret += snprintf(buf + ret, PAGE_SIZE - ret,
-                        "\nData received from %s\n",
-                        audmux_port_string((pdcr >> 13) & 0x7));
-
-        ret = simple_read_from_buffer(user_buf, count, ppos, buf, ret);
-
-        kfree(buf);
-
-        return ret;
-}
-
-static const struct file_operations audmux_debugfs_fops = {
-        .open = audmux_open_file,
-        .read = audmux_read_file,
-        .llseek = default_llseek,
-};
-
-static void audmux_debugfs_init(void)
-{
-        int i;
-        char buf[20];
-
-        audmux_debugfs_root = debugfs_create_dir("audmux", NULL);
-        if (!audmux_debugfs_root) {
-                pr_warning("Failed to create AUDMUX debugfs root\n");
-                return;
-        }
-
-        for (i = 1; i < 8; i++) {
-                snprintf(buf, sizeof(buf), "ssi%d", i);
-                if (!debugfs_create_file(buf, 0444, audmux_debugfs_root,
-                                         (void *)i, &audmux_debugfs_fops))
-                        pr_warning("Failed to create AUDMUX port %d debugfs file\n",
-                                   i);
-        }
-}
-#else
-static inline void audmux_debugfs_init(void)
-{
-}
-#endif
-
-int mxc_audmux_v2_configure_port(unsigned int port, unsigned int ptcr,
-                unsigned int pdcr)
-{
-        if (!audmux_base)
-                return -ENOSYS;
-
-        if (audmux_clk)
-                clk_enable(audmux_clk);
-
-        writel(ptcr, audmux_base + MXC_AUDMUX_V2_PTCR(port));
-        writel(pdcr, audmux_base + MXC_AUDMUX_V2_PDCR(port));
-
-        if (audmux_clk)
-                clk_disable(audmux_clk);
-
-        return 0;
-}
-EXPORT_SYMBOL_GPL(mxc_audmux_v2_configure_port);
-
-static int mxc_audmux_v2_init(void)
-{
-        int ret;
-        if (cpu_is_mx51()) {
-                audmux_base = MX51_IO_ADDRESS(MX51_AUDMUX_BASE_ADDR);
-        } else if (cpu_is_mx31()) {
-                audmux_base = MX31_IO_ADDRESS(MX31_AUDMUX_BASE_ADDR);
-        } else if (cpu_is_mx35()) {
-                audmux_clk = clk_get(NULL, "audmux");
-                if (IS_ERR(audmux_clk)) {
-                        ret = PTR_ERR(audmux_clk);
-                        printk(KERN_ERR "%s: cannot get clock: %d\n", __func__,
-                                        ret);
-                        return ret;
-                }
-                audmux_base = MX35_IO_ADDRESS(MX35_AUDMUX_BASE_ADDR);
-        } else if (cpu_is_mx25()) {
-                audmux_clk = clk_get(NULL, "audmux");
-                if (IS_ERR(audmux_clk)) {
-                        ret = PTR_ERR(audmux_clk);
-                        printk(KERN_ERR "%s: cannot get clock: %d\n", __func__,
-                                        ret);
-                        return ret;
-                }
-                audmux_base = MX25_IO_ADDRESS(MX25_AUDMUX_BASE_ADDR);
-        }
-
-        audmux_debugfs_init();
-
-        return 0;
-}
-
-postcore_initcall(mxc_audmux_v2_init);
diff --git a/arch/arm/plat-mxc/include/mach/audmux.h b/arch/arm/plat-mxc/include/mach/audmux.h
deleted file mode 100644
index 6fda788ed0e9..000000000000
--- a/arch/arm/plat-mxc/include/mach/audmux.h
+++ /dev/null
@@ -1,60 +0,0 @@
-#ifndef __MACH_AUDMUX_H
-#define __MACH_AUDMUX_H
-
-#define MX27_AUDMUX_HPCR1_SSI0          0
-#define MX27_AUDMUX_HPCR2_SSI1          1
-#define MX27_AUDMUX_HPCR3_SSI_PINS_4    2
-#define MX27_AUDMUX_PPCR1_SSI_PINS_1    3
-#define MX27_AUDMUX_PPCR2_SSI_PINS_2    4
-#define MX27_AUDMUX_PPCR3_SSI_PINS_3    5
-
-#define MX31_AUDMUX_PORT1_SSI0          0
-#define MX31_AUDMUX_PORT2_SSI1          1
-#define MX31_AUDMUX_PORT3_SSI_PINS_3    2
-#define MX31_AUDMUX_PORT4_SSI_PINS_4    3
-#define MX31_AUDMUX_PORT5_SSI_PINS_5    4
-#define MX31_AUDMUX_PORT6_SSI_PINS_6    5
-
-#define MX51_AUDMUX_PORT1_SSI0          0
-#define MX51_AUDMUX_PORT2_SSI1          1
-#define MX51_AUDMUX_PORT3               2
-#define MX51_AUDMUX_PORT4               3
-#define MX51_AUDMUX_PORT5               4
-#define MX51_AUDMUX_PORT6               5
-#define MX51_AUDMUX_PORT7               6
-
-/* Register definitions for the i.MX21/27 Digital Audio Multiplexer */
-#define MXC_AUDMUX_V1_PCR_INMMASK(x)    ((x) & 0xff)
-#define MXC_AUDMUX_V1_PCR_INMEN         (1 << 8)
-#define MXC_AUDMUX_V1_PCR_TXRXEN        (1 << 10)
-#define MXC_AUDMUX_V1_PCR_SYN           (1 << 12)
-#define MXC_AUDMUX_V1_PCR_RXDSEL(x)     (((x) & 0x7) << 13)
-#define MXC_AUDMUX_V1_PCR_RFCSEL(x)     (((x) & 0xf) << 20)
-#define MXC_AUDMUX_V1_PCR_RCLKDIR       (1 << 24)
-#define MXC_AUDMUX_V1_PCR_RFSDIR        (1 << 25)
-#define MXC_AUDMUX_V1_PCR_TFCSEL(x)     (((x) & 0xf) << 26)
-#define MXC_AUDMUX_V1_PCR_TCLKDIR       (1 << 30)
-#define MXC_AUDMUX_V1_PCR_TFSDIR        (1 << 31)
-
-/* Register definitions for the i.MX25/31/35/51 Digital Audio Multiplexer */
-#define MXC_AUDMUX_V2_PTCR_TFSDIR       (1 << 31)
-#define MXC_AUDMUX_V2_PTCR_TFSEL(x)     (((x) & 0xf) << 27)
-#define MXC_AUDMUX_V2_PTCR_TCLKDIR      (1 << 26)
-#define MXC_AUDMUX_V2_PTCR_TCSEL(x)     (((x) & 0xf) << 22)
-#define MXC_AUDMUX_V2_PTCR_RFSDIR       (1 << 21)
-#define MXC_AUDMUX_V2_PTCR_RFSEL(x)     (((x) & 0xf) << 17)
-#define MXC_AUDMUX_V2_PTCR_RCLKDIR      (1 << 16)
-#define MXC_AUDMUX_V2_PTCR_RCSEL(x)     (((x) & 0xf) << 12)
-#define MXC_AUDMUX_V2_PTCR_SYN          (1 << 11)
-
-#define MXC_AUDMUX_V2_PDCR_RXDSEL(x)    (((x) & 0x7) << 13)
-#define MXC_AUDMUX_V2_PDCR_TXRXEN       (1 << 12)
-#define MXC_AUDMUX_V2_PDCR_MODE(x)      (((x) & 0x3) << 8)
-#define MXC_AUDMUX_V2_PDCR_INMMASK(x)   ((x) & 0xff)
-
-int mxc_audmux_v1_configure_port(unsigned int port, unsigned int pcr);
-
-int mxc_audmux_v2_configure_port(unsigned int port, unsigned int ptcr,
-                unsigned int pdcr);
-
-#endif /* __MACH_AUDMUX_H */