Commit fbf9e3b6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "The amount of changes wasn't as small as wished, but all reasonably
  small fixes. There is a PCM core API change, which is for correcting
  the behavior change we took in 6.8. The rest are device-specific fixes
  for ASoC AMD, Qualcomm, Cirrus codecs, HD-audio quirks & co"

* tag 'sound-6.8-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ASoC: amd: yc: Fix non-functional mic on Lenovo 21J2
  ASoC: amd: yc: add new YC platform variant (0x63) support
  ALSA: hda/realtek - ALC285 reduce pop noise from Headphone port
  ASoC: amd: yc: Add Lenovo ThinkBook 21J0 into DMI quirk table
  ALSA: hda/realtek: Add special fixup for Lenovo 14IRP8
  ASoC: soc-card: Fix missing locking in snd_soc_card_get_kcontrol()
  ALSA: hda/realtek: tas2781: enable subwoofer volume control
  ALSA: pcm: clarify and fix default msbits value for all formats
  ASoC: qcom: Fix uninitialized pointer dmactl
  ALSA: hda/realtek: fix mute/micmute LED For HP mt440
  ALSA: Drop leftover snd-rtctimer stuff from Makefile
  ALSA: ump: Fix the discard error code from snd_ump_legacy_open()
  ALSA: hda/realtek: Enable Mute LED on HP 840 G8 (MB 8AB8)
  ASoC: cs35l56: Must clear HALO_STATE before issuing SYSTEM_RESET
  ALSA: hda/realtek: Fix top speaker connection on Dell Inspiron 16 Plus 7630
  ALSA: firewire-lib: fix to check cycle continuity
parents 7187ea09 17c6a0c9

include/sound/soc-card.h

+2 −0
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ static inline void snd_soc_card_mutex_unlock(struct snd_soc_card *card) 


struct snd_kcontrol *snd_soc_card_get_kcontrol(struct snd_soc_card *soc_card,

					       const char *name);

struct snd_kcontrol *snd_soc_card_get_kcontrol_locked(struct snd_soc_card *soc_card,

						      const char *name);

int snd_soc_card_jack_new(struct snd_soc_card *card, const char *id, int type,

			  struct snd_soc_jack *jack);

int snd_soc_card_jack_new_pins(struct snd_soc_card *card, const char *id,

include/uapi/sound/asound.h

+2 −2
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ struct snd_hwdep_dsp_image { 
 *                                                                           *

 *****************************************************************************/



#define SNDRV_PCM_VERSION		SNDRV_PROTOCOL_VERSION(2, 0, 16)

#define SNDRV_PCM_VERSION		SNDRV_PROTOCOL_VERSION(2, 0, 17)



typedef unsigned long snd_pcm_uframes_t;

typedef signed long snd_pcm_sframes_t;
@@ -416,7 +416,7 @@ struct snd_pcm_hw_params { 
	unsigned int rmask;		/* W: requested masks */

	unsigned int cmask;		/* R: changed masks */

	unsigned int info;		/* R: Info flags for returned setup */

	unsigned int msbits;		/* R: used most significant bits */

	unsigned int msbits;		/* R: used most significant bits (in sample bit-width) */

	unsigned int rate_num;		/* R: rate numerator */

	unsigned int rate_den;		/* R: rate denominator */

	snd_pcm_uframes_t fifo_size;	/* R: chip FIFO size in frames */

sound/core/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ snd-ump-objs := ump.o 
snd-ump-$(CONFIG_SND_UMP_LEGACY_RAWMIDI) += ump_convert.o

snd-timer-objs    := timer.o

snd-hrtimer-objs  := hrtimer.o

snd-rtctimer-objs := rtctimer.o

snd-hwdep-objs    := hwdep.o

snd-seq-device-objs := seq_device.o

sound/core/pcm_native.c

+5 −0
Original line number Diff line number Diff line
@@ -486,6 +486,11 @@ static int fixup_unreferenced_params(struct snd_pcm_substream *substream, 
		i = hw_param_interval_c(params, SNDRV_PCM_HW_PARAM_SAMPLE_BITS);

		if (snd_interval_single(i))

			params->msbits = snd_interval_value(i);

		m = hw_param_mask_c(params, SNDRV_PCM_HW_PARAM_FORMAT);

		if (snd_mask_single(m)) {

			snd_pcm_format_t format = (__force snd_pcm_format_t)snd_mask_min(m);

			params->msbits = snd_pcm_format_width(format);

		}

	}



	if (params->msbits) {

sound/core/ump.c

+2 −2
Original line number Diff line number Diff line
@@ -985,7 +985,7 @@ static int snd_ump_legacy_open(struct snd_rawmidi_substream *substream) 
	struct snd_ump_endpoint *ump = substream->rmidi->private_data;

	int dir = substream->stream;

	int group = ump->legacy_mapping[substream->number];

	int err;

	int err = 0;



	mutex_lock(&ump->open_mutex);

	if (ump->legacy_substreams[dir][group]) {
@@ -1009,7 +1009,7 @@ static int snd_ump_legacy_open(struct snd_rawmidi_substream *substream) 
	spin_unlock_irq(&ump->legacy_locks[dir]);

 unlock:

	mutex_unlock(&ump->open_mutex);

	return 0;

	return err;

}



static int snd_ump_legacy_close(struct snd_rawmidi_substream *substream)