Commit 29e24882 authored by Mark Brown's avatar Mark Brown
Browse files

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

Merge remote-tracking branches 'asoc/fix/arizona', 'asoc/fix/atmel', 'asoc/fix/fsl', 'asoc/fix/kirkwood', 'asoc/fix/omap', 'asoc/fix/rcar', 'asoc/fix/wm8731' and 'asoc/fix/wm8990' into asoc-linus
parents d930f008 df9e3560 46bec25d 6c7ef410 4f6f1478 fb28a75a 0fb50e55 b4af6ef9 2ab2b742

sound/soc/atmel/sam9x5_wm8731.c

+2 −0
Original line number Diff line number Diff line
@@ -97,6 +97,8 @@ static int sam9x5_wm8731_driver_probe(struct platform_device *pdev) 
		goto out;

	}



	snd_soc_card_set_drvdata(card, priv);



	card->dev = &pdev->dev;

	card->owner = THIS_MODULE;

	card->dai_link = dai;

sound/soc/codecs/wm5110.c

+0 −25
Original line number Diff line number Diff line
@@ -248,19 +248,6 @@ ARIZONA_MIXER_CONTROLS("SPKDAT1R", ARIZONA_OUT5RMIX_INPUT_1_SOURCE), 
ARIZONA_MIXER_CONTROLS("SPKDAT2L", ARIZONA_OUT6LMIX_INPUT_1_SOURCE),

ARIZONA_MIXER_CONTROLS("SPKDAT2R", ARIZONA_OUT6RMIX_INPUT_1_SOURCE),



SOC_SINGLE("HPOUT1 High Performance Switch", ARIZONA_OUTPUT_PATH_CONFIG_1L,

	   ARIZONA_OUT1_OSR_SHIFT, 1, 0),

SOC_SINGLE("HPOUT2 High Performance Switch", ARIZONA_OUTPUT_PATH_CONFIG_2L,

	   ARIZONA_OUT2_OSR_SHIFT, 1, 0),

SOC_SINGLE("HPOUT3 High Performance Switch", ARIZONA_OUTPUT_PATH_CONFIG_3L,

	   ARIZONA_OUT3_OSR_SHIFT, 1, 0),

SOC_SINGLE("Speaker High Performance Switch", ARIZONA_OUTPUT_PATH_CONFIG_4L,

	   ARIZONA_OUT4_OSR_SHIFT, 1, 0),

SOC_SINGLE("SPKDAT1 High Performance Switch", ARIZONA_OUTPUT_PATH_CONFIG_5L,

	   ARIZONA_OUT5_OSR_SHIFT, 1, 0),

SOC_SINGLE("SPKDAT2 High Performance Switch", ARIZONA_OUTPUT_PATH_CONFIG_6L,

	   ARIZONA_OUT6_OSR_SHIFT, 1, 0),



SOC_DOUBLE_R("HPOUT1 Digital Switch", ARIZONA_DAC_DIGITAL_VOLUME_1L,

	     ARIZONA_DAC_DIGITAL_VOLUME_1R, ARIZONA_OUT1L_MUTE_SHIFT, 1, 1),

SOC_DOUBLE_R("HPOUT2 Digital Switch", ARIZONA_DAC_DIGITAL_VOLUME_2L,
@@ -293,18 +280,6 @@ SOC_DOUBLE_R_TLV("SPKDAT2 Digital Volume", ARIZONA_DAC_DIGITAL_VOLUME_6L, 
		 ARIZONA_DAC_DIGITAL_VOLUME_6R, ARIZONA_OUT6L_VOL_SHIFT,

		 0xbf, 0, digital_tlv),



SOC_DOUBLE_R_RANGE_TLV("HPOUT1 Volume", ARIZONA_OUTPUT_PATH_CONFIG_1L,

		       ARIZONA_OUTPUT_PATH_CONFIG_1R,

		       ARIZONA_OUT1L_PGA_VOL_SHIFT,

		       0x34, 0x40, 0, ana_tlv),

SOC_DOUBLE_R_RANGE_TLV("HPOUT2 Volume", ARIZONA_OUTPUT_PATH_CONFIG_2L,

		       ARIZONA_OUTPUT_PATH_CONFIG_2R,

		       ARIZONA_OUT2L_PGA_VOL_SHIFT,

		       0x34, 0x40, 0, ana_tlv),

SOC_DOUBLE_R_RANGE_TLV("HPOUT3 Volume", ARIZONA_OUTPUT_PATH_CONFIG_3L,

		       ARIZONA_OUTPUT_PATH_CONFIG_3R,

		       ARIZONA_OUT3L_PGA_VOL_SHIFT, 0x34, 0x40, 0, ana_tlv),



SOC_DOUBLE("SPKDAT1 Switch", ARIZONA_PDM_SPK1_CTRL_1, ARIZONA_SPK1L_MUTE_SHIFT,

	   ARIZONA_SPK1R_MUTE_SHIFT, 1, 1),

SOC_DOUBLE("SPKDAT2 Switch", ARIZONA_PDM_SPK2_CTRL_1, ARIZONA_SPK2L_MUTE_SHIFT,

sound/soc/codecs/wm8731.c

+2 −2
Original line number Diff line number Diff line
@@ -447,10 +447,10 @@ static int wm8731_set_dai_fmt(struct snd_soc_dai *codec_dai, 
		iface |= 0x0001;

		break;

	case SND_SOC_DAIFMT_DSP_A:

		iface |= 0x0003;

		iface |= 0x0013;

		break;

	case SND_SOC_DAIFMT_DSP_B:

		iface |= 0x0013;

		iface |= 0x0003;

		break;

	default:

		return -EINVAL;

sound/soc/codecs/wm8990.c

+2 −0
Original line number Diff line number Diff line
@@ -1259,6 +1259,8 @@ static int wm8990_set_bias_level(struct snd_soc_codec *codec, 


		/* disable POBCTRL, SOFT_ST and BUFDCOPEN */

		snd_soc_write(codec, WM8990_ANTIPOP2, 0x0);



		codec->cache_sync = 1;

		break;

	}

sound/soc/fsl/pcm030-audio-fabric.c

+2 −1
Original line number Diff line number Diff line
@@ -69,7 +69,6 @@ static int pcm030_fabric_probe(struct platform_device *op) 
		return -ENOMEM;



	card->dev = &op->dev;

	platform_set_drvdata(op, pdata);



	pdata->card = card;
@@ -98,6 +97,8 @@ static int pcm030_fabric_probe(struct platform_device *op) 
	if (ret)

		dev_err(&op->dev, "snd_soc_register_card() failed: %d\n", ret);



	platform_set_drvdata(op, pdata);



	return ret;

}