Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 274a24c1 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'for-2.6.35' of... 

Merge branch 'for-2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into fix/asoc
parents 7f06a8b2 f68596c6

sound/soc/codecs/wm8350.c

+2 −2
Original line number Diff line number Diff line
@@ -426,8 +426,8 @@ static const struct soc_enum wm8350_enum[] = { 
	SOC_ENUM_SINGLE(WM8350_INPUT_MIXER_VOLUME, 15, 2, wm8350_lr),

};



static DECLARE_TLV_DB_LINEAR(pre_amp_tlv, -1200, 3525);

static DECLARE_TLV_DB_LINEAR(out_pga_tlv, -5700, 600);

static DECLARE_TLV_DB_SCALE(pre_amp_tlv, -1200, 3525, 0);

static DECLARE_TLV_DB_SCALE(out_pga_tlv, -5700, 600, 0);

static DECLARE_TLV_DB_SCALE(dac_pcm_tlv, -7163, 36, 1);

static DECLARE_TLV_DB_SCALE(adc_pcm_tlv, -12700, 50, 1);

static DECLARE_TLV_DB_SCALE(out_mix_tlv, -1500, 300, 1);

sound/soc/codecs/wm8400.c

+9 −9
Original line number Diff line number Diff line
@@ -107,21 +107,21 @@ static void wm8400_codec_reset(struct snd_soc_codec *codec) 
	wm8400_reset_codec_reg_cache(wm8400->wm8400);

}



static const DECLARE_TLV_DB_LINEAR(rec_mix_tlv, -1500, 600);

static const DECLARE_TLV_DB_SCALE(rec_mix_tlv, -1500, 600, 0);



static const DECLARE_TLV_DB_LINEAR(in_pga_tlv, -1650, 3000);

static const DECLARE_TLV_DB_SCALE(in_pga_tlv, -1650, 3000, 0);



static const DECLARE_TLV_DB_LINEAR(out_mix_tlv, -2100, 0);

static const DECLARE_TLV_DB_SCALE(out_mix_tlv, -2100, 0, 0);



static const DECLARE_TLV_DB_LINEAR(out_pga_tlv, -7300, 600);

static const DECLARE_TLV_DB_SCALE(out_pga_tlv, -7300, 600, 0);



static const DECLARE_TLV_DB_LINEAR(out_omix_tlv, -600, 0);

static const DECLARE_TLV_DB_SCALE(out_omix_tlv, -600, 0, 0);



static const DECLARE_TLV_DB_LINEAR(out_dac_tlv, -7163, 0);

static const DECLARE_TLV_DB_SCALE(out_dac_tlv, -7163, 0, 0);



static const DECLARE_TLV_DB_LINEAR(in_adc_tlv, -7163, 1763);

static const DECLARE_TLV_DB_SCALE(in_adc_tlv, -7163, 1763, 0);



static const DECLARE_TLV_DB_LINEAR(out_sidetone_tlv, -3600, 0);

static const DECLARE_TLV_DB_SCALE(out_sidetone_tlv, -3600, 0, 0);



static int wm8400_outpga_put_volsw_vu(struct snd_kcontrol *kcontrol,

        struct snd_ctl_elem_value *ucontrol)
@@ -440,7 +440,7 @@ static int outmixer_event (struct snd_soc_dapm_widget *w, 
/* INMIX dB values */

static const unsigned int in_mix_tlv[] = {

	TLV_DB_RANGE_HEAD(1),

	0,7, TLV_DB_LINEAR_ITEM(-1200, 600),

	0,7, TLV_DB_SCALE_ITEM(-1200, 600, 0),

};



/* Left In PGA Connections */

sound/soc/codecs/wm8990.c

+9 −9
Original line number Diff line number Diff line
@@ -111,21 +111,21 @@ static const u16 wm8990_reg[] = { 


#define wm8990_reset(c) snd_soc_write(c, WM8990_RESET, 0)



static const DECLARE_TLV_DB_LINEAR(rec_mix_tlv, -1500, 600);

static const DECLARE_TLV_DB_SCALE(rec_mix_tlv, -1500, 600, 0);



static const DECLARE_TLV_DB_LINEAR(in_pga_tlv, -1650, 3000);

static const DECLARE_TLV_DB_SCALE(in_pga_tlv, -1650, 3000, 0);



static const DECLARE_TLV_DB_LINEAR(out_mix_tlv, 0, -2100);

static const DECLARE_TLV_DB_SCALE(out_mix_tlv, 0, -2100, 0);



static const DECLARE_TLV_DB_LINEAR(out_pga_tlv, -7300, 600);

static const DECLARE_TLV_DB_SCALE(out_pga_tlv, -7300, 600, 0);



static const DECLARE_TLV_DB_LINEAR(out_omix_tlv, -600, 0);

static const DECLARE_TLV_DB_SCALE(out_omix_tlv, -600, 0, 0);



static const DECLARE_TLV_DB_LINEAR(out_dac_tlv, -7163, 0);

static const DECLARE_TLV_DB_SCALE(out_dac_tlv, -7163, 0, 0);



static const DECLARE_TLV_DB_LINEAR(in_adc_tlv, -7163, 1763);

static const DECLARE_TLV_DB_SCALE(in_adc_tlv, -7163, 1763, 0);



static const DECLARE_TLV_DB_LINEAR(out_sidetone_tlv, -3600, 0);

static const DECLARE_TLV_DB_SCALE(out_sidetone_tlv, -3600, 0, 0);



static int wm899x_outpga_put_volsw_vu(struct snd_kcontrol *kcontrol,

	struct snd_ctl_elem_value *ucontrol)
@@ -451,7 +451,7 @@ static int outmixer_event(struct snd_soc_dapm_widget *w, 
/* INMIX dB values */

static const unsigned int in_mix_tlv[] = {

	TLV_DB_RANGE_HEAD(1),

	0, 7, TLV_DB_LINEAR_ITEM(-1200, 600),

	0, 7, TLV_DB_SCALE_ITEM(-1200, 600, 0),

};



/* Left In PGA Connections */

sound/soc/imx/imx-pcm-dma-mx2.c

+4 −3
Original line number Diff line number Diff line
@@ -73,7 +73,8 @@ static void snd_imx_dma_err_callback(int channel, void *data, int err) 
{

	struct snd_pcm_substream *substream = data;

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct imx_pcm_dma_params *dma_params = rtd->dai->cpu_dai->dma_data;

	struct imx_pcm_dma_params *dma_params = 

		snd_soc_dai_get_dma_data(rtd->dai->cpu_dai, substream);

	struct snd_pcm_runtime *runtime = substream->runtime;

	struct imx_pcm_runtime_data *iprtd = runtime->private_data;

	int ret;
@@ -102,7 +103,7 @@ static int imx_ssi_dma_alloc(struct snd_pcm_substream *substream) 
	struct imx_pcm_runtime_data *iprtd = runtime->private_data;

	int ret;



	dma_params = snd_soc_get_dma_data(rtd->dai->cpu_dai, substream);

	dma_params = snd_soc_dai_get_dma_data(rtd->dai->cpu_dai, substream);



	iprtd->dma = imx_dma_request_by_prio(DRV_NAME, DMA_PRIO_HIGH);

	if (iprtd->dma < 0) {
@@ -212,7 +213,7 @@ static int snd_imx_pcm_prepare(struct snd_pcm_substream *substream) 
	struct imx_pcm_runtime_data *iprtd = runtime->private_data;

	int err;



	dma_params = snd_soc_get_dma_data(rtd->dai->cpu_dai, substream);

	dma_params = snd_soc_dai_get_dma_data(rtd->dai->cpu_dai, substream);



	iprtd->substream = substream;

	iprtd->buf = (unsigned int *)substream->dma_buffer.area;

sound/soc/sh/siu_dai.c

+2 −0
Original line number Diff line number Diff line
@@ -588,6 +588,8 @@ static int siu_dai_prepare(struct snd_pcm_substream *substream, 
		ret = siu_dai_spbstart(port_info);

		if (ret < 0)

			goto fail;

	} else {

		ret = 0;

	}



	port_info->play_cap |= self;