Commit 478e858b authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-v3.10-rc1' of... 

Merge tag 'asoc-v3.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Fixes for v3.10

A few small driver-specific fixes, none of them especially crippling.
parents b1b9fbd0 407a0e18

sound/soc/codecs/ab8500-codec.h

+18 −18
Original line number Diff line number Diff line
@@ -348,25 +348,25 @@ 


/* AB8500_ADSLOTSELX */

#define AB8500_ADSLOTSELX_AD_OUT1_TO_SLOT_ODD	0x00

#define AB8500_ADSLOTSELX_AD_OUT2_TO_SLOT_ODD	0x01

#define AB8500_ADSLOTSELX_AD_OUT3_TO_SLOT_ODD	0x02

#define AB8500_ADSLOTSELX_AD_OUT4_TO_SLOT_ODD	0x03

#define AB8500_ADSLOTSELX_AD_OUT5_TO_SLOT_ODD	0x04

#define AB8500_ADSLOTSELX_AD_OUT6_TO_SLOT_ODD	0x05

#define AB8500_ADSLOTSELX_AD_OUT7_TO_SLOT_ODD	0x06

#define AB8500_ADSLOTSELX_AD_OUT8_TO_SLOT_ODD	0x07

#define AB8500_ADSLOTSELX_ZEROES_TO_SLOT_ODD	0x08

#define AB8500_ADSLOTSELX_TRISTATE_TO_SLOT_ODD	0x0F

#define AB8500_ADSLOTSELX_AD_OUT2_TO_SLOT_ODD	0x10

#define AB8500_ADSLOTSELX_AD_OUT3_TO_SLOT_ODD	0x20

#define AB8500_ADSLOTSELX_AD_OUT4_TO_SLOT_ODD	0x30

#define AB8500_ADSLOTSELX_AD_OUT5_TO_SLOT_ODD	0x40

#define AB8500_ADSLOTSELX_AD_OUT6_TO_SLOT_ODD	0x50

#define AB8500_ADSLOTSELX_AD_OUT7_TO_SLOT_ODD	0x60

#define AB8500_ADSLOTSELX_AD_OUT8_TO_SLOT_ODD	0x70

#define AB8500_ADSLOTSELX_ZEROES_TO_SLOT_ODD	0x80

#define AB8500_ADSLOTSELX_TRISTATE_TO_SLOT_ODD	0xF0

#define AB8500_ADSLOTSELX_AD_OUT1_TO_SLOT_EVEN	0x00

#define AB8500_ADSLOTSELX_AD_OUT2_TO_SLOT_EVEN	0x10

#define AB8500_ADSLOTSELX_AD_OUT3_TO_SLOT_EVEN	0x20

#define AB8500_ADSLOTSELX_AD_OUT4_TO_SLOT_EVEN	0x30

#define AB8500_ADSLOTSELX_AD_OUT5_TO_SLOT_EVEN	0x40

#define AB8500_ADSLOTSELX_AD_OUT6_TO_SLOT_EVEN	0x50

#define AB8500_ADSLOTSELX_AD_OUT7_TO_SLOT_EVEN	0x60

#define AB8500_ADSLOTSELX_AD_OUT8_TO_SLOT_EVEN	0x70

#define AB8500_ADSLOTSELX_ZEROES_TO_SLOT_EVEN	0x80

#define AB8500_ADSLOTSELX_TRISTATE_TO_SLOT_EVEN	0xF0

#define AB8500_ADSLOTSELX_AD_OUT2_TO_SLOT_EVEN	0x01

#define AB8500_ADSLOTSELX_AD_OUT3_TO_SLOT_EVEN	0x02

#define AB8500_ADSLOTSELX_AD_OUT4_TO_SLOT_EVEN	0x03

#define AB8500_ADSLOTSELX_AD_OUT5_TO_SLOT_EVEN	0x04

#define AB8500_ADSLOTSELX_AD_OUT6_TO_SLOT_EVEN	0x05

#define AB8500_ADSLOTSELX_AD_OUT7_TO_SLOT_EVEN	0x06

#define AB8500_ADSLOTSELX_AD_OUT8_TO_SLOT_EVEN	0x07

#define AB8500_ADSLOTSELX_ZEROES_TO_SLOT_EVEN	0x08

#define AB8500_ADSLOTSELX_TRISTATE_TO_SLOT_EVEN	0x0F

#define AB8500_ADSLOTSELX_EVEN_SHIFT		0

#define AB8500_ADSLOTSELX_ODD_SHIFT		4

sound/soc/codecs/da7213.c

+4 −4
Original line number Diff line number Diff line
@@ -1488,17 +1488,17 @@ static int da7213_probe(struct snd_soc_codec *codec) 
				     DA7213_DMIC_DATA_SEL_SHIFT);

			break;

		}

		switch (pdata->dmic_data_sel) {

		switch (pdata->dmic_samplephase) {

		case DA7213_DMIC_SAMPLE_ON_CLKEDGE:

		case DA7213_DMIC_SAMPLE_BETWEEN_CLKEDGE:

			dmic_cfg |= (pdata->dmic_data_sel <<

			dmic_cfg |= (pdata->dmic_samplephase <<

				     DA7213_DMIC_SAMPLEPHASE_SHIFT);

			break;

		}

		switch (pdata->dmic_data_sel) {

		switch (pdata->dmic_clk_rate) {

		case DA7213_DMIC_CLK_3_0MHZ:

		case DA7213_DMIC_CLK_1_5MHZ:

			dmic_cfg |= (pdata->dmic_data_sel <<

			dmic_cfg |= (pdata->dmic_clk_rate <<

				     DA7213_DMIC_CLK_RATE_SHIFT);

			break;

		}

sound/soc/codecs/wm0010.c

+1 −0
Original line number Diff line number Diff line
@@ -667,6 +667,7 @@ static int wm0010_boot(struct snd_soc_codec *codec) 
		/* On wm0010 only the CLKCTRL1 value is used */

		pll_rec.clkctrl1 = wm0010->pll_clkctrl1;



		ret = -ENOMEM;

		len = pll_rec.length + 8;

		out = kzalloc(len, GFP_KERNEL);

		if (!out) {