Merge remote-tracking branches 'asoc/topic/davinci', 'asoc/topic/devm', 'asoc/topic...

diff --cc include/sound/soc.h
Simple merge

diff --cc sound/soc/fsl/Kconfig
index f4069d0ef8117b1ec2164e2a23fa4f5a3578e050,338a91642471846fd424a99aa6760406a39532d6,338a91642471846fd424a99aa6760406a39532d6,807448ceef96a8fb1a5aeda9f69fabe2fef4ac39,7a7eaf32158fc9b18abccfeda0ec1854e0a7a08a,338a91642471846fd424a99aa6760406a39532d6,338a91642471846fd424a99aa6760406a39532d6..d262ec0653d3709c7e56e9ebce2c2a4bc3796f45
--- 1/sound/soc/fsl/Kconfig
--- 2/sound/soc/fsl/Kconfig
--- 3/sound/soc/fsl/Kconfig
--- 4/sound/soc/fsl/Kconfig
--- 5/sound/soc/fsl/Kconfig
--- 6/sound/soc/fsl/Kconfig
--- 7/sound/soc/fsl/Kconfig
+++ b/sound/soc/fsl/Kconfig
@@@@@@@@ -1,19 -1,19 -1,19 -1,47 -1,33 -1,19 -1,19 +1,47 @@@@@@@@
+++  ++menu "SoC Audio for Freescale CPUs"
+++  ++
+++  ++comment "Common SoC Audio options for Freescale CPUs:"
+++  ++
       config SND_SOC_FSL_SAI
--- --- tristate
+++ +++ tristate "Synchronous Audio Interface (SAI) module support"
        select REGMAP_MMIO
        select SND_SOC_GENERIC_DMAENGINE_PCM
+++ +++ help
+++ +++   Say Y if you want to add Synchronous Audio Interface (SAI)
+++ +++   support for the Freescale CPUs.
+++ +++   This option is only useful for out-of-tree drivers since
+++ +++   in-tree drivers select it automatically.
       
       config SND_SOC_FSL_SSI
---  -- tristate
+++  ++ tristate "Synchronous Serial Interface module support"
+++ +++ select SND_SOC_IMX_PCM_DMA if SND_IMX_SOC != n
+++ +++ select SND_SOC_IMX_PCM_FIQ if SND_IMX_SOC != n && ARCH_MXC
+++  ++ help
+++  ++   Say Y if you want to add Synchronous Serial Interface (SSI)
+++  ++   support for the Freescale CPUs.
+++  ++   This option is only useful for out-of-tree drivers since
+++  ++   in-tree drivers select it automatically.
       
       config SND_SOC_FSL_SPDIF
---  -- tristate
+++  ++ tristate "Sony/Philips Digital Interface module support"
        select REGMAP_MMIO
+++ +++ select SND_SOC_IMX_PCM_DMA if SND_IMX_SOC != n
+++ +++ select SND_SOC_IMX_PCM_FIQ if SND_IMX_SOC != n && ARCH_MXC
+++  ++ help
+++  ++   Say Y if you want to add Sony/Philips Digital Interface (SPDIF)
+++  ++   support for the Freescale CPUs.
+++  ++   This option is only useful for out-of-tree drivers since
+++  ++   in-tree drivers select it automatically.
       
       config SND_SOC_FSL_ESAI
--- --- tristate
+++ +++ tristate "Enhanced Serial Audio Interface (ESAI) module support"
        select REGMAP_MMIO
        select SND_SOC_FSL_UTILS
+++ +++ help
+++ +++   Say Y if you want to add Enhanced Synchronous Audio Interface
+++ +++   (ESAI) support for the Freescale CPUs.
+++ +++   This option is only useful for out-of-tree drivers since
+++ +++   in-tree drivers select it automatically.
       
       config SND_SOC_FSL_UTILS
        tristate

diff --cc sound/soc/fsl/fsl_esai.c
index 496ce2eb2f1f31f4c4f0b6776ffd4d9a60243992,c8e5db1414d7e75f4077728765a210877f4b3cd9,c8e5db1414d7e75f4077728765a210877f4b3cd9,b49b78df2f5b0ac875a410238262e68329eca1ef,0edc837ea3d715dfcd16f6048380a95c677622c9,c8e5db1414d7e75f4077728765a210877f4b3cd9,c8e5db1414d7e75f4077728765a210877f4b3cd9..d719caf26dc20f170febad730f0cb77e65039742
--- 1/sound/soc/fsl/fsl_esai.c
--- 2/sound/soc/fsl/fsl_esai.c
--- 3/sound/soc/fsl/fsl_esai.c
--- 4/sound/soc/fsl/fsl_esai.c
--- 5/sound/soc/fsl/fsl_esai.c
--- 6/sound/soc/fsl/fsl_esai.c
--- 7/sound/soc/fsl/fsl_esai.c
+++ b/sound/soc/fsl/fsl_esai.c
@@@@@@@@ -209,9 -209,9 -209,9 -209,10 -213,14 -209,9 -209,9 +213,14 @@@@@@@@ static int fsl_esai_set_dai_sysclk(stru
        struct clk *clksrc = esai_priv->extalclk;
        bool tx = clk_id <= ESAI_HCKT_EXTAL;
        bool in = dir == SND_SOC_CLOCK_IN;
---  -- u32 ret, ratio, ecr = 0;
+++  ++ u32 ratio, ecr = 0;
        unsigned long clk_rate;
+++  ++ int ret;
+++  ++
++++ ++ /* Bypass divider settings if the requirement doesn't change */
++++ ++ if (freq == esai_priv->hck_rate[tx] && dir == esai_priv->hck_dir[tx])
++++ ++         return 0;
   +   
        /* sck_div can be only bypassed if ETO/ERO=0 and SNC_SOC_CLOCK_OUT */
        esai_priv->sck_div[tx] = true;
       

diff --cc sound/soc/fsl/fsl_spdif.c
Simple merge

diff --cc sound/soc/omap/ams-delta.c
index 44ae4561adcdec0f44b4a6d118fc3e0d7db2888b,2ac0a0c3b570fb5b1d7945c395ee202b9c0cc955,56a5219c0a00587fc412caf76927adf4d11799a5,56a5219c0a00587fc412caf76927adf4d11799a5,56a5219c0a00587fc412caf76927adf4d11799a5,56a5219c0a00587fc412caf76927adf4d11799a5,56a5219c0a00587fc412caf76927adf4d11799a5..669f84d9b76e7a02b4cf9e8308a4f822d5e951cb
--- 1/sound/soc/omap/ams-delta.c
--- 2/sound/soc/omap/ams-delta.c
--- 3/sound/soc/omap/ams-delta.c
--- 4/sound/soc/omap/ams-delta.c
--- 5/sound/soc/omap/ams-delta.c
--- 6/sound/soc/omap/ams-delta.c
--- 7/sound/soc/omap/ams-delta.c
+++ b/sound/soc/omap/ams-delta.c
@@@@@@@@ -520,27 -518,10 -520,29 -520,29 -520,29 -520,29 -520,29 +518,8 @@@@@@@@ static int ams_delta_cx20442_init(struc
                return 0;
        }
       
- ----- /* Add board specific DAPM widgets and routes */
- ----- ret = snd_soc_dapm_new_controls(dapm, ams_delta_dapm_widgets,
- -----                                 ARRAY_SIZE(ams_delta_dapm_widgets));
- ----- if (ret) {
- -----         dev_warn(card->dev,
- -----                         "Failed to register DAPM controls, "
- -----                         "will continue without any.\n");
- -----         return 0;
- ----- }
- -----
- ----- ret = snd_soc_dapm_add_routes(dapm, ams_delta_audio_map,
- -----                                 ARRAY_SIZE(ams_delta_audio_map));
- ----- if (ret) {
- -----         dev_warn(card->dev,
- -----                         "Failed to set up DAPM routes, "
- -----                         "will continue with codec default map.\n");
- -----         return 0;
- ----- }
- -----
        /* Set up initial pin constellation */
        snd_soc_dapm_disable_pin(dapm, "Mouthpiece");
 ------ snd_soc_dapm_enable_pin(dapm, "Earpiece");
 ------ snd_soc_dapm_enable_pin(dapm, "Microphone");
        snd_soc_dapm_disable_pin(dapm, "Speaker");
        snd_soc_dapm_disable_pin(dapm, "AGCIN");
        snd_soc_dapm_disable_pin(dapm, "AGCOUT");