Merge branch 'for-linus' into topic/hda-cleanup (1aaff096) · Commits · e / devices / android_kernel_fairphone_FP4

MAINTAINERS

+3 −0

Original line number	Diff line number	Diff line
		@@ -3843,10 +3843,13 @@ F: drivers/tty/serial/ucc_uart.c

		FREESCALE SOC SOUND DRIVERS
		M: Timur Tabi <timur@tabi.org>
		M: Nicolin Chen <nicoleotsuka@gmail.com>
		M: Xiubo Li <Li.Xiubo@freescale.com>
		L: alsa-devel@alsa-project.org (moderated for non-subscribers)
		L: linuxppc-dev@lists.ozlabs.org
		S: Maintained
		F: sound/soc/fsl/fsl*
		F: sound/soc/fsl/imx*
		F: sound/soc/fsl/mpc8610_hpcd.c

		FREEVXFS FILESYSTEM

sound/pci/hda/patch_realtek.c

+21 −5

Original line number	Diff line number	Diff line
		@@ -181,6 +181,8 @@ static void alc_fix_pll(struct hda_codec *codec)
		spec->pll_coef_idx);
		val = snd_hda_codec_read(codec, spec->pll_nid, 0,
		AC_VERB_GET_PROC_COEF, 0);
		if (val == -1)
		return;
		snd_hda_codec_write(codec, spec->pll_nid, 0, AC_VERB_SET_COEF_INDEX,
		spec->pll_coef_idx);
		snd_hda_codec_write(codec, spec->pll_nid, 0, AC_VERB_SET_PROC_COEF,
		@@ -2806,6 +2808,8 @@ static void alc286_shutup(struct hda_codec *codec)
		static void alc269vb_toggle_power_output(struct hda_codec *codec, int power_up)
		{
		int val = alc_read_coef_idx(codec, 0x04);
		if (val == -1)
		return;
		if (power_up)
		val \|= 1 << 11;
		else
		@@ -3264,6 +3268,15 @@ static int alc269_resume(struct hda_codec *codec)
		snd_hda_codec_resume_cache(codec);
		alc_inv_dmic_sync(codec, true);
		hda_call_check_power_status(codec, 0x01);

		/* on some machine, the BIOS will clear the codec gpio data when enter
		* suspend, and won't restore the data after resume, so we restore it
		* in the driver.
		*/
		if (spec->gpio_led)
		snd_hda_codec_write(codec, codec->afg, 0, AC_VERB_SET_GPIO_DATA,
		spec->gpio_led);

		if (spec->has_alc5505_dsp)
		alc5505_dsp_resume(codec);

		@@ -5311,26 +5324,29 @@ static void alc269_fill_coef(struct hda_codec *codec)
		if ((alc_get_coef0(codec) & 0x00ff) == 0x017) {
		val = alc_read_coef_idx(codec, 0x04);
		/* Power up output pin */
		if (val != -1)
		alc_write_coef_idx(codec, 0x04, val \| (1<<11));
		}

		if ((alc_get_coef0(codec) & 0x00ff) == 0x018) {
		val = alc_read_coef_idx(codec, 0xd);
		if ((val & 0x0c00) >> 10 != 0x1) {
		if (val != -1 && (val & 0x0c00) >> 10 != 0x1) {
		/* Capless ramp up clock control */
		alc_write_coef_idx(codec, 0xd, val \| (1<<10));
		}
		val = alc_read_coef_idx(codec, 0x17);
		if ((val & 0x01c0) >> 6 != 0x4) {
		if (val != -1 && (val & 0x01c0) >> 6 != 0x4) {
		/* Class D power on reset */
		alc_write_coef_idx(codec, 0x17, val \| (1<<7));
		}
		}

		val = alc_read_coef_idx(codec, 0xd); /* Class D */
		if (val != -1)
		alc_write_coef_idx(codec, 0xd, val \| (1<<14));

		val = alc_read_coef_idx(codec, 0x4); /* HP */
		if (val != -1)
		alc_write_coef_idx(codec, 0x4, val \| (1<<11));
		}

sound/soc/codecs/arizona.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -1278,6 +1278,8 @@ static int arizona_hw_params(struct snd_pcm_substream *substream,
		else
		rates = &arizona_48k_bclk_rates[0];

		wl = snd_pcm_format_width(params_format(params));

		if (tdm_slots) {
		arizona_aif_dbg(dai, "Configuring for %d %d bit TDM slots\n",
		tdm_slots, tdm_width);
		@@ -1285,6 +1287,7 @@ static int arizona_hw_params(struct snd_pcm_substream *substream,
		channels = tdm_slots;
		} else {
		bclk_target = snd_soc_params_to_bclk(params);
		tdm_width = wl;
		}

		if (chan_limit && chan_limit < channels) {
		@@ -1319,8 +1322,7 @@ static int arizona_hw_params(struct snd_pcm_substream *substream,
		arizona_aif_dbg(dai, "BCLK %dHz LRCLK %dHz\n",
		rates[bclk], rates[bclk] / lrclk);

		wl = snd_pcm_format_width(params_format(params));
		frame = wl << ARIZONA_AIF1TX_WL_SHIFT \| wl;
		frame = wl << ARIZONA_AIF1TX_WL_SHIFT \| tdm_width;

		reconfig = arizona_aif_cfg_changed(codec, base, bclk, lrclk, frame);

sound/soc/codecs/pcm512x.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -259,13 +259,13 @@ static const struct soc_enum pcm512x_veds =
		pcm512x_ramp_step_text);

		static const struct snd_kcontrol_new pcm512x_controls[] = {
		SOC_DOUBLE_R_TLV("Playback Digital Volume", PCM512x_DIGITAL_VOLUME_2,
		SOC_DOUBLE_R_TLV("Digital Playback Volume", PCM512x_DIGITAL_VOLUME_2,
		PCM512x_DIGITAL_VOLUME_3, 0, 255, 1, digital_tlv),
		SOC_DOUBLE_TLV("Playback Volume", PCM512x_ANALOG_GAIN_CTRL,
		PCM512x_LAGN_SHIFT, PCM512x_RAGN_SHIFT, 1, 1, analog_tlv),
		SOC_DOUBLE_TLV("Playback Boost Volume", PCM512x_ANALOG_GAIN_BOOST,
		PCM512x_AGBL_SHIFT, PCM512x_AGBR_SHIFT, 1, 0, boost_tlv),
		SOC_DOUBLE("Playback Digital Switch", PCM512x_MUTE, PCM512x_RQML_SHIFT,
		SOC_DOUBLE("Digital Playback Switch", PCM512x_MUTE, PCM512x_RQML_SHIFT,
		PCM512x_RQMR_SHIFT, 1, 1),

		SOC_SINGLE("Deemphasis Switch", PCM512x_DSP, PCM512x_DEMP_SHIFT, 1, 1),

sound/soc/davinci/davinci-mcasp.c

+11 −3

Original line number	Diff line number	Diff line
		@@ -403,7 +403,8 @@ static int davinci_mcasp_set_dai_fmt(struct snd_soc_dai *cpu_dai,
		return ret;
		}

		static int davinci_mcasp_set_clkdiv(struct snd_soc_dai *dai, int div_id, int div)
		static int __davinci_mcasp_set_clkdiv(struct snd_soc_dai *dai, int div_id,
		int div, bool explicit)
		{
		struct davinci_mcasp *mcasp = snd_soc_dai_get_drvdata(dai);

		@@ -420,6 +421,7 @@ static int davinci_mcasp_set_clkdiv(struct snd_soc_dai *dai, int div_id, int div
		ACLKXDIV(div - 1), ACLKXDIV_MASK);
		mcasp_mod_bits(mcasp, DAVINCI_MCASP_ACLKRCTL_REG,
		ACLKRDIV(div - 1), ACLKRDIV_MASK);
		if (explicit)
		mcasp->bclk_div = div;
		break;

		@@ -434,6 +436,12 @@ static int davinci_mcasp_set_clkdiv(struct snd_soc_dai *dai, int div_id, int div
		return 0;
		}

		static int davinci_mcasp_set_clkdiv(struct snd_soc_dai *dai, int div_id,
		int div)
		{
		return __davinci_mcasp_set_clkdiv(dai, div_id, div, 1);
		}

		static int davinci_mcasp_set_sysclk(struct snd_soc_dai *dai, int clk_id,
		unsigned int freq, int dir)
		{
		@@ -738,7 +746,7 @@ static int davinci_mcasp_hw_params(struct snd_pcm_substream *substream,
		"Inaccurate BCLK: %u Hz / %u != %u Hz\n",
		mcasp->sysclk_freq, div, bclk_freq);
		}
		davinci_mcasp_set_clkdiv(cpu_dai, 1, div);
		__davinci_mcasp_set_clkdiv(cpu_dai, 1, div, 0);
		}

		ret = mcasp_common_hw_param(mcasp, substream->stream,