From: Mark Brown <broonie@linaro.org>
Date: Wed, 21 May 2014 23:23:51 +0000 (+0100)
Subject: Merge remote-tracking branches 'asoc/topic/devm', 'asoc/topic/fsl', 'asoc/topic/fsl... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3a6a489fd86910ca09bf29f268bdede2516b2aba;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge remote-tracking branches 'asoc/topic/devm', 'asoc/topic/fsl', 'asoc/topic/fsl-esai', 'asoc/topic/fsl-sai', 'asoc/topic/fsl-spdif' and 'asoc/topic/fsl-ssi' into asoc-next
---

3a6a489fd86910ca09bf29f268bdede2516b2aba
diff --cc sound/soc/fsl/Kconfig
index f4069d0ef811,338a91642471,807448ceef96,7a7eaf32158f,338a91642471,338a91642471,338a91642471..d262ec0653d3
--- a/sound/soc/fsl/Kconfig
+++ b/sound/soc/fsl/Kconfig
@@@@@@@@ -1,19 -1,19 -1,47 -1,33 -1,19 -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 496ce2eb2f1f,c8e5db1414d7,b49b78df2f5b,0edc837ea3d7,c8e5db1414d7,c8e5db1414d7,c8e5db1414d7..d719caf26dc2
--- a/sound/soc/fsl/fsl_esai.c
+++ b/sound/soc/fsl/fsl_esai.c
@@@@@@@@ -209,9 -209,9 -209,10 -213,14 -209,9 -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;