Merge branch 'fix/asoc' into for-linus (e8fd86ef) · Commits · e / devices / android_kernel_fairphone_FP3

sound/soc/blackfin/bf5xx-i2s-pcm.c

+11 −2

Original line number	Original line	Diff line number	Diff line
	@@ -138,11 +138,20 @@ static snd_pcm_uframes_t bf5xx_pcm_pointer(struct snd_pcm_substream *substream)
	pr_debug("%s enter\n", __func__);		pr_debug("%s enter\n", __func__);
	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {		if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
	diff = sport_curr_offset_tx(sport);		diff = sport_curr_offset_tx(sport);
	frames = bytes_to_frames(substream->runtime, diff);
	} else {		} else {
	diff = sport_curr_offset_rx(sport);		diff = sport_curr_offset_rx(sport);
	frames = bytes_to_frames(substream->runtime, diff);
	}		}

			/*
			* TX at least can report one frame beyond the end of the
			* buffer if we hit the wraparound case - clamp to within the
			* buffer as the ALSA APIs require.
			*/
			if (diff == snd_pcm_lib_buffer_bytes(substream))
			diff = 0;

			frames = bytes_to_frames(substream->runtime, diff);

	return frames;		return frames;
	}		}

sound/soc/codecs/ak4642.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -357,7 +357,7 @@ static int ak4642_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
	default:		default:
	return -EINVAL;		return -EINVAL;
	}		}
	snd_soc_update_bits(codec, PW_MGMT2, MS, data);		snd_soc_update_bits(codec, PW_MGMT2, MS \| MCKO \| PMPLL, data);
	snd_soc_update_bits(codec, MD_CTL1, BCKO_MASK, bcko);		snd_soc_update_bits(codec, MD_CTL1, BCKO_MASK, bcko);

	/* format type */		/* format type */

sound/soc/codecs/tlv320aic26.c

+11 −3

Original line number	Original line	Diff line number	Diff line
	@@ -161,10 +161,18 @@ static int aic26_hw_params(struct snd_pcm_substream *substream,
	dev_dbg(&aic26->spi->dev, "bad format\n"); return -EINVAL;		dev_dbg(&aic26->spi->dev, "bad format\n"); return -EINVAL;
	}		}

	/* Configure PLL */		/**
			* Configure PLL
			* fsref = (mclk * PLLM) / 2048
			* where PLLM = J.DDDD (DDDD register ranges from 0 to 9999, decimal)
			*/
	pval = 1;		pval = 1;
	jval = (fsref == 44100) ? 7 : 8;		/* compute J portion of multiplier */
	dval = (fsref == 44100) ? 5264 : 1920;		jval = fsref / (aic26->mclk / 2048);
			/* compute fractional DDDD component of multiplier */
			dval = fsref - (jval * (aic26->mclk / 2048));
			dval = (10000 * dval) / (aic26->mclk / 2048);
			dev_dbg(&aic26->spi->dev, "Setting PLLM to %d.%04d\n", jval, dval);
	qval = 0;		qval = 0;
	reg = 0x8000 \| qval << 11 \| pval << 8 \| jval << 2;		reg = 0x8000 \| qval << 11 \| pval << 8 \| jval << 2;
	aic26_reg_write(codec, AIC26_REG_PLL_PROG1, reg);		aic26_reg_write(codec, AIC26_REG_PLL_PROG1, reg);

sound/soc/codecs/tlv320aic3x.c

+8 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1114,12 +1114,19 @@ static int aic3x_set_power(struct snd_soc_codec *codec, int power)

	/* Sync reg_cache with the hardware */		/* Sync reg_cache with the hardware */
	codec->cache_only = 0;		codec->cache_only = 0;
	for (i = 0; i < ARRAY_SIZE(aic3x_reg); i++)		for (i = AIC3X_SAMPLE_RATE_SEL_REG; i < ARRAY_SIZE(aic3x_reg); i++)
	snd_soc_write(codec, i, cache[i]);		snd_soc_write(codec, i, cache[i]);
	if (aic3x->model == AIC3X_MODEL_3007)		if (aic3x->model == AIC3X_MODEL_3007)
	aic3x_init_3007(codec);		aic3x_init_3007(codec);
	codec->cache_sync = 0;		codec->cache_sync = 0;
	} else {		} else {
			/*
			* Do soft reset to this codec instance in order to clear
			* possible VDD leakage currents in case the supply regulators
			* remain on
			*/
			snd_soc_write(codec, AIC3X_RESET, SOFT_RESET);
			codec->cache_sync = 1;
	aic3x->power = 0;		aic3x->power = 0;
	/* HW writes are needless when bias is off */		/* HW writes are needless when bias is off */
	codec->cache_only = 1;		codec->cache_only = 1;

sound/soc/codecs/wm8731.c

+3 −26

Original line number	Original line	Diff line number	Diff line
	@@ -175,6 +175,7 @@ static const struct snd_kcontrol_new wm8731_input_mux_controls =
	SOC_DAPM_ENUM("Input Select", wm8731_insel_enum);		SOC_DAPM_ENUM("Input Select", wm8731_insel_enum);

	static const struct snd_soc_dapm_widget wm8731_dapm_widgets[] = {		static const struct snd_soc_dapm_widget wm8731_dapm_widgets[] = {
			SND_SOC_DAPM_SUPPLY("ACTIVE",WM8731_ACTIVE, 0, 0, NULL, 0),
	SND_SOC_DAPM_SUPPLY("OSC", WM8731_PWR, 5, 1, NULL, 0),		SND_SOC_DAPM_SUPPLY("OSC", WM8731_PWR, 5, 1, NULL, 0),
	SND_SOC_DAPM_MIXER("Output Mixer", WM8731_PWR, 4, 1,		SND_SOC_DAPM_MIXER("Output Mixer", WM8731_PWR, 4, 1,
	&wm8731_output_mixer_controls[0],		&wm8731_output_mixer_controls[0],
	@@ -204,6 +205,8 @@ static int wm8731_check_osc(struct snd_soc_dapm_widget *source,
	static const struct snd_soc_dapm_route wm8731_intercon[] = {		static const struct snd_soc_dapm_route wm8731_intercon[] = {
	{"DAC", NULL, "OSC", wm8731_check_osc},		{"DAC", NULL, "OSC", wm8731_check_osc},
	{"ADC", NULL, "OSC", wm8731_check_osc},		{"ADC", NULL, "OSC", wm8731_check_osc},
			{"DAC", NULL, "ACTIVE"},
			{"ADC", NULL, "ACTIVE"},

	/* output mixer */		/* output mixer */
	{"Output Mixer", "Line Bypass Switch", "Line Input"},		{"Output Mixer", "Line Bypass Switch", "Line Input"},
	@@ -315,29 +318,6 @@ static int wm8731_hw_params(struct snd_pcm_substream *substream,
	return 0;		return 0;
	}		}

	static int wm8731_pcm_prepare(struct snd_pcm_substream *substream,
	struct snd_soc_dai *dai)
	{
	struct snd_soc_codec *codec = dai->codec;

	/* set active */
	snd_soc_write(codec, WM8731_ACTIVE, 0x0001);

	return 0;
	}

	static void wm8731_shutdown(struct snd_pcm_substream *substream,
	struct snd_soc_dai *dai)
	{
	struct snd_soc_codec *codec = dai->codec;

	/* deactivate */
	if (!codec->active) {
	udelay(50);
	snd_soc_write(codec, WM8731_ACTIVE, 0x0);
	}
	}

	static int wm8731_mute(struct snd_soc_dai *dai, int mute)		static int wm8731_mute(struct snd_soc_dai *dai, int mute)
	{		{
	struct snd_soc_codec *codec = dai->codec;		struct snd_soc_codec *codec = dai->codec;
	@@ -480,7 +460,6 @@ static int wm8731_set_bias_level(struct snd_soc_codec *codec,
	snd_soc_write(codec, WM8731_PWR, reg \| 0x0040);		snd_soc_write(codec, WM8731_PWR, reg \| 0x0040);
	break;		break;
	case SND_SOC_BIAS_OFF:		case SND_SOC_BIAS_OFF:
	snd_soc_write(codec, WM8731_ACTIVE, 0x0);
	snd_soc_write(codec, WM8731_PWR, 0xffff);		snd_soc_write(codec, WM8731_PWR, 0xffff);
	regulator_bulk_disable(ARRAY_SIZE(wm8731->supplies),		regulator_bulk_disable(ARRAY_SIZE(wm8731->supplies),
	wm8731->supplies);		wm8731->supplies);
	@@ -496,9 +475,7 @@ static int wm8731_set_bias_level(struct snd_soc_codec *codec,
	SNDRV_PCM_FMTBIT_S24_LE)		SNDRV_PCM_FMTBIT_S24_LE)

	static struct snd_soc_dai_ops wm8731_dai_ops = {		static struct snd_soc_dai_ops wm8731_dai_ops = {
	.prepare = wm8731_pcm_prepare,
	.hw_params = wm8731_hw_params,		.hw_params = wm8731_hw_params,
	.shutdown = wm8731_shutdown,
	.digital_mute = wm8731_mute,		.digital_mute = wm8731_mute,
	.set_sysclk = wm8731_set_dai_sysclk,		.set_sysclk = wm8731_set_dai_sysclk,
	.set_fmt = wm8731_set_dai_fmt,		.set_fmt = wm8731_set_dai_fmt,