Commit 7c063ede authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/fix/arizona', 'asoc/fix/fsl',... 

Merge remote-tracking branches 'asoc/fix/arizona', 'asoc/fix/fsl', 'asoc/fix/fsl-esai', 'asoc/fix/intel', 'asoc/fix/mcasp' and 'asoc/fix/pxa' into asoc-linus
parents 395d33bb d114e5f7 dc85950a 769091ee b80d19c1 8813543e 9301503a

MAINTAINERS

+3 −0
Original line number Diff line number Diff line
@@ -3794,10 +3794,13 @@ F: drivers/tty/serial/ucc_uart.c 


FREESCALE SOC SOUND DRIVERS

M:	Timur Tabi <timur@tabi.org>

M:	Nicolin Chen <nicoleotsuka@gmail.com>

M:	Xiubo Li <Li.Xiubo@freescale.com>

L:	alsa-devel@alsa-project.org (moderated for non-subscribers)

L:	linuxppc-dev@lists.ozlabs.org

S:	Maintained

F:	sound/soc/fsl/fsl*

F:	sound/soc/fsl/imx*

F:	sound/soc/fsl/mpc8610_hpcd.c



FREEVXFS FILESYSTEM

sound/soc/codecs/arizona.c

+4 −2
Original line number Diff line number Diff line
@@ -1278,6 +1278,8 @@ static int arizona_hw_params(struct snd_pcm_substream *substream, 
	else

		rates = &arizona_48k_bclk_rates[0];



	wl = snd_pcm_format_width(params_format(params));



	if (tdm_slots) {

		arizona_aif_dbg(dai, "Configuring for %d %d bit TDM slots\n",

				tdm_slots, tdm_width);
@@ -1285,6 +1287,7 @@ static int arizona_hw_params(struct snd_pcm_substream *substream, 
		channels = tdm_slots;

	} else {

		bclk_target = snd_soc_params_to_bclk(params);

		tdm_width = wl;

	}



	if (chan_limit && chan_limit < channels) {
@@ -1319,8 +1322,7 @@ static int arizona_hw_params(struct snd_pcm_substream *substream, 
	arizona_aif_dbg(dai, "BCLK %dHz LRCLK %dHz\n",

			rates[bclk], rates[bclk] / lrclk);



	wl = snd_pcm_format_width(params_format(params));

	frame = wl << ARIZONA_AIF1TX_WL_SHIFT | wl;

	frame = wl << ARIZONA_AIF1TX_WL_SHIFT | tdm_width;



	reconfig = arizona_aif_cfg_changed(codec, base, bclk, lrclk, frame);

sound/soc/davinci/davinci-mcasp.c

+11 −3
Original line number Diff line number Diff line
@@ -403,7 +403,8 @@ static int davinci_mcasp_set_dai_fmt(struct snd_soc_dai *cpu_dai, 
	return ret;

}



static int davinci_mcasp_set_clkdiv(struct snd_soc_dai *dai, int div_id, int div)

static int __davinci_mcasp_set_clkdiv(struct snd_soc_dai *dai, int div_id,

				      int div, bool explicit)

{

	struct davinci_mcasp *mcasp = snd_soc_dai_get_drvdata(dai);
@@ -420,6 +421,7 @@ static int davinci_mcasp_set_clkdiv(struct snd_soc_dai *dai, int div_id, int div 
			       ACLKXDIV(div - 1), ACLKXDIV_MASK);

		mcasp_mod_bits(mcasp, DAVINCI_MCASP_ACLKRCTL_REG,

			       ACLKRDIV(div - 1), ACLKRDIV_MASK);

		if (explicit)

			mcasp->bclk_div = div;

		break;
@@ -434,6 +436,12 @@ static int davinci_mcasp_set_clkdiv(struct snd_soc_dai *dai, int div_id, int div 
	return 0;

}



static int davinci_mcasp_set_clkdiv(struct snd_soc_dai *dai, int div_id,

				    int div)

{

	return __davinci_mcasp_set_clkdiv(dai, div_id, div, 1);

}



static int davinci_mcasp_set_sysclk(struct snd_soc_dai *dai, int clk_id,

				    unsigned int freq, int dir)

{
@@ -738,7 +746,7 @@ static int davinci_mcasp_hw_params(struct snd_pcm_substream *substream, 
				 "Inaccurate BCLK: %u Hz / %u != %u Hz\n",

				 mcasp->sysclk_freq, div, bclk_freq);

		}

		davinci_mcasp_set_clkdiv(cpu_dai, 1, div);

		__davinci_mcasp_set_clkdiv(cpu_dai, 1, div, 0);

	}



	ret = mcasp_common_hw_param(mcasp, substream->stream,

sound/soc/fsl/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ config SND_SOC_FSL_ESAI 
	tristate "Enhanced Serial Audio Interface (ESAI) module support"

	select REGMAP_MMIO

	select SND_SOC_IMX_PCM_DMA if SND_IMX_SOC != n

	select SND_SOC_FSL_UTILS

	help

	  Say Y if you want to add Enhanced Synchronous Audio Interface

	  (ESAI) support for the Freescale CPUs.

sound/soc/fsl/fsl_esai.c

+0 −2
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 


#include "fsl_esai.h"

#include "imx-pcm.h"

#include "fsl_utils.h"



#define FSL_ESAI_RATES		SNDRV_PCM_RATE_8000_192000

#define FSL_ESAI_FORMATS	(SNDRV_PCM_FMTBIT_S8 | \
@@ -607,7 +606,6 @@ static struct snd_soc_dai_ops fsl_esai_dai_ops = { 
	.hw_params = fsl_esai_hw_params,

	.set_sysclk = fsl_esai_set_dai_sysclk,

	.set_fmt = fsl_esai_set_dai_fmt,

	.xlate_tdm_slot_mask = fsl_asoc_xlate_tdm_slot_mask,

	.set_tdm_slot = fsl_esai_set_dai_tdm_slot,

};