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

Commit 1c2f9548 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sound-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 

Pull sound sound fixes from Takashi Iwai:
 "As good as nothing exciting here; just a few trivial fixes for various
  ASoC stuff."

* tag 'sound-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ASoC: omap-pcm: Free dma buffers in case of error.
  ASoC: s3c2412-i2s: Fix dai registration
  ASoC: wm8350: Don't use locally allocated codec struct
  ASoC: tlv312aic23: unbreak resume
  ASoC: bf5xx-ssm2602: Set DAI format
  ASoC: core: check of_property_count_strings failure
  ASoC: dt: sgtl5000.txt: Add description for 'reg' field
  ASoC: wm_hubs: Make sure we don't disable differential line outputs
parents 59068e36 e9e7183f

Documentation/devicetree/bindings/sound/sgtl5000.txt

+2 −0
Original line number Diff line number Diff line
@@ -3,6 +3,8 @@ 
Required properties:

- compatible : "fsl,sgtl5000".



- reg : the I2C address of the device



Example:



codec: sgtl5000@0a {

sound/soc/blackfin/bf5xx-ssm2602.c

+2 −0
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ static struct snd_soc_dai_link bf5xx_ssm2602_dai[] = { 
		.platform_name = "bfin-i2s-pcm-audio",

		.codec_name = "ssm2602.0-001b",

		.ops = &bf5xx_ssm2602_ops,

		.dai_fmt = BF5XX_SSM2602_DAIFMT,

	},

	{

		.name = "ssm2602",
@@ -108,6 +109,7 @@ static struct snd_soc_dai_link bf5xx_ssm2602_dai[] = { 
		.platform_name = "bfin-i2s-pcm-audio",

		.codec_name = "ssm2602.0-001b",

		.ops = &bf5xx_ssm2602_ops,

		.dai_fmt = BF5XX_SSM2602_DAIFMT,

	},

};

sound/soc/codecs/tlv320aic23.c

+2 −2
Original line number Diff line number Diff line
@@ -472,7 +472,7 @@ static int tlv320aic23_set_dai_sysclk(struct snd_soc_dai *codec_dai, 
static int tlv320aic23_set_bias_level(struct snd_soc_codec *codec,

				      enum snd_soc_bias_level level)

{

	u16 reg = snd_soc_read(codec, TLV320AIC23_PWR) & 0xff7f;

	u16 reg = snd_soc_read(codec, TLV320AIC23_PWR) & 0x17f;



	switch (level) {

	case SND_SOC_BIAS_ON:
@@ -491,7 +491,7 @@ static int tlv320aic23_set_bias_level(struct snd_soc_codec *codec, 
	case SND_SOC_BIAS_OFF:

		/* everything off, dac mute, inactive */

		snd_soc_write(codec, TLV320AIC23_ACTIVE, 0x0);

		snd_soc_write(codec, TLV320AIC23_PWR, 0xffff);

		snd_soc_write(codec, TLV320AIC23_PWR, 0x1ff);

		break;

	}

	codec->dapm.bias_level = level;

sound/soc/codecs/wm8350.c

+6 −5
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ struct wm8350_jack_data { 
};



struct wm8350_data {

	struct snd_soc_codec codec;

	struct wm8350 *wm8350;

	struct wm8350_output out1;

	struct wm8350_output out2;

	struct wm8350_jack_data hpl;
@@ -1309,7 +1309,7 @@ static void wm8350_hp_work(struct wm8350_data *priv, 
			   struct wm8350_jack_data *jack,

			   u16 mask)

{

	struct wm8350 *wm8350 = priv->codec.control_data;

	struct wm8350 *wm8350 = priv->wm8350;

	u16 reg;

	int report;
@@ -1342,7 +1342,7 @@ static void wm8350_hpr_work(struct work_struct *work) 
static irqreturn_t wm8350_hp_jack_handler(int irq, void *data)

{

	struct wm8350_data *priv = data;

	struct wm8350 *wm8350 = priv->codec.control_data;

	struct wm8350 *wm8350 = priv->wm8350;

	struct wm8350_jack_data *jack = NULL;



	switch (irq - wm8350->irq_base) {
@@ -1427,7 +1427,7 @@ EXPORT_SYMBOL_GPL(wm8350_hp_jack_detect); 
static irqreturn_t wm8350_mic_handler(int irq, void *data)

{

	struct wm8350_data *priv = data;

	struct wm8350 *wm8350 = priv->codec.control_data;

	struct wm8350 *wm8350 = priv->wm8350;

	u16 reg;

	int report = 0;
@@ -1536,6 +1536,8 @@ static int wm8350_codec_probe(struct snd_soc_codec *codec) 
		return -ENOMEM;

	snd_soc_codec_set_drvdata(codec, priv);



	priv->wm8350 = wm8350;



	for (i = 0; i < ARRAY_SIZE(supply_names); i++)

		priv->supplies[i].supply = supply_names[i];
@@ -1544,7 +1546,6 @@ static int wm8350_codec_probe(struct snd_soc_codec *codec) 
	if (ret != 0)

		return ret;



	wm8350->codec.codec = codec;

	codec->control_data = wm8350;



	/* Put the codec into reset if it wasn't already */

sound/soc/codecs/wm_hubs.c

+9 −6
Original line number Diff line number Diff line
@@ -1035,7 +1035,7 @@ void wm_hubs_set_bias_level(struct snd_soc_codec *codec, 
			    enum snd_soc_bias_level level)

{

	struct wm_hubs_data *hubs = snd_soc_codec_get_drvdata(codec);

	int val;

	int mask, val;



	switch (level) {

	case SND_SOC_BIAS_STANDBY:
@@ -1047,6 +1047,13 @@ void wm_hubs_set_bias_level(struct snd_soc_codec *codec, 
	case SND_SOC_BIAS_ON:

		/* Turn off any unneded single ended outputs */

		val = 0;

		mask = 0;



		if (hubs->lineout1_se)

			mask |= WM8993_LINEOUT1N_ENA | WM8993_LINEOUT1P_ENA;



		if (hubs->lineout2_se)

			mask |= WM8993_LINEOUT2N_ENA | WM8993_LINEOUT2P_ENA;



		if (hubs->lineout1_se && hubs->lineout1n_ena)

			val |= WM8993_LINEOUT1N_ENA;
@@ -1061,11 +1068,7 @@ void wm_hubs_set_bias_level(struct snd_soc_codec *codec, 
			val |= WM8993_LINEOUT2P_ENA;



		snd_soc_update_bits(codec, WM8993_POWER_MANAGEMENT_3,

				    WM8993_LINEOUT1N_ENA |

				    WM8993_LINEOUT1P_ENA |

				    WM8993_LINEOUT2N_ENA |

				    WM8993_LINEOUT2P_ENA,

				    val);

				    mask, val);



		/* Remove the input clamps */

		snd_soc_update_bits(codec, WM8993_INPUTS_CLAMP_REG,