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

Pull sound updates from Takashi Iwai:
 "This contains pretty many small commits covering fairly large range of
  files in sound/ directory.  Partly because of additional API support
  and partly because of constantly developed ASoC and ARM stuff.

  Some highlights:

   - Introduced the helper function and documentation for exposing the
     channel map via control API, as discussed in Plumbers; most of PCI
     drivers are covered, will follow more drivers later

   - Most of drivers have been replaced with the new PM callbacks (if
     the bus is supported)

   - HD-audio controller got the support of runtime PM and the support
     of D3 clock-stop.  Also changing the power_save option in sysfs
     kicks off immediately to enable / disable the power-save mode.

   - Another significant code change in HD-audio is the rewrite of
     firmware loading code.  Other than that, most of changes in
     HD-audio are continued cleanups and standardization for the generic
     auto parser and bug fixes (HBR, device-specific fixups), in
     addition to the support of channel-map API.

   - Addition of ASoC bindings for the compressed API, used by the
     mid-x86 drivers.

   - Lots of cleanups and API refreshes for ASoC codec drivers and
     DaVinci.

   - Conversion of OMAP to dmaengine.

   - New machine driver for Wolfson Microelectronics Bells.

   - New CODEC driver for Wolfson Microelectronics WM0010.

   - Enhancements to the ux500 and wm2000 drivers

   - A new driver for DA9055 and the support for regulator bypass mode."

Fix up various arm soc header file reorg conflicts.

* tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (339 commits)
  ALSA: hda - Add new codec ALC283 ALC290 support
  ALSA: hda - avoid unneccesary indices on "Headphone Jack" controls
  ALSA: hda - fix indices on boost volume on Conexant
  ALSA: aloop - add locking to timer access
  ALSA: hda - Fix hang caused by race during suspend.
  sound: Remove unnecessary semicolon
  ALSA: hda/realtek - Fix detection of ALC271X codec
  ALSA: hda - Add inverted internal mic quirk for Lenovo IdeaPad U310
  ALSA: hda - make Realtek/Sigmatel/Conexant use the generic unsol event
  ALSA: hda - make a generic unsol event handler
  ASoC: codecs: Add DA9055 codec driver
  ASoC: eukrea-tlv320: Convert it to platform driver
  ALSA: ASoC: add DT bindings for CS4271
  ASoC: wm_hubs: Ensure volume updates are handled during class W startup
  ASoC: wm5110: Adding missing volume update bits
  ASoC: wm5110: Add OUT3R support
  ASoC: wm5110: Add AEC loopback support
  ASoC: wm5110: Rename EPOUT to HPOUT3
  ASoC: arizona: Add more clock rates
  ASoC: arizona: Add more DSP options for mixer input muxes
  ...

13 files changed, 59 insertions, 128 deletions

diff --git a/arch/arm/mach-omap2/board-am3517evm.c b/arch/arm/mach-omap2/board-am3517evm.c
index 0d99c9110d01..e16289755f2e 100644
--- a/arch/arm/mach-omap2/board-am3517evm.c
+++ b/arch/arm/mach-omap2/board-am3517evm.c
@@ -263,6 +263,16 @@ static __init void am3517_evm_musb_init(void)
         usb_musb_init(&musb_board_data);
 }
 
+static __init void am3517_evm_mcbsp1_init(void)
+{
+        u32 devconf0;
+
+        /* McBSP1 CLKR/FSR signal to be connected to CLKX/FSX pin */
+        devconf0 = omap_ctrl_readl(OMAP2_CONTROL_DEVCONF0);
+        devconf0 |=  OMAP2_MCBSP1_CLKR_MASK | OMAP2_MCBSP1_FSR_MASK;
+        omap_ctrl_writel(devconf0, OMAP2_CONTROL_DEVCONF0);
+}
+
 static const struct usbhs_omap_board_data usbhs_bdata __initconst = {
         .port_mode[0] = OMAP_EHCI_PORT_MODE_PHY,
 #if defined(CONFIG_PANEL_SHARP_LQ043T1DG01) || \
@@ -366,6 +376,9 @@ static void __init am3517_evm_init(void)
         /* MUSB */
         am3517_evm_musb_init();
 
+        /* McBSP1 */
+        am3517_evm_mcbsp1_init();
+
         /* MMC init function */
         omap_hsmmc_init(mmc);
 }
diff --git a/arch/arm/mach-omap2/board-cm-t35.c b/arch/arm/mach-omap2/board-cm-t35.c
index 8ffd612c5e07..376d26eb601c 100644
--- a/arch/arm/mach-omap2/board-cm-t35.c
+++ b/arch/arm/mach-omap2/board-cm-t35.c
@@ -723,6 +723,7 @@ static void __init cm_t3x_common_init(void)
         cm_t35_init_ethernet();
         cm_t35_init_led();
         cm_t35_init_display();
+        omap_twl4030_audio_init("cm-t3x");
 
         usb_musb_init(NULL);
         cm_t35_init_usbh();
diff --git a/arch/arm/mach-omap2/board-devkit8000.c b/arch/arm/mach-omap2/board-devkit8000.c
index 7bb8056d4388..1fd161e934c7 100644
--- a/arch/arm/mach-omap2/board-devkit8000.c
+++ b/arch/arm/mach-omap2/board-devkit8000.c
@@ -623,6 +623,7 @@ static void __init devkit8000_init(void)
         usbhs_init(&usbhs_bdata);
         omap_nand_flash_init(NAND_BUSWIDTH_16, devkit8000_nand_partitions,
                              ARRAY_SIZE(devkit8000_nand_partitions));
+        omap_twl4030_audio_init("omap3beagle");
 
         /* Ensure SDRC pins are mux'd for self-refresh */
         omap_mux_init_signal("sdrc_cke0", OMAP_PIN_OUTPUT);
diff --git a/arch/arm/mach-omap2/board-igep0020.c b/arch/arm/mach-omap2/board-igep0020.c
index fb8bd837dd13..48d5e41dfbfa 100644
--- a/arch/arm/mach-omap2/board-igep0020.c
+++ b/arch/arm/mach-omap2/board-igep0020.c
@@ -625,6 +625,7 @@ static void __init igep_init(void)
 
         igep_flash_init();
         igep_leds_init();
+        omap_twl4030_audio_init("igep2");
 
         /*
          * WLAN-BT combo module from MuRata which has a Marvell WLAN
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
index 68ff8d51973c..a08bebc94ec5 100644
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -514,6 +514,7 @@ static void __init omap3_beagle_init(void)
         usbhs_init(&usbhs_bdata);
         omap_nand_flash_init(NAND_BUSWIDTH_16, omap3beagle_nand_partitions,
                              ARRAY_SIZE(omap3beagle_nand_partitions));
+        omap_twl4030_audio_init("omap3beagle");
 
         /* Ensure msecure is mux'd to be able to set the RTC. */
         omap_mux_init_signal("sys_drm_msecure", OMAP_PIN_OFF_OUTPUT_HIGH);
diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c
index c64e565bdef5..a3959de85e05 100644
--- a/arch/arm/mach-omap2/board-omap3evm.c
+++ b/arch/arm/mach-omap2/board-omap3evm.c
@@ -739,6 +739,7 @@ static void __init omap3_evm_init(void)
         omap3evm_init_smsc911x();
         omap3_evm_display_init();
         omap3_evm_wl12xx_init();
+        omap_twl4030_audio_init("omap3evm");
 }
 
 MACHINE_START(OMAP3EVM, "OMAP3 EVM")
diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c
index 2e7f24030fc9..b700685762b5 100644
--- a/arch/arm/mach-omap2/board-overo.c
+++ b/arch/arm/mach-omap2/board-overo.c
@@ -504,6 +504,7 @@ static void __init overo_init(void)
         overo_display_init();
         overo_init_led();
         overo_init_keys();
+        omap_twl4030_audio_init("overo");
 
         /* Ensure SDRC pins are mux'd for self-refresh */
         omap_mux_init_signal("sdrc_cke0", OMAP_PIN_OUTPUT);
diff --git a/arch/arm/mach-omap2/board-zoom-peripherals.c b/arch/arm/mach-omap2/board-zoom-peripherals.c
index 6bcc107b9fc3..67f8540c8e07 100644
--- a/arch/arm/mach-omap2/board-zoom-peripherals.c
+++ b/arch/arm/mach-omap2/board-zoom-peripherals.c
@@ -35,6 +35,7 @@
 #include "common-board-devices.h"
 
 #define OMAP_ZOOM_WLAN_PMENA_GPIO       (101)
+#define ZOOM2_HEADSET_EXTMUTE_GPIO      (153)
 #define OMAP_ZOOM_WLAN_IRQ_GPIO         (162)
 
 #define LCD_PANEL_ENABLE_GPIO           (7 + OMAP_MAX_GPIO_LINES)
@@ -245,12 +246,6 @@ static int zoom_twl_gpio_setup(struct device *dev,
         return ret;
 }
 
-/* EXTMUTE callback function */
-static void zoom2_set_hs_extmute(int mute)
-{
-        gpio_set_value(ZOOM2_HEADSET_EXTMUTE_GPIO, mute);
-}
-
 static struct twl4030_gpio_platform_data zoom_gpio_data = {
         .setup          = zoom_twl_gpio_setup,
 };
@@ -277,7 +272,7 @@ static int __init omap_i2c_init(void)
 
                 codec_data->ramp_delay_value = 3;       /* 161 ms */
                 codec_data->hs_extmute = 1;
-                codec_data->set_hs_extmute = zoom2_set_hs_extmute;
+                codec_data->hs_extmute_gpio = ZOOM2_HEADSET_EXTMUTE_GPIO;
         }
         omap_pmic_init(1, 2400, "twl5030", 7 + OMAP_INTC_START, &zoom_twldata);
         omap_register_i2c_bus(2, 400, NULL, 0);
diff --git a/arch/arm/mach-omap2/include/mach/board-zoom.h b/arch/arm/mach-omap2/include/mach/board-zoom.h
index 775fdc3b000b..2e9486940ead 100644
--- a/arch/arm/mach-omap2/include/mach/board-zoom.h
+++ b/arch/arm/mach-omap2/include/mach/board-zoom.h
@@ -8,5 +8,3 @@
 extern int __init zoom_debugboard_init(void);
 extern void __init zoom_peripherals_init(void);
 extern void __init zoom_display_init(void);
-
-#define ZOOM2_HEADSET_EXTMUTE_GPIO      153
diff --git a/arch/arm/mach-omap2/mcbsp.c b/arch/arm/mach-omap2/mcbsp.c
index 7d47407d6d46..37f8f948047b 100644
--- a/arch/arm/mach-omap2/mcbsp.c
+++ b/arch/arm/mach-omap2/mcbsp.c
@@ -15,6 +15,7 @@
 #include <linux/clk.h>
 #include <linux/err.h>
 #include <linux/io.h>
+#include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 #include <linux/platform_data/asoc-ti-mcbsp.h>
@@ -23,8 +24,6 @@
 #include <plat/omap_device.h>
 #include <linux/pm_runtime.h>
 
-#include "control.h"
-
 /*
  * FIXME: Find a mechanism to enable/disable runtime the McBSP ICLK autoidle.
  * Sidetone needs non-gated ICLK and sidetone autoidle is broken.
@@ -32,112 +31,6 @@
 #include "cm2xxx_3xxx.h"
 #include "cm-regbits-34xx.h"
 
-/* McBSP1 internal signal muxing function for OMAP2/3 */
-static int omap2_mcbsp1_mux_rx_clk(struct device *dev, const char *signal,
-                                   const char *src)
-{
-        u32 v;
-
-        v = omap_ctrl_readl(OMAP2_CONTROL_DEVCONF0);
-
-        if (!strcmp(signal, "clkr")) {
-                if (!strcmp(src, "clkr"))
-                        v &= ~OMAP2_MCBSP1_CLKR_MASK;
-                else if (!strcmp(src, "clkx"))
-                        v |= OMAP2_MCBSP1_CLKR_MASK;
-                else
-                        return -EINVAL;
-        } else if (!strcmp(signal, "fsr")) {
-                if (!strcmp(src, "fsr"))
-                        v &= ~OMAP2_MCBSP1_FSR_MASK;
-                else if (!strcmp(src, "fsx"))
-                        v |= OMAP2_MCBSP1_FSR_MASK;
-                else
-                        return -EINVAL;
-        } else {
-                return -EINVAL;
-        }
-
-        omap_ctrl_writel(v, OMAP2_CONTROL_DEVCONF0);
-
-        return 0;
-}
-
-/* McBSP4 internal signal muxing function for OMAP4 */
-#define OMAP4_CONTROL_MCBSPLP_ALBCTRLRX_FSX     (1 << 31)
-#define OMAP4_CONTROL_MCBSPLP_ALBCTRLRX_CLKX    (1 << 30)
-static int omap4_mcbsp4_mux_rx_clk(struct device *dev, const char *signal,
-                                   const char *src)
-{
-        u32 v;
-
-        /*
-         * In CONTROL_MCBSPLP register only bit 30 (CLKR mux), and bit 31 (FSR
-         * mux) is used */
-        v = omap4_ctrl_pad_readl(OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_MCBSPLP);
-
-        if (!strcmp(signal, "clkr")) {
-                if (!strcmp(src, "clkr"))
-                        v &= ~OMAP4_CONTROL_MCBSPLP_ALBCTRLRX_CLKX;
-                else if (!strcmp(src, "clkx"))
-                        v |= OMAP4_CONTROL_MCBSPLP_ALBCTRLRX_CLKX;
-                else
-                        return -EINVAL;
-        } else if (!strcmp(signal, "fsr")) {
-                if (!strcmp(src, "fsr"))
-                        v &= ~OMAP4_CONTROL_MCBSPLP_ALBCTRLRX_FSX;
-                else if (!strcmp(src, "fsx"))
-                        v |= OMAP4_CONTROL_MCBSPLP_ALBCTRLRX_FSX;
-                else
-                        return -EINVAL;
-        } else {
-                return -EINVAL;
-        }
-
-        omap4_ctrl_pad_writel(v, OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_MCBSPLP);
-
-        return 0;
-}
-
-/* McBSP CLKS source switching function */
-static int omap2_mcbsp_set_clk_src(struct device *dev, struct clk *clk,
-                                   const char *src)
-{
-        struct clk *fck_src;
-        char *fck_src_name;
-        int r;
-
-        if (!strcmp(src, "clks_ext"))
-                fck_src_name = "pad_fck";
-        else if (!strcmp(src, "clks_fclk"))
-                fck_src_name = "prcm_fck";
-        else
-                return -EINVAL;
-
-        fck_src = clk_get(dev, fck_src_name);
-        if (IS_ERR_OR_NULL(fck_src)) {
-                pr_err("omap-mcbsp: %s: could not clk_get() %s\n", "clks",
-                       fck_src_name);
-                return -EINVAL;
-        }
-
-        pm_runtime_put_sync(dev);
-
-        r = clk_set_parent(clk, fck_src);
-        if (IS_ERR_VALUE(r)) {
-                pr_err("omap-mcbsp: %s: could not clk_set_parent() to %s\n",
-                       "clks", fck_src_name);
-                clk_put(fck_src);
-                return -EINVAL;
-        }
-
-        pm_runtime_get_sync(dev);
-
-        clk_put(fck_src);
-
-        return 0;
-}
-
 static int omap3_enable_st_clock(unsigned int id, bool enable)
 {
         unsigned int w;
@@ -179,17 +72,11 @@ static int __init omap_init_mcbsp(struct omap_hwmod *oh, void *unused)
                 pdata->reg_size = 4;
                 pdata->has_ccr = true;
         }
-        pdata->set_clk_src = omap2_mcbsp_set_clk_src;
-
-        /* On OMAP2/3 the McBSP1 port has 6 pin configuration */
-        if (id == 1 && oh->class->rev < MCBSP_CONFIG_TYPE4)
-                pdata->mux_signal = omap2_mcbsp1_mux_rx_clk;
 
-        /* On OMAP4 the McBSP4 port has 6 pin configuration */
-        if (id == 4 && oh->class->rev == MCBSP_CONFIG_TYPE4)
-                pdata->mux_signal = omap4_mcbsp4_mux_rx_clk;
-
-        if (oh->class->rev == MCBSP_CONFIG_TYPE3) {
+        if (oh->class->rev == MCBSP_CONFIG_TYPE2) {
+                /* The FIFO has 128 locations */
+                pdata->buffer_size = 0x80;
+        } else if (oh->class->rev == MCBSP_CONFIG_TYPE3) {
                 if (id == 2)
                         /* The FIFO has 1024 + 256 locations */
                         pdata->buffer_size = 0x500;
@@ -225,7 +112,8 @@ static int __init omap_init_mcbsp(struct omap_hwmod *oh, void *unused)
 
 static int __init omap2_mcbsp_init(void)
 {
-        omap_hwmod_for_each_by_class("mcbsp", omap_init_mcbsp, NULL);
+        if (!of_have_populated_dt())
+                omap_hwmod_for_each_by_class("mcbsp", omap_init_mcbsp, NULL);
 
         return 0;
 }
diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
index 8d7a93525bc6..652d0285bd6d 100644
--- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
@@ -5269,6 +5269,7 @@ static struct omap_hwmod_ocp_if omap44xx_l4_per__mcbsp4 = {
 
 static struct omap_hwmod_addr_space omap44xx_mcpdm_addrs[] = {
         {
+                .name           = "mpu",
                 .pa_start       = 0x40132000,
                 .pa_end         = 0x4013207f,
                 .flags          = ADDR_TYPE_RT
@@ -5287,6 +5288,7 @@ static struct omap_hwmod_ocp_if omap44xx_l4_abe__mcpdm = {
 
 static struct omap_hwmod_addr_space omap44xx_mcpdm_dma_addrs[] = {
         {
+                .name           = "dma",
                 .pa_start       = 0x49032000,
                 .pa_end         = 0x4903207f,
                 .flags          = ADDR_TYPE_RT
diff --git a/arch/arm/mach-omap2/twl-common.c b/arch/arm/mach-omap2/twl-common.c
index 45f77413c21d..18a851959425 100644
--- a/arch/arm/mach-omap2/twl-common.c
+++ b/arch/arm/mach-omap2/twl-common.c
@@ -519,3 +519,30 @@ void __init omap4_pmic_get_config(struct twl4030_platform_data *pmic_data,
                 pmic_data->v2v1 = &omap4_v2v1_idata;
 }
 #endif /* CONFIG_ARCH_OMAP4 */
+
+#if defined(CONFIG_SND_OMAP_SOC_OMAP_TWL4030) || \
+        defined(CONFIG_SND_OMAP_SOC_OMAP_TWL4030_MODULE)
+#include <linux/platform_data/omap-twl4030.h>
+
+static struct omap_tw4030_pdata omap_twl4030_audio_data;
+
+static struct platform_device audio_device = {
+        .name           = "omap-twl4030",
+        .id             = -1,
+        .dev = {
+                .platform_data = &omap_twl4030_audio_data,
+        },
+};
+
+void __init omap_twl4030_audio_init(char *card_name)
+{
+        omap_twl4030_audio_data.card_name = card_name;
+        platform_device_register(&audio_device);
+}
+
+#else /* SOC_OMAP_TWL4030 */
+void __init omap_twl4030_audio_init(char *card_name)
+{
+        return;
+}
+#endif /* SOC_OMAP_TWL4030 */
diff --git a/arch/arm/mach-omap2/twl-common.h b/arch/arm/mach-omap2/twl-common.h
index 2256efe90cf1..dcfbad5ac471 100644
--- a/arch/arm/mach-omap2/twl-common.h
+++ b/arch/arm/mach-omap2/twl-common.h
@@ -60,4 +60,6 @@ void omap3_pmic_get_config(struct twl4030_platform_data *pmic_data,
 void omap4_pmic_get_config(struct twl4030_platform_data *pmic_data,
                            u32 pdata_flags, u32 regulators_flags);
 
+void omap_twl4030_audio_init(char *card_name);
+
 #endif /* __OMAP_PMIC_COMMON__ */