Merge branch 'for-linus' into for-next

diff --combined sound/pci/hda/patch_realtek.c
index a2fdf5f91d4392738fd2cd008b1c4593a08b3b49,4918ffa5ba6829e102519b3a7af700b049d93ae2..002f153bc65948e2a5bd46c484acbfba42d5b875
--- 1/sound/pci/hda/patch_realtek.c
--- 2/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@@ -342,11 -342,6 +342,11 @@@ static void alc_fill_eapd_coef(struct h
        case 0x10ec0293:
                alc_update_coef_idx(codec, 0xa, 1<<13, 0);
                break;
 +      case 0x10ec0234:
 +      case 0x10ec0274:
 +      case 0x10ec0294:
 +              alc_update_coef_idx(codec, 0x10, 1<<15, 0);
 +              break;
        case 0x10ec0662:
                if ((coef & 0x00f0) == 0x0030)
                        alc_update_coef_idx(codec, 0x4, 1<<10, 0); /* EAPD Ctrl */
@@@ -2652,7 -2647,6 +2652,7 @@@ enum 
        ALC269_TYPE_ALC255,
        ALC269_TYPE_ALC256,
        ALC269_TYPE_ALC225,
 +      ALC269_TYPE_ALC294,
  };
  
  /*
@@@ -2683,7 -2677,6 +2683,7 @@@ static int alc269_parse_auto_config(str
        case ALC269_TYPE_ALC255:
        case ALC269_TYPE_ALC256:
        case ALC269_TYPE_ALC225:
 +      case ALC269_TYPE_ALC294:
                ssids = alc269_ssids;
                break;
        default:
@@@ -6035,11 -6028,6 +6035,11 @@@ static int patch_alc269(struct hda_code
        case 0x10ec0225:
                spec->codec_variant = ALC269_TYPE_ALC225;
                break;
 +      case 0x10ec0234:
 +      case 0x10ec0274:
 +      case 0x10ec0294:
 +              spec->codec_variant = ALC269_TYPE_ALC294;
 +              break;
        }
  
        if (snd_hda_codec_read(codec, 0x51, 0, AC_VERB_PARAMETERS, 0) == 0x10ec5505) {
@@@ -6438,6 -6426,7 +6438,7 @@@ enum 
        ALC668_FIXUP_DELL_DISABLE_AAMIX,
        ALC668_FIXUP_DELL_XPS13,
        ALC662_FIXUP_ASUS_Nx50,
+       ALC668_FIXUP_ASUS_Nx51,
  };
  
  static const struct hda_fixup alc662_fixups[] = {
@@@ -6684,6 -6673,15 +6685,15 @@@
                .chained = true,
                .chain_id = ALC662_FIXUP_BASS_1A
        },
+       [ALC668_FIXUP_ASUS_Nx51] = {
+               .type = HDA_FIXUP_PINS,
+               .v.pins = (const struct hda_pintbl[]) {
+                       {0x1a, 0x90170151}, /* bass speaker */
+                       {}
+               },
+               .chained = true,
+               .chain_id = ALC662_FIXUP_BASS_CHMAP,
+       },
  };
  
  static const struct snd_pci_quirk alc662_fixup_tbl[] = {
@@@ -6706,11 -6704,14 +6716,14 @@@
        SND_PCI_QUIRK(0x1028, 0x0698, "Dell", ALC668_FIXUP_DELL_MIC_NO_PRESENCE),
        SND_PCI_QUIRK(0x1028, 0x069f, "Dell", ALC668_FIXUP_DELL_MIC_NO_PRESENCE),
        SND_PCI_QUIRK(0x103c, 0x1632, "HP RP5800", ALC662_FIXUP_HP_RP5800),
+       SND_PCI_QUIRK(0x1043, 0x1080, "Asus UX501VW", ALC668_FIXUP_HEADSET_MODE),
        SND_PCI_QUIRK(0x1043, 0x11cd, "Asus N550", ALC662_FIXUP_ASUS_Nx50),
        SND_PCI_QUIRK(0x1043, 0x13df, "Asus N550JX", ALC662_FIXUP_BASS_1A),
        SND_PCI_QUIRK(0x1043, 0x129d, "Asus N750", ALC662_FIXUP_ASUS_Nx50),
        SND_PCI_QUIRK(0x1043, 0x1477, "ASUS N56VZ", ALC662_FIXUP_BASS_MODE4_CHMAP),
        SND_PCI_QUIRK(0x1043, 0x15a7, "ASUS UX51VZH", ALC662_FIXUP_BASS_16),
+       SND_PCI_QUIRK(0x1043, 0x177d, "ASUS N551", ALC668_FIXUP_ASUS_Nx51),
+       SND_PCI_QUIRK(0x1043, 0x17bd, "ASUS N751", ALC668_FIXUP_ASUS_Nx51),
        SND_PCI_QUIRK(0x1043, 0x1b73, "ASUS N55SF", ALC662_FIXUP_BASS_16),
        SND_PCI_QUIRK(0x1043, 0x1bf3, "ASUS N76VZ", ALC662_FIXUP_BASS_MODE4_CHMAP),
        SND_PCI_QUIRK(0x1043, 0x8469, "ASUS mobo", ALC662_FIXUP_NO_JACK_DETECT),
@@@ -6941,7 -6942,6 +6954,7 @@@ static const struct hda_device_id snd_h
        HDA_CODEC_ENTRY(0x10ec0225, "ALC225", patch_alc269),
        HDA_CODEC_ENTRY(0x10ec0231, "ALC231", patch_alc269),
        HDA_CODEC_ENTRY(0x10ec0233, "ALC233", patch_alc269),
 +      HDA_CODEC_ENTRY(0x10ec0234, "ALC234", patch_alc269),
        HDA_CODEC_ENTRY(0x10ec0235, "ALC233", patch_alc269),
        HDA_CODEC_ENTRY(0x10ec0255, "ALC255", patch_alc269),
        HDA_CODEC_ENTRY(0x10ec0256, "ALC256", patch_alc269),
@@@ -6952,7 -6952,6 +6965,7 @@@
        HDA_CODEC_ENTRY(0x10ec0269, "ALC269", patch_alc269),
        HDA_CODEC_ENTRY(0x10ec0270, "ALC270", patch_alc269),
        HDA_CODEC_ENTRY(0x10ec0272, "ALC272", patch_alc662),
 +      HDA_CODEC_ENTRY(0x10ec0274, "ALC274", patch_alc269),
        HDA_CODEC_ENTRY(0x10ec0275, "ALC275", patch_alc269),
        HDA_CODEC_ENTRY(0x10ec0276, "ALC276", patch_alc269),
        HDA_CODEC_ENTRY(0x10ec0280, "ALC280", patch_alc269),
@@@ -6965,7 -6964,6 +6978,7 @@@
        HDA_CODEC_ENTRY(0x10ec0290, "ALC290", patch_alc269),
        HDA_CODEC_ENTRY(0x10ec0292, "ALC292", patch_alc269),
        HDA_CODEC_ENTRY(0x10ec0293, "ALC293", patch_alc269),
 +      HDA_CODEC_ENTRY(0x10ec0294, "ALC294", patch_alc269),
        HDA_CODEC_ENTRY(0x10ec0298, "ALC298", patch_alc269),
        HDA_CODEC_REV_ENTRY(0x10ec0861, 0x100340, "ALC660", patch_alc861),
        HDA_CODEC_ENTRY(0x10ec0660, "ALC660-VD", patch_alc861vd),

diff --combined sound/usb/card.c
index c4665dc606ca68d539997941d60bdfcf408fb0ef,3fc63583a5372dbec8d09e7ba7cf7399abb54cd1..69860da473ea8b9d7ee853e9dfcdcc804690983f
--- 1/sound/usb/card.c
--- 2/sound/usb/card.c
+++ b/sound/usb/card.c
@@@ -66,7 -66,6 +66,6 @@@
  #include "format.h"
  #include "power.h"
  #include "stream.h"
- #include "media.h"
  
  MODULE_AUTHOR("Takashi Iwai <[email protected]>");
  MODULE_DESCRIPTION("USB Audio");
@@@ -351,7 -350,6 +350,7 @@@ static int snd_usb_audio_create(struct 
        case USB_SPEED_HIGH:
        case USB_SPEED_WIRELESS:
        case USB_SPEED_SUPER:
 +      case USB_SPEED_SUPER_PLUS:
                break;
        default:
                dev_err(&dev->dev, "unknown device speed %d\n", snd_usb_get_speed(dev));
@@@ -452,9 -450,6 +451,9 @@@
        case USB_SPEED_SUPER:
                strlcat(card->longname, ", super speed", sizeof(card->longname));
                break;
 +      case USB_SPEED_SUPER_PLUS:
 +              strlcat(card->longname, ", super speed plus", sizeof(card->longname));
 +              break;
        default:
                break;
        }
@@@ -616,11 -611,6 +615,6 @@@ static int usb_audio_probe(struct usb_i
        if (err < 0)
                goto __error;
  
-       if (quirk->media_device) {
-               /* don't want to fail when media_snd_device_create() fails */
-               media_snd_device_create(chip, intf);
-       }
- 
        usb_chip[chip->index] = chip;
        chip->num_interfaces++;
        usb_set_intfdata(intf, chip);
@@@ -677,14 -667,6 +671,6 @@@ static void usb_audio_disconnect(struc
                list_for_each(p, &chip->midi_list) {
                        snd_usbmidi_disconnect(p);
                }
-               /*
-                * Nice to check quirk && quirk->media_device
-                * need some special handlings. Doesn't look like
-                * we have access to quirk here
-                * Acceses mixer_list
-               */
-               media_snd_device_delete(chip);
- 
                /* release mixer resources */
                list_for_each_entry(mixer, &chip->mixer_list, list) {
                        snd_usb_mixer_disconnect(mixer);

diff --combined sound/usb/usbaudio.h
index 89b6853030de59e715482ba781dca4016a054bc5,b665d85555cb3aad0c9a621232f28d8e1f75344a..4d5c89a7ba2b5b97b62a1464ead6743710e34ed8
--- 1/sound/usb/usbaudio.h
--- 2/sound/usb/usbaudio.h
+++ b/sound/usb/usbaudio.h
@@@ -30,9 -30,6 +30,6 @@@
   *
   */
  
- struct media_device;
- struct media_intf_devnode;
- 
  struct snd_usb_audio {
        int index;
        struct usb_device *dev;
@@@ -50,7 -47,6 +47,7 @@@
        
        int num_interfaces;
        int num_suspended_intf;
 +      int sample_rate_read_error;
  
        struct list_head pcm_list;      /* list of pcm streams */
        struct list_head ep_list;       /* list of audio-related endpoints */
@@@ -64,8 -60,6 +61,6 @@@
        bool autoclock;                 /* from the 'autoclock' module param */
  
        struct usb_host_interface *ctrl_intf;   /* the audio control interface */
-       struct media_device *media_dev;
-       struct media_intf_devnode *ctl_intf_media_devnode;
  };
  
  #define usb_audio_err(chip, fmt, args...) \
@@@ -116,7 -110,6 +111,6 @@@ struct snd_usb_audio_quirk 
        const char *product_name;
        int16_t ifnum;
        uint16_t type;
-       bool media_device;
        const void *data;
  };