Commit f21dca85 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: usb-audio: Move clock setup quirk into quirk_flags 

There are a couple of device-specific quirks in the clock setup code,
and those can be moved gracefully to quirk_flags, too.

Link: https://lore.kernel.org/r/20210729073855.19043-7-tiwai@suse.de


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 019c7f91

sound/usb/clock.c

+4 −9
Original line number Diff line number Diff line
@@ -324,11 +324,8 @@ static int __uac_clock_find_source(struct snd_usb_audio *chip, 
					      sources[ret - 1],

					      visited, validate);

		if (ret > 0) {

			/*

			 * For Samsung USBC Headset (AKG), setting clock selector again

			 * will result in incorrect default clock setting problems

			 */

			if (chip->usb_id == USB_ID(0x04e8, 0xa051))

			/* Skip setting clock selector again for some devices */

			if (chip->quirk_flags & QUIRK_FLAG_SKIP_CLOCK_SELECTOR)

				return ret;

			err = uac_clock_selector_set_val(chip, entity_id, cur);

			if (err < 0)
@@ -541,10 +538,8 @@ static int set_sample_rate_v2v3(struct snd_usb_audio *chip, 
		 */

		clock = snd_usb_clock_find_source(chip, fmt, false);



		/* Denon DN-X1600 hardcoded

		 * Sample rate seems to be set on the hardware itself

		 */

		if (chip->usb_id == USB_ID(0x154e, 0x500e))

		/* Hardcoded sample rates */

		if (chip->quirk_flags & QUIRK_FLAG_IGNORE_CLOCK_SOURCE)

			return 0;



		if (clock < 0)

sound/usb/quirks.c

+4 −0
Original line number Diff line number Diff line
@@ -1890,6 +1890,8 @@ static const struct usb_audio_quirk_flags_table quirk_flags_table[] = { 
		   QUIRK_FLAG_GET_SAMPLE_RATE),

	DEVICE_FLG(0x04d8, 0xfeea, /* Benchmark DAC1 Pre */

		   QUIRK_FLAG_GET_SAMPLE_RATE),

	DEVICE_FLG(0x04e8, 0xa051, /* Samsung USBC Headset (AKG) */

		   QUIRK_FLAG_SKIP_CLOCK_SELECTOR),

	DEVICE_FLG(0x0556, 0x0014, /* Phoenix Audio TMX320VC */

		   QUIRK_FLAG_GET_SAMPLE_RATE),

	DEVICE_FLG(0x05a3, 0x9420, /* ELP HD USB Camera */
@@ -1906,6 +1908,8 @@ static const struct usb_audio_quirk_flags_table quirk_flags_table[] = { 
		   QUIRK_FLAG_SHARE_MEDIA_DEVICE | QUIRK_FLAG_ALIGN_TRANSFER),

	DEVICE_FLG(0x1395, 0x740a, /* Sennheiser DECT */

		   QUIRK_FLAG_GET_SAMPLE_RATE),

	DEVICE_FLG(0x154e, 0x500e, /* Denon DN-X1600 */

		   QUIRK_FLAG_IGNORE_CLOCK_SOURCE),

	DEVICE_FLG(0x1686, 0x00dd, /* Zoom R16/24 */

		   QUIRK_FLAG_TX_LENGTH),

	DEVICE_FLG(0x1901, 0x0191, /* GE B850V3 CP2114 audio interface */

sound/usb/usbaudio.h

+6 −0
Original line number Diff line number Diff line
@@ -140,6 +140,10 @@ extern bool snd_usb_skip_validation; 
 *  Add length specifier to transfers

 * QUIRK_FLAG_PLAYBACK_FIRST:

 *  Start playback stream at first even in implement feedback mode

 * QUIRK_FLAG_SKIP_CLOCK_SELECTOR:

 *  Skip clock selector setup; the device may reset to invalid state

 * QUIRK_FLAG_IGNORE_CLOCK_SOURCE:

 *  Ignore errors from clock source search; i.e. hardcoded clock

 */



#define QUIRK_FLAG_GET_SAMPLE_RATE	(1U << 0)
@@ -147,5 +151,7 @@ extern bool snd_usb_skip_validation; 
#define QUIRK_FLAG_ALIGN_TRANSFER	(1U << 2)

#define QUIRK_FLAG_TX_LENGTH		(1U << 3)

#define QUIRK_FLAG_PLAYBACK_FIRST	(1U << 4)

#define QUIRK_FLAG_SKIP_CLOCK_SELECTOR	(1U << 5)

#define QUIRK_FLAG_IGNORE_CLOCK_SOURCE	(1U << 6)



#endif /* __USBAUDIO_H */