Commit 7dc78c7b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "As usual in a late stage, we received a fair amount of fixes for ASoC,
  and it became bigger than wished. But all fixes are rather device-
  specific, and they look pretty safe to apply.

  A major par of changes are series of fixes for ASoC meson and SOF
  drivers as well as for Realtek and Cirrus codecs. In addition, recent
  emu10k1 regression fixes and usual HD-audio quirks are included"

* tag 'sound-6.9-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (46 commits)
  ALSA: hda/realtek: Fix build error without CONFIG_PM
  ALSA: hda/realtek: Fix conflicting PCI SSID 17aa:386f for Lenovo Legion models
  ALSA: hda/realtek - Set GPIO3 to default at S4 state for Thinkpad with ALC1318
  ALSA: hda: intel-sdw-acpi: fix usage of device_get_named_child_node()
  ALSA: hda: intel-dsp-config: harden I2C/I2S codec detection
  ASoC: cs35l56: fix usages of device_get_named_child_node()
  ASoC: da7219-aad: fix usage of device_get_named_child_node()
  ASoC: meson: cards: select SND_DYNAMIC_MINORS
  ASoC: meson: axg-tdm: add continuous clock support
  ASoC: meson: axg-tdm-interface: manage formatters in trigger
  ASoC: meson: axg-card: make links nonatomic
  ASoC: meson: axg-fifo: use threaded irq to check periods
  ALSA: hda/realtek: Fix mute led of HP Laptop 15-da3001TU
  ALSA: emu10k1: make E-MU FPGA writes potentially more reliable
  ALSA: emu10k1: fix E-MU dock initialization
  ALSA: emu10k1: use mutex for E-MU FPGA access locking
  ALSA: emu10k1: move the whole GPIO event handling to the workqueue
  ALSA: emu10k1: factor out snd_emu1010_load_dock_firmware()
  ALSA: emu10k1: fix E-MU card dock presence monitoring
  ASoC: rt715-sdca: volume step modification
  ...
parents b5a66609 fdb3f29d

Documentation/devicetree/bindings/sound/rt5645.txt

+6 −0
Original line number Diff line number Diff line
@@ -20,6 +20,11 @@ Optional properties: 
  a GPIO spec for the external headphone detect pin. If jd-mode = 0,

  we will get the JD status by getting the value of hp-detect-gpios.



- cbj-sleeve-gpios:

  a GPIO spec to control the external combo jack circuit to tie the sleeve/ring2

  contacts to the ground or floating. It could avoid some electric noise from the

  active speaker jacks.



- realtek,in2-differential

  Boolean. Indicate MIC2 input are differential, rather than single-ended.
@@ -68,6 +73,7 @@ codec: rt5650@1a { 
	compatible = "realtek,rt5650";

	reg = <0x1a>;

	hp-detect-gpios = <&gpio 19 0>;

	cbj-sleeve-gpios = <&gpio 20 0>;

	interrupt-parent = <&gpio>;

	interrupts = <7 IRQ_TYPE_EDGE_FALLING>;

	realtek,dmic-en = "true";

drivers/base/regmap/regmap.c

+37 −0
Original line number Diff line number Diff line
@@ -2838,6 +2838,43 @@ int regmap_read(struct regmap *map, unsigned int reg, unsigned int *val) 
}

EXPORT_SYMBOL_GPL(regmap_read);



/**

 * regmap_read_bypassed() - Read a value from a single register direct

 *			    from the device, bypassing the cache

 *

 * @map: Register map to read from

 * @reg: Register to be read from

 * @val: Pointer to store read value

 *

 * A value of zero will be returned on success, a negative errno will

 * be returned in error cases.

 */

int regmap_read_bypassed(struct regmap *map, unsigned int reg, unsigned int *val)

{

	int ret;

	bool bypass, cache_only;



	if (!IS_ALIGNED(reg, map->reg_stride))

		return -EINVAL;



	map->lock(map->lock_arg);



	bypass = map->cache_bypass;

	cache_only = map->cache_only;

	map->cache_bypass = true;

	map->cache_only = false;



	ret = _regmap_read(map, reg, val);



	map->cache_bypass = bypass;

	map->cache_only = cache_only;



	map->unlock(map->lock_arg);



	return ret;

}

EXPORT_SYMBOL_GPL(regmap_read_bypassed);



/**

 * regmap_raw_read() - Read raw data from the device

 *

include/linux/regmap.h

+8 −0
Original line number Diff line number Diff line
@@ -1230,6 +1230,7 @@ int regmap_multi_reg_write_bypassed(struct regmap *map, 
int regmap_raw_write_async(struct regmap *map, unsigned int reg,

			   const void *val, size_t val_len);

int regmap_read(struct regmap *map, unsigned int reg, unsigned int *val);

int regmap_read_bypassed(struct regmap *map, unsigned int reg, unsigned int *val);

int regmap_raw_read(struct regmap *map, unsigned int reg,

		    void *val, size_t val_len);

int regmap_noinc_read(struct regmap *map, unsigned int reg,
@@ -1739,6 +1740,13 @@ static inline int regmap_read(struct regmap *map, unsigned int reg, 
	return -EINVAL;

}



static inline int regmap_read_bypassed(struct regmap *map, unsigned int reg,

				       unsigned int *val)

{

	WARN_ONCE(1, "regmap API is disabled");

	return -EINVAL;

}



static inline int regmap_raw_read(struct regmap *map, unsigned int reg,

				  void *val, size_t val_len)

{

include/sound/cs35l56.h

+2 −0
Original line number Diff line number Diff line
@@ -267,6 +267,7 @@ struct cs35l56_base { 
	bool fw_patched;

	bool secured;

	bool can_hibernate;

	bool fw_owns_asp1;

	bool cal_data_valid;

	s8 cal_index;

	struct cirrus_amp_cal_data cal_data;
@@ -283,6 +284,7 @@ extern const char * const cs35l56_tx_input_texts[CS35L56_NUM_INPUT_SRC]; 
extern const unsigned int cs35l56_tx_input_values[CS35L56_NUM_INPUT_SRC];



int cs35l56_set_patch(struct cs35l56_base *cs35l56_base);

int cs35l56_init_asp1_regs_for_driver_control(struct cs35l56_base *cs35l56_base);

int cs35l56_force_sync_asp1_registers_from_cache(struct cs35l56_base *cs35l56_base);

int cs35l56_mbox_send(struct cs35l56_base *cs35l56_base, unsigned int command);

int cs35l56_firmware_shutdown(struct cs35l56_base *cs35l56_base);

include/sound/emu10k1.h

+5 −2
Original line number Diff line number Diff line
@@ -1684,8 +1684,8 @@ struct snd_emu1010 { 
	unsigned int clock_fallback;

	unsigned int optical_in; /* 0:SPDIF, 1:ADAT */

	unsigned int optical_out; /* 0:SPDIF, 1:ADAT */

	struct work_struct firmware_work;

	struct work_struct clock_work;

	struct work_struct work;

	struct mutex lock;

};



struct snd_emu10k1 {
@@ -1834,6 +1834,9 @@ unsigned int snd_emu10k1_ptr20_read(struct snd_emu10k1 * emu, unsigned int reg, 
void snd_emu10k1_ptr20_write(struct snd_emu10k1 *emu, unsigned int reg, unsigned int chn, unsigned int data);

int snd_emu10k1_spi_write(struct snd_emu10k1 * emu, unsigned int data);

int snd_emu10k1_i2c_write(struct snd_emu10k1 *emu, u32 reg, u32 value);

static inline void snd_emu1010_fpga_lock(struct snd_emu10k1 *emu) { mutex_lock(&emu->emu1010.lock); };

static inline void snd_emu1010_fpga_unlock(struct snd_emu10k1 *emu) { mutex_unlock(&emu->emu1010.lock); };

void snd_emu1010_fpga_write_lock(struct snd_emu10k1 *emu, u32 reg, u32 value);

void snd_emu1010_fpga_write(struct snd_emu10k1 *emu, u32 reg, u32 value);

void snd_emu1010_fpga_read(struct snd_emu10k1 *emu, u32 reg, u32 *value);

void snd_emu1010_fpga_link_dst_src_write(struct snd_emu10k1 *emu, u32 dst, u32 src);