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

Commit 557ed56c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "This time we got a few more fixes than the previous rc's, and most of
  commits were about ASoC.

  The only significant change in the core side is the regression fix wrt
  the aux device list handling, and all the rest are driver-specific
  small / trivial fixes"

* tag 'sound-4.10-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: usb-audio: Add a quirk for Plantronics BT600
  ASoC: rt5645: set sel_i2s_pre_div1 to 2
  ASoC: dpcm: Avoid putting stream state to STOP when FE stream is paused
  ASoC: Intel: Skylake: Release FW ctx in cleanup
  ASoC: Intel: bytcr-rt5640: fix settings in internal clock mode
  ASoC: fsl_ssi: set fifo watermark to more reliable value
  ASoC: nau8825: fix invalid configuration in Pre-Scalar of FLL
  ASoC: nau8825: correct the function name of register
  ASoC: Intel: Skylake: Fix to fail safely if module not available in path
  ASoC: tlv320aic3x: Mark the RESET register as volatile
  ASoC: Fix binding and probing of auxiliary components
  ASoC: wm_adsp: Don't overrun firmware file buffer when reading region data
  ASoC: Intel: bytcr_rt5640: fallback mechanism if MCLK is not enabled
  ASoC: hdmi-codec: use unsigned type to structure members with bit-field
  ASoC: topology: kfree kcontrol->private_value before freeing kcontrol
  ASoC: rsnd: don't double free kctrl
  ASoC: dwc: Fix PIO mode initialization
parents e28ac1fc 6cf4569c

include/sound/hdmi-codec.h

+4 −4
Original line number Diff line number Diff line
@@ -36,10 +36,10 @@ struct hdmi_codec_daifmt { 
		HDMI_AC97,

		HDMI_SPDIF,

	} fmt;

	int bit_clk_inv:1;

	int frame_clk_inv:1;

	int bit_clk_master:1;

	int frame_clk_master:1;

	unsigned int bit_clk_inv:1;

	unsigned int frame_clk_inv:1;

	unsigned int bit_clk_master:1;

	unsigned int frame_clk_master:1;

};



/*

include/sound/soc.h

+3 −0
Original line number Diff line number Diff line
@@ -813,6 +813,7 @@ struct snd_soc_component { 
	unsigned int suspended:1; /* is in suspend PM state */



	struct list_head list;

	struct list_head card_aux_list; /* for auxiliary bound components */

	struct list_head card_list;



	struct snd_soc_dai_driver *dai_drv;
@@ -1152,6 +1153,7 @@ struct snd_soc_card { 
	 */

	struct snd_soc_aux_dev *aux_dev;

	int num_aux_devs;

	struct list_head aux_comp_list;



	const struct snd_kcontrol_new *controls;

	int num_controls;
@@ -1547,6 +1549,7 @@ static inline void snd_soc_initialize_card_lists(struct snd_soc_card *card) 
	INIT_LIST_HEAD(&card->widgets);

	INIT_LIST_HEAD(&card->paths);

	INIT_LIST_HEAD(&card->dapm_list);

	INIT_LIST_HEAD(&card->aux_comp_list);

	INIT_LIST_HEAD(&card->component_dev_list);

}

sound/soc/codecs/nau8825.c

+5 −4
Original line number Diff line number Diff line
@@ -561,9 +561,9 @@ static void nau8825_xtalk_prepare(struct nau8825 *nau8825) 
	nau8825_xtalk_backup(nau8825);

	/* Config IIS as master to output signal by codec */

	regmap_update_bits(nau8825->regmap, NAU8825_REG_I2S_PCM_CTRL2,

		NAU8825_I2S_MS_MASK | NAU8825_I2S_DRV_MASK |

		NAU8825_I2S_MS_MASK | NAU8825_I2S_LRC_DIV_MASK |

		NAU8825_I2S_BLK_DIV_MASK, NAU8825_I2S_MS_MASTER |

		(0x2 << NAU8825_I2S_DRV_SFT) | 0x1);

		(0x2 << NAU8825_I2S_LRC_DIV_SFT) | 0x1);

	/* Ramp up headphone volume to 0dB to get better performance and

	 * avoid pop noise in headphone.

	 */
@@ -657,7 +657,7 @@ static void nau8825_xtalk_clean(struct nau8825 *nau8825) 
		NAU8825_IRQ_RMS_EN, NAU8825_IRQ_RMS_EN);

	/* Recover default value for IIS */

	regmap_update_bits(nau8825->regmap, NAU8825_REG_I2S_PCM_CTRL2,

		NAU8825_I2S_MS_MASK | NAU8825_I2S_DRV_MASK |

		NAU8825_I2S_MS_MASK | NAU8825_I2S_LRC_DIV_MASK |

		NAU8825_I2S_BLK_DIV_MASK, NAU8825_I2S_MS_SLAVE);

	/* Restore value of specific register for cross talk */

	nau8825_xtalk_restore(nau8825);
@@ -2006,7 +2006,8 @@ static void nau8825_fll_apply(struct nau8825 *nau8825, 
			NAU8825_FLL_INTEGER_MASK, fll_param->fll_int);

	/* FLL pre-scaler */

	regmap_update_bits(nau8825->regmap, NAU8825_REG_FLL4,

			NAU8825_FLL_REF_DIV_MASK, fll_param->clk_ref_div);

			NAU8825_FLL_REF_DIV_MASK,

			fll_param->clk_ref_div << NAU8825_FLL_REF_DIV_SFT);

	/* select divided VCO input */

	regmap_update_bits(nau8825->regmap, NAU8825_REG_FLL5,

		NAU8825_FLL_CLK_SW_MASK, NAU8825_FLL_CLK_SW_REF);

sound/soc/codecs/nau8825.h

+4 −3
Original line number Diff line number Diff line
@@ -137,7 +137,8 @@ 
#define NAU8825_FLL_CLK_SRC_FS			(0x3 << NAU8825_FLL_CLK_SRC_SFT)



/* FLL4 (0x07) */

#define NAU8825_FLL_REF_DIV_MASK		(0x3 << 10)

#define NAU8825_FLL_REF_DIV_SFT	10

#define NAU8825_FLL_REF_DIV_MASK	(0x3 << NAU8825_FLL_REF_DIV_SFT)



/* FLL5 (0x08) */

#define NAU8825_FLL_PDB_DAC_EN		(0x1 << 15)
@@ -247,8 +248,8 @@ 


/* I2S_PCM_CTRL2 (0x1d) */

#define NAU8825_I2S_TRISTATE	(1 << 15) /* 0 - normal mode, 1 - Hi-Z output */

#define NAU8825_I2S_DRV_SFT	12

#define NAU8825_I2S_DRV_MASK	(0x3 << NAU8825_I2S_DRV_SFT)

#define NAU8825_I2S_LRC_DIV_SFT	12

#define NAU8825_I2S_LRC_DIV_MASK	(0x3 << NAU8825_I2S_LRC_DIV_SFT)

#define NAU8825_I2S_MS_SFT	3

#define NAU8825_I2S_MS_MASK	(1 << NAU8825_I2S_MS_SFT)

#define NAU8825_I2S_MS_MASTER	(1 << NAU8825_I2S_MS_SFT)

sound/soc/codecs/rt5645.c

+3 −0
Original line number Diff line number Diff line
@@ -3833,6 +3833,9 @@ static int rt5645_i2c_probe(struct i2c_client *i2c, 
		}

	}



	regmap_update_bits(rt5645->regmap, RT5645_ADDA_CLK1,

		RT5645_I2S_PD1_MASK, RT5645_I2S_PD1_2);



	if (rt5645->pdata.jd_invert) {

		regmap_update_bits(rt5645->regmap, RT5645_IRQ_CTRL2,

			RT5645_JD_1_1_MASK, RT5645_JD_1_1_INV);