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

Commit 8cdef969 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "This time we've got a larger number of updates, mainly from ASoC
  world.  The only significant LOCs found here are for Realtek codecs,
  where most of changes are quite systematic replacements.

  There are also a few fixes in ASoC core side: one is the PM call order
  fix to ensure the DPAM resume working properly.  Another is the proper
  cleanup call after freeing DAPM widgets, and the correction of the
  wrong callback set in topology API.

  The rest are a wide range of driver-specific small fixes, including
  HD-audio"

* tag 'sound-4.4-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (35 commits)
  ALSA: hda - Add Conexant CX8200 (14f1:2008) codec entry
  ALSA: hda - Correct codec names for 14f1:50f1 and 14f1:50f3
  ALSA: hda - Skip ELD notification during system suspend
  ASoC: core: Change power state before rechecking endpoint
  ASoC: fix kernel-doc warnings in sound/soc/soc-ops.c
  ASoC: rt5645: Add dmi_system_id "Google Terra"
  ASoC: rockchip: Fix incorrect VDW value for 24 bit
  ASoC: fsl: clarify ac97 dependency
  ASoC: Intel: Skylake: fix memory leak
  ASoC: davinci-mcasp: Fix master capture only mode
  ASoC: es8328: Fix shifts for mixer switches
  ASoC: rt5645: Add dmi_system_id "Google Wizpig"
  ASoC: sti: set player private data
  ASoC: sti: rename ST proprietary DT properties
  ASoC: sti: remove wrong error message
  ASoC: Intel: Skylake: Add I2C depends for SKL machine
  ASoC: topology: fix info callback for TLV byte control
  ASoC: rt5670: fix wrong bit def for pll src
  ASoC: nau8825: add pm function
  ASoC: rt5645: Add struct dmi_system_id "Google Edgar" for Chrome OS
  ...
parents b1007e73 bcdda2ec

include/sound/soc-dapm.h

+1 −0
Original line number Diff line number Diff line
@@ -398,6 +398,7 @@ int snd_soc_dapm_del_routes(struct snd_soc_dapm_context *dapm, 
int snd_soc_dapm_weak_routes(struct snd_soc_dapm_context *dapm,

			     const struct snd_soc_dapm_route *route, int num);

void snd_soc_dapm_free_widget(struct snd_soc_dapm_widget *w);

void snd_soc_dapm_reset_cache(struct snd_soc_dapm_context *dapm);



/* dapm events */

void snd_soc_dapm_stream_event(struct snd_soc_pcm_runtime *rtd, int stream,

sound/pci/hda/patch_conexant.c

+3 −2
Original line number Diff line number Diff line
@@ -955,6 +955,7 @@ static int patch_conexant_auto(struct hda_codec *codec) 
 */



static const struct hda_device_id snd_hda_id_conexant[] = {

	HDA_CODEC_ENTRY(0x14f12008, "CX8200", patch_conexant_auto),

	HDA_CODEC_ENTRY(0x14f15045, "CX20549 (Venice)", patch_conexant_auto),

	HDA_CODEC_ENTRY(0x14f15047, "CX20551 (Waikiki)", patch_conexant_auto),

	HDA_CODEC_ENTRY(0x14f15051, "CX20561 (Hermosa)", patch_conexant_auto),
@@ -972,9 +973,9 @@ static const struct hda_device_id snd_hda_id_conexant[] = { 
	HDA_CODEC_ENTRY(0x14f150ac, "CX20652", patch_conexant_auto),

	HDA_CODEC_ENTRY(0x14f150b8, "CX20664", patch_conexant_auto),

	HDA_CODEC_ENTRY(0x14f150b9, "CX20665", patch_conexant_auto),

	HDA_CODEC_ENTRY(0x14f150f1, "CX20721", patch_conexant_auto),

	HDA_CODEC_ENTRY(0x14f150f1, "CX21722", patch_conexant_auto),

	HDA_CODEC_ENTRY(0x14f150f2, "CX20722", patch_conexant_auto),

	HDA_CODEC_ENTRY(0x14f150f3, "CX20723", patch_conexant_auto),

	HDA_CODEC_ENTRY(0x14f150f3, "CX21724", patch_conexant_auto),

	HDA_CODEC_ENTRY(0x14f150f4, "CX20724", patch_conexant_auto),

	HDA_CODEC_ENTRY(0x14f1510f, "CX20751/2", patch_conexant_auto),

	HDA_CODEC_ENTRY(0x14f15110, "CX20751/2", patch_conexant_auto),

sound/pci/hda/patch_hdmi.c

+6 −0
Original line number Diff line number Diff line
@@ -2352,6 +2352,12 @@ static void intel_pin_eld_notify(void *audio_ptr, int port) 
	struct hda_codec *codec = audio_ptr;

	int pin_nid = port + 0x04;



	/* skip notification during system suspend (but not in runtime PM);

	 * the state will be updated at resume

	 */

	if (snd_power_get_state(codec->card) != SNDRV_CTL_POWER_D0)

		return;



	check_presence_and_report(codec, pin_nid);

}

sound/soc/codecs/arizona.c

+5 −11
Original line number Diff line number Diff line
@@ -1023,24 +1023,18 @@ void arizona_init_dvfs(struct arizona_priv *priv) 
}

EXPORT_SYMBOL_GPL(arizona_init_dvfs);



static unsigned int arizona_sysclk_48k_rates[] = {

static unsigned int arizona_opclk_ref_48k_rates[] = {

	6144000,

	12288000,

	24576000,

	49152000,

	73728000,

	98304000,

	147456000,

};



static unsigned int arizona_sysclk_44k1_rates[] = {

static unsigned int arizona_opclk_ref_44k1_rates[] = {

	5644800,

	11289600,

	22579200,

	45158400,

	67737600,

	90316800,

	135475200,

};



static int arizona_set_opclk(struct snd_soc_codec *codec, unsigned int clk,
@@ -1065,11 +1059,11 @@ static int arizona_set_opclk(struct snd_soc_codec *codec, unsigned int clk, 
	}



	if (refclk % 8000)

		rates = arizona_sysclk_44k1_rates;

		rates = arizona_opclk_ref_44k1_rates;

	else

		rates = arizona_sysclk_48k_rates;

		rates = arizona_opclk_ref_48k_rates;



	for (ref = 0; ref < ARRAY_SIZE(arizona_sysclk_48k_rates) &&

	for (ref = 0; ref < ARRAY_SIZE(arizona_opclk_ref_48k_rates) &&

		     rates[ref] <= refclk; ref++) {

		div = 1;

		while (rates[ref] / div >= freq && div < 32) {

sound/soc/codecs/es8328.c

+8 −8
Original line number Diff line number Diff line
@@ -205,18 +205,18 @@ static const struct snd_kcontrol_new es8328_right_line_controls = 


/* Left Mixer */

static const struct snd_kcontrol_new es8328_left_mixer_controls[] = {

	SOC_DAPM_SINGLE("Playback Switch", ES8328_DACCONTROL17, 8, 1, 0),

	SOC_DAPM_SINGLE("Left Bypass Switch", ES8328_DACCONTROL17, 7, 1, 0),

	SOC_DAPM_SINGLE("Right Playback Switch", ES8328_DACCONTROL18, 8, 1, 0),

	SOC_DAPM_SINGLE("Right Bypass Switch", ES8328_DACCONTROL18, 7, 1, 0),

	SOC_DAPM_SINGLE("Playback Switch", ES8328_DACCONTROL17, 7, 1, 0),

	SOC_DAPM_SINGLE("Left Bypass Switch", ES8328_DACCONTROL17, 6, 1, 0),

	SOC_DAPM_SINGLE("Right Playback Switch", ES8328_DACCONTROL18, 7, 1, 0),

	SOC_DAPM_SINGLE("Right Bypass Switch", ES8328_DACCONTROL18, 6, 1, 0),

};



/* Right Mixer */

static const struct snd_kcontrol_new es8328_right_mixer_controls[] = {

	SOC_DAPM_SINGLE("Left Playback Switch", ES8328_DACCONTROL19, 8, 1, 0),

	SOC_DAPM_SINGLE("Left Bypass Switch", ES8328_DACCONTROL19, 7, 1, 0),

	SOC_DAPM_SINGLE("Playback Switch", ES8328_DACCONTROL20, 8, 1, 0),

	SOC_DAPM_SINGLE("Right Bypass Switch", ES8328_DACCONTROL20, 7, 1, 0),

	SOC_DAPM_SINGLE("Left Playback Switch", ES8328_DACCONTROL19, 7, 1, 0),

	SOC_DAPM_SINGLE("Left Bypass Switch", ES8328_DACCONTROL19, 6, 1, 0),

	SOC_DAPM_SINGLE("Playback Switch", ES8328_DACCONTROL20, 7, 1, 0),

	SOC_DAPM_SINGLE("Right Bypass Switch", ES8328_DACCONTROL20, 6, 1, 0),

};



static const char * const es8328_pga_sel[] = {