Commit 3dfd2b68 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/fix/rt5663', 'asoc/fix/samsung',... 

Merge remote-tracking branches 'asoc/fix/rt5663', 'asoc/fix/samsung', 'asoc/fix/sti', 'asoc/fix/sti-codec', 'asoc/fix/sunxi' and 'asoc/fix/tas571x' into asoc-linus
parents 74d01b14 c975e39c a4513320 1e6d3044 7e235deb 3716a891 8b0678dc

sound/soc/codecs/rt5663.c

+2 −2
Original line number Diff line number Diff line
@@ -1547,11 +1547,11 @@ static int rt5663_jack_detect(struct snd_soc_codec *codec, int jack_insert) 
			msleep(sleep_time[i]);

			val = snd_soc_read(codec, RT5663_EM_JACK_TYPE_2) &

				0x0003;

			dev_dbg(codec->dev, "%s: MX-00e7 val=%x sleep %d\n",

				__func__, val, sleep_time[i]);

			i++;

			if (val == 0x1 || val == 0x2 || val == 0x3)

				break;

			dev_dbg(codec->dev, "%s: MX-00e7 val=%x sleep %d\n",

				__func__, val, sleep_time[i]);

		}

		dev_dbg(codec->dev, "%s val = %d\n", __func__, val);

		switch (val) {

sound/soc/codecs/sti-sas.c

+1 −1
Original line number Diff line number Diff line
@@ -424,7 +424,7 @@ static const struct snd_soc_dai_ops stih407_dac_ops = { 
static const struct regmap_config stih407_sas_regmap = {

	.reg_bits = 32,

	.val_bits = 32,



	.fast_io = true,

	.max_register = STIH407_AUDIO_DAC_CTRL,

	.reg_defaults = stih407_sas_reg_defaults,

	.num_reg_defaults = ARRAY_SIZE(stih407_sas_reg_defaults),

sound/soc/codecs/tas571x.c

+12 −25
Original line number Diff line number Diff line
@@ -341,20 +341,9 @@ static int tas571x_set_bias_level(struct snd_soc_codec *codec, 
					return ret;

				}

			}



			gpiod_set_value(priv->pdn_gpio, 0);

			usleep_range(5000, 6000);



			regcache_cache_only(priv->regmap, false);

			ret = regcache_sync(priv->regmap);

			if (ret)

				return ret;

		}

		break;

	case SND_SOC_BIAS_OFF:

		regcache_cache_only(priv->regmap, true);

		gpiod_set_value(priv->pdn_gpio, 1);



		if (!IS_ERR(priv->mclk))

			clk_disable_unprepare(priv->mclk);

		break;
@@ -401,16 +390,6 @@ static const struct snd_kcontrol_new tas5711_controls[] = { 
		   TAS571X_SOFT_MUTE_REG,

		   TAS571X_SOFT_MUTE_CH1_SHIFT, TAS571X_SOFT_MUTE_CH2_SHIFT,

		   1, 1),



	SOC_DOUBLE_R_RANGE("CH1 Mixer Volume",

			   TAS5717_CH1_LEFT_CH_MIX_REG,

			   TAS5717_CH1_RIGHT_CH_MIX_REG,

			   16, 0, 0x80, 0),



	SOC_DOUBLE_R_RANGE("CH2 Mixer Volume",

			   TAS5717_CH2_LEFT_CH_MIX_REG,

			   TAS5717_CH2_RIGHT_CH_MIX_REG,

			   16, 0, 0x80, 0),

};



static const struct regmap_range tas571x_readonly_regs_range[] = {
@@ -488,6 +467,16 @@ static const struct snd_kcontrol_new tas5717_controls[] = { 
		   TAS571X_SOFT_MUTE_CH1_SHIFT, TAS571X_SOFT_MUTE_CH2_SHIFT,

		   1, 1),



	SOC_DOUBLE_R_RANGE("CH1 Mixer Volume",

			   TAS5717_CH1_LEFT_CH_MIX_REG,

			   TAS5717_CH1_RIGHT_CH_MIX_REG,

			   16, 0, 0x80, 0),



	SOC_DOUBLE_R_RANGE("CH2 Mixer Volume",

			   TAS5717_CH2_LEFT_CH_MIX_REG,

			   TAS5717_CH2_RIGHT_CH_MIX_REG,

			   16, 0, 0x80, 0),



	/*

	 * The biquads are named according to the register names.

	 * Please note that TI's TAS57xx Graphical Development Environment
@@ -747,13 +736,14 @@ static int tas571x_i2c_probe(struct i2c_client *client, 
		/* pulse the active low reset line for ~100us */

		usleep_range(100, 200);

		gpiod_set_value(priv->reset_gpio, 0);

		usleep_range(12000, 20000);

		usleep_range(13500, 20000);

	}



	ret = regmap_write(priv->regmap, TAS571X_OSC_TRIM_REG, 0);

	if (ret)

		return ret;



	usleep_range(50000, 60000);



	memcpy(&priv->codec_driver, &tas571x_codec, sizeof(priv->codec_driver));

	priv->codec_driver.component_driver.controls = priv->chip->controls;
@@ -770,9 +760,6 @@ static int tas571x_i2c_probe(struct i2c_client *client, 
			return ret;

	}



	regcache_cache_only(priv->regmap, true);

	gpiod_set_value(priv->pdn_gpio, 1);



	return snd_soc_register_codec(&client->dev, &priv->codec_driver,

				      &tas571x_dai, 1);

}

sound/soc/samsung/ac97.c

+5 −5
Original line number Diff line number Diff line
@@ -383,11 +383,6 @@ static int s3c_ac97_probe(struct platform_device *pdev) 
		goto err4;

	}



	ret = devm_snd_soc_register_component(&pdev->dev, &s3c_ac97_component,

					 s3c_ac97_dai, ARRAY_SIZE(s3c_ac97_dai));

	if (ret)

		goto err5;



	ret = samsung_asoc_dma_platform_register(&pdev->dev,

						 ac97_pdata->dma_filter,

						 NULL, NULL);
@@ -396,6 +391,11 @@ static int s3c_ac97_probe(struct platform_device *pdev) 
		goto err5;

	}



	ret = devm_snd_soc_register_component(&pdev->dev, &s3c_ac97_component,

					 s3c_ac97_dai, ARRAY_SIZE(s3c_ac97_dai));

	if (ret)

		goto err5;



	return 0;

err5:

	free_irq(irq_res->start, NULL);

sound/soc/samsung/i2s.c

+10 −9
Original line number Diff line number Diff line
@@ -1237,14 +1237,14 @@ static int samsung_i2s_probe(struct platform_device *pdev) 
			dev_err(&pdev->dev, "Unable to get drvdata\n");

			return -EFAULT;

		}

		ret = devm_snd_soc_register_component(&sec_dai->pdev->dev,

						&samsung_i2s_component,

						&sec_dai->i2s_dai_drv, 1);

		ret = samsung_asoc_dma_platform_register(&pdev->dev,

					sec_dai->filter, "tx-sec", NULL);

		if (ret != 0)

			return ret;



		return samsung_asoc_dma_platform_register(&pdev->dev,

					sec_dai->filter, "tx-sec", NULL);

		return devm_snd_soc_register_component(&sec_dai->pdev->dev,

						&samsung_i2s_component,

						&sec_dai->i2s_dai_drv, 1);

	}



	pri_dai = i2s_alloc_dai(pdev, false);
@@ -1314,6 +1314,11 @@ static int samsung_i2s_probe(struct platform_device *pdev) 
	if (quirks & QUIRK_PRI_6CHAN)

		pri_dai->i2s_dai_drv.playback.channels_max = 6;



	ret = samsung_asoc_dma_platform_register(&pdev->dev, pri_dai->filter,

						 NULL, NULL);

	if (ret < 0)

		goto err_disable_clk;



	if (quirks & QUIRK_SEC_DAI) {

		sec_dai = i2s_alloc_dai(pdev, true);

		if (!sec_dai) {
@@ -1353,10 +1358,6 @@ static int samsung_i2s_probe(struct platform_device *pdev) 
	if (ret < 0)

		goto err_free_dai;



	ret = samsung_asoc_dma_platform_register(&pdev->dev, pri_dai->filter,

						 NULL, NULL);

	if (ret < 0)

		goto err_free_dai;



	pm_runtime_enable(&pdev->dev);