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

Merge branch 'for-linus' into for-next 



Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parents b3a9e3b9 8abf41dc

sound/pci/hda/patch_hdmi.c

+5 −0
Original line number Diff line number Diff line
@@ -4145,6 +4145,11 @@ HDA_CODEC_ENTRY(0x10de0095, "GPU 95 HDMI/DP", patch_nvhdmi), 
HDA_CODEC_ENTRY(0x10de0097, "GPU 97 HDMI/DP",	patch_nvhdmi),

HDA_CODEC_ENTRY(0x10de0098, "GPU 98 HDMI/DP",	patch_nvhdmi),

HDA_CODEC_ENTRY(0x10de0099, "GPU 99 HDMI/DP",	patch_nvhdmi),

HDA_CODEC_ENTRY(0x10de009a, "GPU 9a HDMI/DP",	patch_nvhdmi),

HDA_CODEC_ENTRY(0x10de009d, "GPU 9d HDMI/DP",	patch_nvhdmi),

HDA_CODEC_ENTRY(0x10de009e, "GPU 9e HDMI/DP",	patch_nvhdmi),

HDA_CODEC_ENTRY(0x10de009f, "GPU 9f HDMI/DP",	patch_nvhdmi),

HDA_CODEC_ENTRY(0x10de00a0, "GPU a0 HDMI/DP",	patch_nvhdmi),

HDA_CODEC_ENTRY(0x10de8001, "MCP73 HDMI",	patch_nvhdmi_2ch),

HDA_CODEC_ENTRY(0x10de8067, "MCP67/68 HDMI",	patch_nvhdmi_2ch),

HDA_CODEC_ENTRY(0x11069f80, "VX900 HDMI/DP",	patch_via_hdmi),

sound/usb/format.c

+4 −2
Original line number Diff line number Diff line
@@ -394,8 +394,9 @@ static int parse_uac2_sample_rate_range(struct snd_usb_audio *chip, 
	return nr_rates;

}



/* Line6 Helix series don't support the UAC2_CS_RANGE usb function

 * call. Return a static table of known clock rates.

/* Line6 Helix series and the Rode Rodecaster Pro don't support the

 * UAC2_CS_RANGE usb function call. Return a static table of known

 * clock rates.

 */

static int line6_parse_audio_format_rates_quirk(struct snd_usb_audio *chip,

						struct audioformat *fp)
@@ -408,6 +409,7 @@ static int line6_parse_audio_format_rates_quirk(struct snd_usb_audio *chip, 
	case USB_ID(0x0e41, 0x4248): /* Line6 Helix >= fw 2.82 */

	case USB_ID(0x0e41, 0x4249): /* Line6 Helix Rack >= fw 2.82 */

	case USB_ID(0x0e41, 0x424a): /* Line6 Helix LT >= fw 2.82 */

	case USB_ID(0x19f7, 0x0011): /* Rode Rodecaster Pro */

		return set_fixed_rate(fp, 48000, SNDRV_PCM_RATE_48000);

	}

sound/usb/pcm.c

+1 −0
Original line number Diff line number Diff line
@@ -367,6 +367,7 @@ static int set_sync_ep_implicit_fb_quirk(struct snd_usb_substream *subs, 
		ifnum = 0;

		goto add_sync_ep_from_ifnum;

	case USB_ID(0x07fd, 0x0008): /* MOTU M Series */

	case USB_ID(0x31e9, 0x0002): /* Solid State Logic SSL2+ */

		ep = 0x81;

		ifnum = 2;

		goto add_sync_ep_from_ifnum;

sound/usb/quirks.c

+1 −0
Original line number Diff line number Diff line
@@ -1532,6 +1532,7 @@ bool snd_usb_get_sample_rate_quirk(struct snd_usb_audio *chip) 
static bool is_itf_usb_dsd_dac(unsigned int id)

{

	switch (id) {

	case USB_ID(0x154e, 0x1002): /* Denon DCD-1500RE */

	case USB_ID(0x154e, 0x1003): /* Denon DA-300USB */

	case USB_ID(0x154e, 0x3005): /* Marantz HD-DAC1 */

	case USB_ID(0x154e, 0x3006): /* Marantz SA-14S1 */