5 files changed, 257 insertions, 88 deletions

diff --git a/sound/firewire/Kconfig b/sound/firewire/Kconfig
index 8a146b039276..44cedb65bb88 100644
--- a/sound/firewire/Kconfig
+++ b/sound/firewire/Kconfig
@@ -41,6 +41,7 @@ config SND_OXFW
            * Mackie(Loud) U.420/U.420d
            * TASCAM FireOne
            * Stanton Controllers & Systems 1 Deck/Mixer
+           * APOGEE duet FireWire
 
           To compile this driver as a module, choose M here: the module
           will be called snd-oxfw.
diff --git a/sound/firewire/oxfw/oxfw.c b/sound/firewire/oxfw/oxfw.c
index afb78d90384b..3d27f3378d5d 100644
--- a/sound/firewire/oxfw/oxfw.c
+++ b/sound/firewire/oxfw/oxfw.c
@@ -20,6 +20,7 @@
 #define VENDOR_LACIE            0x00d04b
 #define VENDOR_TASCAM           0x00022e
 #define OUI_STANTON             0x001260
+#define OUI_APOGEE              0x0003db
 
 #define MODEL_SATELLITE         0x00200f
 
@@ -397,6 +398,13 @@ static const struct ieee1394_device_id oxfw_id_table[] = {
                 .vendor_id      = OUI_STANTON,
                 .model_id       = 0x002000,
         },
+        // APOGEE, duet FireWire
+        {
+                .match_flags    = IEEE1394_MATCH_VENDOR_ID |
+                                  IEEE1394_MATCH_MODEL_ID,
+                .vendor_id      = OUI_APOGEE,
+                .model_id       = 0x01dddd,
+        },
         { }
 };
 MODULE_DEVICE_TABLE(ieee1394, oxfw_id_table);
diff --git a/sound/pci/asihpi/asihpi.c b/sound/pci/asihpi/asihpi.c
index a31fe1550903..aad74e809797 100644
--- a/sound/pci/asihpi/asihpi.c
+++ b/sound/pci/asihpi/asihpi.c
@@ -1183,7 +1183,7 @@ static int snd_card_asihpi_capture_prepare(struct snd_pcm_substream *substream)
 static u64 snd_card_asihpi_capture_formats(struct snd_card_asihpi *asihpi,
                                         u32 h_stream)
 {
-  struct hpi_format hpi_format;
+        struct hpi_format hpi_format;
         u16 format;
         u16 err;
         u32 h_control;
diff --git a/sound/pci/hda/patch_ca0132.c b/sound/pci/hda/patch_ca0132.c
index 0a567634e5fa..c40cb6336017 100644
--- a/sound/pci/hda/patch_ca0132.c
+++ b/sound/pci/hda/patch_ca0132.c
@@ -1081,6 +1081,18 @@ enum {
         QUIRK_AE5,
 };
 
+#ifdef CONFIG_PCI
+#define ca0132_quirk(spec)              ((spec)->quirk)
+#define ca0132_use_pci_mmio(spec)       ((spec)->use_pci_mmio)
+#define ca0132_use_alt_functions(spec)  ((spec)->use_alt_functions)
+#define ca0132_use_alt_controls(spec)   ((spec)->use_alt_controls)
+#else
+#define ca0132_quirk(spec)              ({ (void)(spec); QUIRK_NONE; })
+#define ca0132_use_alt_functions(spec)  ({ (void)(spec); false; })
+#define ca0132_use_pci_mmio(spec)       ({ (void)(spec); false; })
+#define ca0132_use_alt_controls(spec)   ({ (void)(spec); false; })
+#endif
+
 static const struct hda_pintbl alienware_pincfgs[] = {
         { 0x0b, 0x90170110 }, /* Builtin Speaker */
         { 0x0c, 0x411111f0 }, /* N/A */
@@ -3101,7 +3113,7 @@ static void dspload_post_setup(struct hda_codec *codec)
 {
         struct ca0132_spec *spec = codec->spec;
         codec_dbg(codec, "---- dspload_post_setup ------\n");
-        if (!spec->use_alt_functions) {
+        if (!ca0132_use_alt_functions(spec)) {
                 /*set DSP speaker to 2.0 configuration*/
                 chipio_write(codec, XRAM_XRAM_INST_OFFSET(0x18), 0x08080080);
                 chipio_write(codec, XRAM_XRAM_INST_OFFSET(0x19), 0x3f800000);
@@ -3333,7 +3345,7 @@ static void ca0132_gpio_init(struct hda_codec *codec)
 {
         struct ca0132_spec *spec = codec->spec;
 
-        switch (spec->quirk) {
+        switch (ca0132_quirk(spec)) {
         case QUIRK_SBZ:
         case QUIRK_AE5:
                 snd_hda_codec_write(codec, 0x01, 0, 0x793, 0x00);
@@ -3344,6 +3356,8 @@ static void ca0132_gpio_init(struct hda_codec *codec)
                 snd_hda_codec_write(codec, 0x01, 0, 0x793, 0x00);
                 snd_hda_codec_write(codec, 0x01, 0, 0x794, 0x5B);
                 break;
+        default:
+                break;
         }
 
 }
@@ -3353,7 +3367,7 @@ static void ca0132_gpio_setup(struct hda_codec *codec)
 {
         struct ca0132_spec *spec = codec->spec;
 
-        switch (spec->quirk) {
+        switch (ca0132_quirk(spec)) {
         case QUIRK_SBZ:
                 snd_hda_codec_write(codec, 0x01, 0,
                                 AC_VERB_SET_GPIO_DIRECTION, 0x07);
@@ -3372,6 +3386,8 @@ static void ca0132_gpio_setup(struct hda_codec *codec)
                 snd_hda_codec_write(codec, 0x01, 0,
                                 AC_VERB_SET_GPIO_DATA, 0x0C);
                 break;
+        default:
+                break;
         }
 }
 
@@ -4172,7 +4188,7 @@ static void ca0132_alt_select_out_quirk_handler(struct hda_codec *codec)
 
         switch (spec->cur_out_type) {
         case SPEAKER_OUT:
-                switch (spec->quirk) {
+                switch (ca0132_quirk(spec)) {
                 case QUIRK_SBZ:
                         ca0113_mmio_gpio_set(codec, 7, false);
                         ca0113_mmio_gpio_set(codec, 4, true);
@@ -4203,10 +4219,12 @@ static void ca0132_alt_select_out_quirk_handler(struct hda_codec *codec)
                         chipio_set_control_param(codec, 0x0d, 0xa4);
                         chipio_write(codec, 0x18b03c, 0x00000012);
                         break;
+                default:
+                        break;
                 }
                 break;
         case HEADPHONE_OUT:
-                switch (spec->quirk) {
+                switch (ca0132_quirk(spec)) {
                 case QUIRK_SBZ:
                         ca0113_mmio_gpio_set(codec, 7, true);
                         ca0113_mmio_gpio_set(codec, 4, true);
@@ -4238,10 +4256,12 @@ static void ca0132_alt_select_out_quirk_handler(struct hda_codec *codec)
                         chipio_set_control_param(codec, 0x0d, 0xa1);
                         chipio_write(codec, 0x18b03c, 0x00000012);
                         break;
+                default:
+                        break;
                 }
                 break;
         case SURROUND_OUT:
-                switch (spec->quirk) {
+                switch (ca0132_quirk(spec)) {
                 case QUIRK_SBZ:
                         ca0113_mmio_gpio_set(codec, 7, false);
                         ca0113_mmio_gpio_set(codec, 4, true);
@@ -4272,6 +4292,8 @@ static void ca0132_alt_select_out_quirk_handler(struct hda_codec *codec)
                         chipio_set_control_param(codec, 0x0d, 0xa4);
                         chipio_write(codec, 0x18b03c, 0x00000012);
                         break;
+                default:
+                        break;
                 }
                 break;
         }
@@ -4446,7 +4468,7 @@ static void ca0132_unsol_hp_delayed(struct work_struct *work)
                 to_delayed_work(work), struct ca0132_spec, unsol_hp_work);
         struct hda_jack_tbl *jack;
 
-        if (spec->use_alt_functions)
+        if (ca0132_use_alt_functions(spec))
                 ca0132_alt_select_out(spec->codec);
         else
                 ca0132_select_out(spec->codec);
@@ -4530,14 +4552,14 @@ static int ca0132_alt_set_vipsource(struct hda_codec *codec, int val)
 
                 chipio_set_conn_rate(codec, MEM_CONNID_MICIN1, SR_96_000);
                 chipio_set_conn_rate(codec, MEM_CONNID_MICOUT1, SR_96_000);
-                if (spec->quirk == QUIRK_R3DI)
+                if (ca0132_quirk(spec) == QUIRK_R3DI)
                         chipio_set_conn_rate(codec, 0x0F, SR_96_000);
 
 
                 if (spec->in_enum_val == REAR_LINE_IN)
                         tmp = FLOAT_ZERO;
                 else {
-                        if (spec->quirk == QUIRK_SBZ)
+                        if (ca0132_quirk(spec) == QUIRK_SBZ)
                                 tmp = FLOAT_THREE;
                         else
                                 tmp = FLOAT_ONE;
@@ -4549,7 +4571,7 @@ static int ca0132_alt_set_vipsource(struct hda_codec *codec, int val)
                 codec_dbg(codec, "%s: on.", __func__);
                 chipio_set_conn_rate(codec, MEM_CONNID_MICIN1, SR_16_000);
                 chipio_set_conn_rate(codec, MEM_CONNID_MICOUT1, SR_16_000);
-                if (spec->quirk == QUIRK_R3DI)
+                if (ca0132_quirk(spec) == QUIRK_R3DI)
                         chipio_set_conn_rate(codec, 0x0F, SR_16_000);
 
                 if (spec->effects_switch[VOICE_FOCUS - EFFECT_START_NID])
@@ -4645,7 +4667,7 @@ static int ca0132_alt_select_in(struct hda_codec *codec)
 
         switch (spec->cur_mic_type) {
         case REAR_MIC:
-                switch (spec->quirk) {
+                switch (ca0132_quirk(spec)) {
                 case QUIRK_SBZ:
                 case QUIRK_R3D:
                         ca0113_mmio_gpio_set(codec, 0, false);
@@ -4669,14 +4691,14 @@ static int ca0132_alt_select_in(struct hda_codec *codec)
 
                 chipio_set_conn_rate(codec, MEM_CONNID_MICIN1, SR_96_000);
                 chipio_set_conn_rate(codec, MEM_CONNID_MICOUT1, SR_96_000);
-                if (spec->quirk == QUIRK_R3DI)
+                if (ca0132_quirk(spec) == QUIRK_R3DI)
                         chipio_set_conn_rate(codec, 0x0F, SR_96_000);
 
                 dspio_set_uint_param(codec, 0x80, 0x00, tmp);
 
                 chipio_set_stream_control(codec, 0x03, 1);
                 chipio_set_stream_control(codec, 0x04, 1);
-                switch (spec->quirk) {
+                switch (ca0132_quirk(spec)) {
                 case QUIRK_SBZ:
                         chipio_write(codec, 0x18B098, 0x0000000C);
                         chipio_write(codec, 0x18B09C, 0x0000000C);
@@ -4689,12 +4711,14 @@ static int ca0132_alt_select_in(struct hda_codec *codec)
                         chipio_write(codec, 0x18B098, 0x0000000C);
                         chipio_write(codec, 0x18B09C, 0x0000004C);
                         break;
+                default:
+                        break;
                 }
                 ca0132_alt_mic_boost_set(codec, spec->mic_boost_enum_val);
                 break;
         case REAR_LINE_IN:
                 ca0132_mic_boost_set(codec, 0);
-                switch (spec->quirk) {
+                switch (ca0132_quirk(spec)) {
                 case QUIRK_SBZ:
                 case QUIRK_R3D:
                         ca0113_mmio_gpio_set(codec, 0, false);
@@ -4705,28 +4729,32 @@ static int ca0132_alt_select_in(struct hda_codec *codec)
                 case QUIRK_AE5:
                         ca0113_mmio_command_set(codec, 0x48, 0x28, 0x00);
                         break;
+                default:
+                        break;
                 }
 
                 chipio_set_conn_rate(codec, MEM_CONNID_MICIN1, SR_96_000);
                 chipio_set_conn_rate(codec, MEM_CONNID_MICOUT1, SR_96_000);
-                if (spec->quirk == QUIRK_R3DI)
+                if (ca0132_quirk(spec) == QUIRK_R3DI)
                         chipio_set_conn_rate(codec, 0x0F, SR_96_000);
 
                 tmp = FLOAT_ZERO;
                 dspio_set_uint_param(codec, 0x80, 0x00, tmp);
 
-                switch (spec->quirk) {
+                switch (ca0132_quirk(spec)) {
                 case QUIRK_SBZ:
                 case QUIRK_AE5:
                         chipio_write(codec, 0x18B098, 0x00000000);
                         chipio_write(codec, 0x18B09C, 0x00000000);
                         break;
+                default:
+                        break;
                 }
                 chipio_set_stream_control(codec, 0x03, 1);
                 chipio_set_stream_control(codec, 0x04, 1);
                 break;
         case FRONT_MIC:
-                switch (spec->quirk) {
+                switch (ca0132_quirk(spec)) {
                 case QUIRK_SBZ:
                 case QUIRK_R3D:
                         ca0113_mmio_gpio_set(codec, 0, true);
@@ -4748,7 +4776,7 @@ static int ca0132_alt_select_in(struct hda_codec *codec)
 
                 chipio_set_conn_rate(codec, MEM_CONNID_MICIN1, SR_96_000);
                 chipio_set_conn_rate(codec, MEM_CONNID_MICOUT1, SR_96_000);
-                if (spec->quirk == QUIRK_R3DI)
+                if (ca0132_quirk(spec) == QUIRK_R3DI)
                         chipio_set_conn_rate(codec, 0x0F, SR_96_000);
 
                 dspio_set_uint_param(codec, 0x80, 0x00, tmp);
@@ -4756,7 +4784,7 @@ static int ca0132_alt_select_in(struct hda_codec *codec)
                 chipio_set_stream_control(codec, 0x03, 1);
                 chipio_set_stream_control(codec, 0x04, 1);
 
-                switch (spec->quirk) {
+                switch (ca0132_quirk(spec)) {
                 case QUIRK_SBZ:
                         chipio_write(codec, 0x18B098, 0x0000000C);
                         chipio_write(codec, 0x18B09C, 0x000000CC);
@@ -4765,6 +4793,8 @@ static int ca0132_alt_select_in(struct hda_codec *codec)
                         chipio_write(codec, 0x18B098, 0x0000000C);
                         chipio_write(codec, 0x18B09C, 0x0000004C);
                         break;
+                default:
+                        break;
                 }
                 ca0132_alt_mic_boost_set(codec, spec->mic_boost_enum_val);
                 break;
@@ -4859,7 +4889,7 @@ static int ca0132_effects_set(struct hda_codec *codec, hda_nid_t nid, long val)
                         val = 0;
 
                 /* If Voice Focus on SBZ, set to two channel. */
-                if ((nid == VOICE_FOCUS) && (spec->use_pci_mmio)
+                if ((nid == VOICE_FOCUS) && ca0132_use_pci_mmio(spec)
                                 && (spec->cur_mic_type != REAR_LINE_IN)) {
                         if (spec->effects_switch[CRYSTAL_VOICE -
                                                  EFFECT_START_NID]) {
@@ -4878,7 +4908,7 @@ static int ca0132_effects_set(struct hda_codec *codec, hda_nid_t nid, long val)
                  * For SBZ noise reduction, there's an extra command
                  * to module ID 0x47. No clue why.
                  */
-                if ((nid == NOISE_REDUCTION) && (spec->use_pci_mmio)
+                if ((nid == NOISE_REDUCTION) && ca0132_use_pci_mmio(spec)
                                 && (spec->cur_mic_type != REAR_LINE_IN)) {
                         if (spec->effects_switch[CRYSTAL_VOICE -
                                                  EFFECT_START_NID]) {
@@ -4894,7 +4924,7 @@ static int ca0132_effects_set(struct hda_codec *codec, hda_nid_t nid, long val)
                 }
 
                 /* If rear line in disable effects. */
-                if (spec->use_alt_functions &&
+                if (ca0132_use_alt_functions(spec) &&
                                 spec->in_enum_val == REAR_LINE_IN)
                         val = 0;
         }
@@ -4924,7 +4954,7 @@ static int ca0132_pe_switch_set(struct hda_codec *codec)
         codec_dbg(codec, "ca0132_pe_switch_set: val=%ld\n",
                     spec->effects_switch[PLAY_ENHANCEMENT - EFFECT_START_NID]);
 
-        if (spec->use_alt_functions)
+        if (ca0132_use_alt_functions(spec))
                 ca0132_alt_select_out(codec);
 
         i = OUT_EFFECT_START_NID - EFFECT_START_NID;
@@ -4984,7 +5014,7 @@ static int ca0132_cvoice_switch_set(struct hda_codec *codec)
 
         /* set correct vipsource */
         oldval = stop_mic1(codec);
-        if (spec->use_alt_functions)
+        if (ca0132_use_alt_functions(spec))
                 ret |= ca0132_alt_set_vipsource(codec, 1);
         else
                 ret |= ca0132_set_vipsource(codec, 1);
@@ -5053,7 +5083,7 @@ static int ca0132_vnode_switch_set(struct snd_kcontrol *kcontrol,
                 auto_jack =
                         spec->vnode_lswitch[VNID_HP_ASEL - VNODE_START_NID];
                 if (!auto_jack) {
-                        if (spec->use_alt_functions)
+                        if (ca0132_use_alt_functions(spec))
                                 ca0132_alt_select_out(codec);
                         else
                                 ca0132_select_out(codec);
@@ -5070,7 +5100,7 @@ static int ca0132_vnode_switch_set(struct snd_kcontrol *kcontrol,
         }
 
         if (nid == VNID_HP_ASEL) {
-                if (spec->use_alt_functions)
+                if (ca0132_use_alt_functions(spec))
                         ca0132_alt_select_out(codec);
                 else
                         ca0132_select_out(codec);
@@ -5784,7 +5814,7 @@ static int ca0132_switch_put(struct snd_kcontrol *kcontrol,
         /* mic boost */
         if (nid == spec->input_pins[0]) {
                 spec->cur_mic_boost = *valp;
-                if (spec->use_alt_functions) {
+                if (ca0132_use_alt_functions(spec)) {
                         if (spec->in_enum_val != REAR_LINE_IN)
                                 changed = ca0132_mic_boost_set(codec, *valp);
                 } else {
@@ -6080,7 +6110,7 @@ static int add_fx_switch(struct hda_codec *codec, hda_nid_t nid,
         /* If using alt_controls, add FX: prefix. But, don't add FX:
          * prefix to OutFX or InFX enable controls.
          */
-        if ((spec->use_alt_controls) && (nid <= IN_EFFECT_END_NID))
+        if (ca0132_use_alt_controls(spec) && (nid <= IN_EFFECT_END_NID))
                 sprintf(namestr, "FX: %s %s Switch", pfx, dirstr[dir]);
         else
                 sprintf(namestr, "%s %s Switch", pfx, dirstr[dir]);
@@ -6357,7 +6387,7 @@ static int ca0132_build_controls(struct hda_codec *codec)
                         return err;
         }
         /* Setup vmaster with surround slaves for desktop ca0132 devices */
-        if (spec->use_alt_functions) {
+        if (ca0132_use_alt_functions(spec)) {
                 snd_hda_set_vmaster_tlv(codec, spec->dacs[0], HDA_OUTPUT,
                                         spec->tlv);
                 snd_hda_add_vmaster(codec, "Master Playback Volume",
@@ -6377,7 +6407,7 @@ static int ca0132_build_controls(struct hda_codec *codec)
         num_fx = OUT_EFFECTS_COUNT + IN_EFFECTS_COUNT;
         for (i = 0; i < num_fx; i++) {
                 /* Desktop cards break if Echo Cancellation is used. */
-                if (spec->use_pci_mmio) {
+                if (ca0132_use_pci_mmio(spec)) {
                         if (i == (ECHO_CANCELLATION - IN_EFFECT_START_NID +
                                                 OUT_EFFECTS_COUNT))
                                 continue;
@@ -6394,7 +6424,7 @@ static int ca0132_build_controls(struct hda_codec *codec)
          * EQ presets, and Smart Volume presets. Also, change names to add FX
          * prefix, and change PlayEnhancement and CrystalVoice to match.
          */
-        if (spec->use_alt_controls) {
+        if (ca0132_use_alt_controls(spec)) {
                 err = ca0132_alt_add_svm_enum(codec);
                 if (err < 0)
                         return err;
@@ -6448,7 +6478,7 @@ static int ca0132_build_controls(struct hda_codec *codec)
          * to select the new outputs and inputs, plus add the new mic boost
          * setting control.
          */
-        if (spec->use_alt_functions) {
+        if (ca0132_use_alt_functions(spec)) {
                 err = ca0132_alt_add_output_enum(codec);
                 if (err < 0)
                         return err;
@@ -6459,14 +6489,14 @@ static int ca0132_build_controls(struct hda_codec *codec)
                  * ZxR only has microphone input, there is no front panel
                  * header on the card, and aux-in is handled by the DBPro board.
                  */
-                if (spec->quirk != QUIRK_ZXR) {
+                if (ca0132_quirk(spec) != QUIRK_ZXR) {
                         err = ca0132_alt_add_input_enum(codec);
                         if (err < 0)
                                 return err;
                 }
         }
 
-        if (spec->quirk == QUIRK_AE5) {
+        if (ca0132_quirk(spec) == QUIRK_AE5) {
                 err = ae5_add_headphone_gain_enum(codec);
                 if (err < 0)
                         return err;
@@ -6475,7 +6505,7 @@ static int ca0132_build_controls(struct hda_codec *codec)
                         return err;
         }
 
-        if (spec->quirk == QUIRK_ZXR) {
+        if (ca0132_quirk(spec) == QUIRK_ZXR) {
                 err = zxr_add_headphone_gain_switch(codec);
                 if (err < 0)
                         return err;
@@ -6505,7 +6535,7 @@ static int ca0132_build_controls(struct hda_codec *codec)
                         return err;
         }
 
-        if (spec->use_alt_functions)
+        if (ca0132_use_alt_functions(spec))
                 ca0132_alt_add_chmap_ctls(codec);
 
         return 0;
@@ -6583,7 +6613,7 @@ static int ca0132_build_pcms(struct hda_codec *codec)
         info = snd_hda_codec_pcm_new(codec, "CA0132 Analog");
         if (!info)
                 return -ENOMEM;
-        if (spec->use_alt_functions) {
+        if (ca0132_use_alt_functions(spec)) {
                 info->own_chmap = true;
                 info->stream[SNDRV_PCM_STREAM_PLAYBACK].chmap
                         = ca0132_alt_chmaps;
@@ -6597,7 +6627,7 @@ static int ca0132_build_pcms(struct hda_codec *codec)
         info->stream[SNDRV_PCM_STREAM_CAPTURE].nid = spec->adcs[0];
 
         /* With the DSP enabled, desktops don't use this ADC. */
-        if (!spec->use_alt_functions) {
+        if (!ca0132_use_alt_functions(spec)) {
                 info = snd_hda_codec_pcm_new(codec, "CA0132 Analog Mic-In2");
                 if (!info)
                         return -ENOMEM;
@@ -6795,7 +6825,7 @@ static void ca0132_init_dmic(struct hda_codec *codec)
          * Bit   6: set to select Data2, clear for Data1
          * Bit   7: set to enable DMic, clear for AMic
          */
-        if (spec->quirk == QUIRK_ALIENWARE_M17XR4)
+        if (ca0132_quirk(spec) == QUIRK_ALIENWARE_M17XR4)
                 val = 0x33;
         else
                 val = 0x23;
@@ -6877,7 +6907,7 @@ static void ca0132_alt_init_analog_mics(struct hda_codec *codec)
         /* Mic 1 Setup */
         chipio_set_conn_rate(codec, MEM_CONNID_MICIN1, SR_96_000);
         chipio_set_conn_rate(codec, MEM_CONNID_MICOUT1, SR_96_000);
-        if (spec->quirk == QUIRK_R3DI) {
+        if (ca0132_quirk(spec) == QUIRK_R3DI) {
                 chipio_set_conn_rate(codec, 0x0F, SR_96_000);
                 tmp = FLOAT_ONE;
         } else
@@ -6887,7 +6917,7 @@ static void ca0132_alt_init_analog_mics(struct hda_codec *codec)
         /* Mic 2 setup (not present on desktop cards) */
         chipio_set_conn_rate(codec, MEM_CONNID_MICIN2, SR_96_000);
         chipio_set_conn_rate(codec, MEM_CONNID_MICOUT2, SR_96_000);
-        if (spec->quirk == QUIRK_R3DI)
+        if (ca0132_quirk(spec) == QUIRK_R3DI)
                 chipio_set_conn_rate(codec, 0x0F, SR_96_000);
         tmp = FLOAT_ZERO;
         dspio_set_uint_param(codec, 0x80, 0x01, tmp);
@@ -6949,7 +6979,7 @@ static void sbz_chipio_startup_data(struct hda_codec *codec)
         chipio_set_stream_channels(codec, 0x0C, 6);
         chipio_set_stream_control(codec, 0x0C, 1);
         /* No clue what these control */
-        if (spec->quirk == QUIRK_SBZ) {
+        if (ca0132_quirk(spec) == QUIRK_SBZ) {
                 chipio_write_no_mutex(codec, 0x190030, 0x0001e0c0);
                 chipio_write_no_mutex(codec, 0x190034, 0x0001e1c1);
                 chipio_write_no_mutex(codec, 0x190038, 0x0001e4c2);
@@ -6962,7 +6992,7 @@ static void sbz_chipio_startup_data(struct hda_codec *codec)
                 chipio_write_no_mutex(codec, 0x190054, 0x0001edc9);
                 chipio_write_no_mutex(codec, 0x190058, 0x0001eaca);
                 chipio_write_no_mutex(codec, 0x19005c, 0x0001ebcb);
-        } else if (spec->quirk == QUIRK_ZXR) {
+        } else if (ca0132_quirk(spec) == QUIRK_ZXR) {
                 chipio_write_no_mutex(codec, 0x190038, 0x000140c2);
                 chipio_write_no_mutex(codec, 0x19003c, 0x000141c3);
                 chipio_write_no_mutex(codec, 0x190040, 0x000150c4);
@@ -6992,7 +7022,7 @@ static void ca0132_alt_dsp_scp_startup(struct hda_codec *codec)
          * why this is, but multiple tests have confirmed it.
          */
         for (i = 0; i < 2; i++) {
-                switch (spec->quirk) {
+                switch (ca0132_quirk(spec)) {
                 case QUIRK_SBZ:
                 case QUIRK_AE5:
                         tmp = 0x00000003;
@@ -7021,6 +7051,8 @@ static void ca0132_alt_dsp_scp_startup(struct hda_codec *codec)
                         tmp = 0x00000000;
                         dspio_set_uint_param_no_source(codec, 0x80, 0x0C, tmp);
                         break;
+                default:
+                        break;
                 }
                 msleep(100);
         }
@@ -7043,7 +7075,7 @@ static void ca0132_alt_dsp_initial_mic_setup(struct hda_codec *codec)
         chipio_set_stream_control(codec, 0x03, 1);
         chipio_set_stream_control(codec, 0x04, 1);
 
-        switch (spec->quirk) {
+        switch (ca0132_quirk(spec)) {
         case QUIRK_SBZ:
                 chipio_write(codec, 0x18b098, 0x0000000c);
                 chipio_write(codec, 0x18b09C, 0x0000000c);
@@ -7052,6 +7084,8 @@ static void ca0132_alt_dsp_initial_mic_setup(struct hda_codec *codec)
                 chipio_write(codec, 0x18b098, 0x0000000c);
                 chipio_write(codec, 0x18b09c, 0x0000004c);
                 break;
+        default:
+                break;
         }
 }
 
@@ -7273,7 +7307,7 @@ static void r3d_setup_defaults(struct hda_codec *codec)
         /* Set speaker source? */
         dspio_set_uint_param(codec, 0x32, 0x00, tmp);
 
-        if (spec->quirk == QUIRK_R3DI)
+        if (ca0132_quirk(spec) == QUIRK_R3DI)
                 r3di_gpio_dsp_status_set(codec, R3DI_DSP_DOWNLOADED);
 
         /* Setup effect defaults */
@@ -7420,7 +7454,7 @@ static void ca0132_init_flags(struct hda_codec *codec)
 {
         struct ca0132_spec *spec = codec->spec;
 
-        if (spec->use_alt_functions) {
+        if (ca0132_use_alt_functions(spec)) {
                 chipio_set_control_flag(codec, CONTROL_FLAG_DSP_96KHZ, 1);
                 chipio_set_control_flag(codec, CONTROL_FLAG_DAC_96KHZ, 1);
                 chipio_set_control_flag(codec, CONTROL_FLAG_ADC_B_96KHZ, 1);
@@ -7453,7 +7487,7 @@ static void ca0132_init_params(struct hda_codec *codec)
 {
         struct ca0132_spec *spec = codec->spec;
 
-        if (spec->use_alt_functions) {
+        if (ca0132_use_alt_functions(spec)) {
                 chipio_set_conn_rate(codec, MEM_CONNID_WUH, SR_48_000);
                 chipio_set_conn_rate(codec, 0x0B, SR_48_000);
                 chipio_set_control_param(codec, CONTROL_PARAM_SPDIF1_SOURCE, 0);
@@ -7490,7 +7524,7 @@ static bool ca0132_download_dsp_images(struct hda_codec *codec)
          * can use the default firmware, but I'll leave the option in case
          * it needs it again.
          */
-        switch (spec->quirk) {
+        switch (ca0132_quirk(spec)) {
         case QUIRK_SBZ:
         case QUIRK_R3D:
         case QUIRK_AE5:
@@ -7564,7 +7598,7 @@ static void ca0132_download_dsp(struct hda_codec *codec)
         }
 
         /* For codecs using alt functions, this is already done earlier */
-        if (spec->dsp_state == DSP_DOWNLOADED && (!spec->use_alt_functions))
+        if (spec->dsp_state == DSP_DOWNLOADED && !ca0132_use_alt_functions(spec))
                 ca0132_set_dsp_msr(codec, true);
 }
 
@@ -7601,7 +7635,7 @@ static void amic_callback(struct hda_codec *codec, struct hda_jack_callback *cb)
 {
         struct ca0132_spec *spec = codec->spec;
 
-        if (spec->use_alt_functions)
+        if (ca0132_use_alt_functions(spec))
                 ca0132_alt_select_in(codec);
         else
                 ca0132_select_mic(codec);
@@ -7616,7 +7650,7 @@ static void ca0132_init_unsol(struct hda_codec *codec)
         snd_hda_jack_detect_enable_callback(codec, UNSOL_TAG_DSP,
                                             ca0132_process_dsp_response);
         /* Front headphone jack detection */
-        if (spec->use_alt_functions)
+        if (ca0132_use_alt_functions(spec))
                 snd_hda_jack_detect_enable_callback(codec,
                         spec->unsol_tag_front_hp, hp_callback);
 }
@@ -7706,7 +7740,7 @@ static void ca0132_init_chip(struct hda_codec *codec)
         mutex_init(&spec->chipio_mutex);
 
         spec->cur_out_type = SPEAKER_OUT;
-        if (!spec->use_alt_functions)
+        if (!ca0132_use_alt_functions(spec))
                 spec->cur_mic_type = DIGITAL_MIC;
         else
                 spec->cur_mic_type = REAR_MIC;
@@ -7732,7 +7766,7 @@ static void ca0132_init_chip(struct hda_codec *codec)
          * Sets defaults for the effect slider controls, only for alternative
          * ca0132 codecs. Also sets x-bass crossover frequency to 80hz.
          */
-        if (spec->use_alt_controls) {
+        if (ca0132_use_alt_controls(spec)) {
                 spec->xbass_xover_freq = 8;
                 for (i = 0; i < EFFECT_LEVEL_SLIDERS; i++)
                         spec->fx_ctl_val[i] = effect_slider_defaults[i];
@@ -7747,7 +7781,7 @@ static void ca0132_init_chip(struct hda_codec *codec)
          * the daughter board. So, there is no input enum control, and we need
          * to make sure that spec->in_enum_val is set properly.
          */
-        if (spec->quirk == QUIRK_ZXR)
+        if (ca0132_quirk(spec) == QUIRK_ZXR)
                 spec->in_enum_val = REAR_MIC;
 
 #ifdef ENABLE_TUNING_CONTROLS
@@ -8088,27 +8122,27 @@ static void ca0132_mmio_init(struct hda_codec *codec)
 {
         struct ca0132_spec *spec = codec->spec;
 
-        if (spec->quirk == QUIRK_AE5)
+        if (ca0132_quirk(spec) == QUIRK_AE5)
                 writel(0x00000001, spec->mem_base + 0x400);
         else
                 writel(0x00000000, spec->mem_base + 0x400);
 
-        if (spec->quirk == QUIRK_AE5)
+        if (ca0132_quirk(spec) == QUIRK_AE5)
                 writel(0x00000001, spec->mem_base + 0x408);
         else
                 writel(0x00000000, spec->mem_base + 0x408);
 
-        if (spec->quirk == QUIRK_AE5)
+        if (ca0132_quirk(spec) == QUIRK_AE5)
                 writel(0x00000001, spec->mem_base + 0x40c);
         else
                 writel(0x00000000, spec->mem_base + 0x40C);
 
-        if (spec->quirk == QUIRK_ZXR)
+        if (ca0132_quirk(spec) == QUIRK_ZXR)
                 writel(0x00880640, spec->mem_base + 0x01C);
         else
                 writel(0x00880680, spec->mem_base + 0x01C);
 
-        if (spec->quirk == QUIRK_AE5)
+        if (ca0132_quirk(spec) == QUIRK_AE5)
                 writel(0x00000080, spec->mem_base + 0xC0C);
         else
                 writel(0x00000083, spec->mem_base + 0xC0C);
@@ -8116,7 +8150,7 @@ static void ca0132_mmio_init(struct hda_codec *codec)
         writel(0x00000030, spec->mem_base + 0xC00);
         writel(0x00000000, spec->mem_base + 0xC04);
 
-        if (spec->quirk == QUIRK_AE5)
+        if (ca0132_quirk(spec) == QUIRK_AE5)
                 writel(0x00000000, spec->mem_base + 0xC0C);
         else
                 writel(0x00000003, spec->mem_base + 0xC0C);
@@ -8125,7 +8159,7 @@ static void ca0132_mmio_init(struct hda_codec *codec)
         writel(0x00000003, spec->mem_base + 0xC0C);
         writel(0x00000003, spec->mem_base + 0xC0C);
 
-        if (spec->quirk == QUIRK_AE5)
+        if (ca0132_quirk(spec) == QUIRK_AE5)
                 writel(0x00000001, spec->mem_base + 0xC08);
         else
                 writel(0x000000C1, spec->mem_base + 0xC08);
@@ -8136,7 +8170,7 @@ static void ca0132_mmio_init(struct hda_codec *codec)
         writel(0x000000C1, spec->mem_base + 0xC08);
         writel(0x00000080, spec->mem_base + 0xC04);
 
-        if (spec->quirk == QUIRK_AE5) {
+        if (ca0132_quirk(spec) == QUIRK_AE5) {
                 writel(0x00000000, spec->mem_base + 0x42c);
                 writel(0x00000000, spec->mem_base + 0x46c);
                 writel(0x00000000, spec->mem_base + 0x4ac);
@@ -8211,7 +8245,7 @@ static void ca0132_alt_init(struct hda_codec *codec)
 
         ca0132_alt_vol_setup(codec);
 
-        switch (spec->quirk) {
+        switch (ca0132_quirk(spec)) {
         case QUIRK_SBZ:
                 codec_dbg(codec, "SBZ alt_init");
                 ca0132_gpio_init(codec);
@@ -8248,6 +8282,8 @@ static void ca0132_alt_init(struct hda_codec *codec)
                 snd_hda_sequence_write(codec, spec->chip_init_verbs);
                 snd_hda_sequence_write(codec, spec->desktop_init_verbs);
                 break;
+        default:
+                break;
         }
 }
 
@@ -8274,7 +8310,7 @@ static int ca0132_init(struct hda_codec *codec)
                         spec->dsp_reload = true;
                         spec->dsp_state = DSP_DOWNLOAD_INIT;
                 } else {
-                        if (spec->quirk == QUIRK_SBZ)
+                        if (ca0132_quirk(spec) == QUIRK_SBZ)
                                 sbz_dsp_startup_check(codec);
                         return 0;
                 }
@@ -8284,12 +8320,12 @@ static int ca0132_init(struct hda_codec *codec)
                 spec->dsp_state = DSP_DOWNLOAD_INIT;
         spec->curr_chip_addx = INVALID_CHIP_ADDRESS;
 
-        if (spec->use_pci_mmio)
+        if (ca0132_use_pci_mmio(spec))
                 ca0132_mmio_init(codec);
 
         snd_hda_power_up_pm(codec);
 
-        if (spec->quirk == QUIRK_AE5)
+        if (ca0132_quirk(spec) == QUIRK_AE5)
                 ae5_register_set(codec);
 
         ca0132_init_unsol(codec);
@@ -8298,14 +8334,14 @@ static int ca0132_init(struct hda_codec *codec)
 
         snd_hda_sequence_write(codec, spec->base_init_verbs);
 
-        if (spec->use_alt_functions)
+        if (ca0132_use_alt_functions(spec))
                 ca0132_alt_init(codec);
 
         ca0132_download_dsp(codec);
 
         ca0132_refresh_widget_caps(codec);
 
-        switch (spec->quirk) {
+        switch (ca0132_quirk(spec)) {
         case QUIRK_R3DI:
         case QUIRK_R3D:
                 r3d_setup_defaults(codec);
@@ -8334,7 +8370,7 @@ static int ca0132_init(struct hda_codec *codec)
 
         init_input(codec, cfg->dig_in_pin, spec->dig_in);
 
-        if (!spec->use_alt_functions) {
+        if (!ca0132_use_alt_functions(spec)) {
                 snd_hda_sequence_write(codec, spec->chip_init_verbs);
                 snd_hda_codec_write(codec, WIDGET_CHIP_CTRL, 0,
                             VENDOR_CHIPIO_PARAM_EX_ID_SET, 0x0D);
@@ -8342,11 +8378,11 @@ static int ca0132_init(struct hda_codec *codec)
                             VENDOR_CHIPIO_PARAM_EX_VALUE_SET, 0x20);
         }
 
-        if (spec->quirk == QUIRK_SBZ)
+        if (ca0132_quirk(spec) == QUIRK_SBZ)
                 ca0132_gpio_setup(codec);
 
         snd_hda_sequence_write(codec, spec->spec_init_verbs);
-        if (spec->use_alt_functions) {
+        if (ca0132_use_alt_functions(spec)) {
                 ca0132_alt_select_out(codec);
                 ca0132_alt_select_in(codec);
         } else {
@@ -8391,7 +8427,7 @@ static void ca0132_free(struct hda_codec *codec)
 
         cancel_delayed_work_sync(&spec->unsol_hp_work);
         snd_hda_power_up(codec);
-        switch (spec->quirk) {
+        switch (ca0132_quirk(spec)) {
         case QUIRK_SBZ:
                 sbz_exit_chip(codec);
                 break;
@@ -8407,6 +8443,8 @@ static void ca0132_free(struct hda_codec *codec)
         case QUIRK_R3DI:
                 r3di_gpio_shutdown(codec);
                 break;
+        default:
+                break;
         }
 
         snd_hda_sequence_write(codec, spec->base_exit_verbs);
@@ -8461,12 +8499,12 @@ static void ca0132_config(struct hda_codec *codec)
         spec->multiout.dac_nids = spec->dacs;
         spec->multiout.num_dacs = 3;
 
-        if (!spec->use_alt_functions)
+        if (!ca0132_use_alt_functions(spec))
                 spec->multiout.max_channels = 2;
         else
                 spec->multiout.max_channels = 6;
 
-        switch (spec->quirk) {
+        switch (ca0132_quirk(spec)) {
         case QUIRK_ALIENWARE:
                 codec_dbg(codec, "%s: QUIRK_ALIENWARE applied.\n", __func__);
                 snd_hda_apply_pincfgs(codec, alienware_pincfgs);
@@ -8491,9 +8529,11 @@ static void ca0132_config(struct hda_codec *codec)
                 codec_dbg(codec, "%s: QUIRK_AE5 applied.\n", __func__);
                 snd_hda_apply_pincfgs(codec, ae5_pincfgs);
                 break;
+        default:
+                break;
         }
 
-        switch (spec->quirk) {
+        switch (ca0132_quirk(spec)) {
         case QUIRK_ALIENWARE:
                 spec->num_outputs = 2;
                 spec->out_pins[0] = 0x0b; /* speaker out */
@@ -8654,7 +8694,7 @@ static int ca0132_prepare_verbs(struct hda_codec *codec)
          * Since desktop cards use pci_mmio, this can be used to determine
          * whether or not to use these verbs instead of a separate bool.
          */
-        if (spec->use_pci_mmio)
+        if (ca0132_use_pci_mmio(spec))
                 spec->desktop_init_verbs = ca0132_init_verbs1;
         spec->spec_init_verbs = kcalloc(NUM_SPEC_VERBS,
                                         sizeof(struct hda_verb),
@@ -8729,11 +8769,10 @@ static int patch_ca0132(struct hda_codec *codec)
                 spec->quirk = quirk->value;
         else
                 spec->quirk = QUIRK_NONE;
-
-        if (spec->quirk == QUIRK_SBZ)
+        if (ca0132_quirk(spec) == QUIRK_SBZ)
                 sbz_detect_quirk(codec);
 
-        if (spec->quirk == QUIRK_ZXR_DBPRO)
+        if (ca0132_quirk(spec) == QUIRK_ZXR_DBPRO)
                 codec->patch_ops = dbpro_patch_ops;
         else
                 codec->patch_ops = ca0132_patch_ops;
@@ -8746,7 +8785,7 @@ static int patch_ca0132(struct hda_codec *codec)
         spec->num_mixers = 1;
 
         /* Set which mixers each quirk uses. */
-        switch (spec->quirk) {
+        switch (ca0132_quirk(spec)) {
         case QUIRK_SBZ:
                 spec->mixers[0] = desktop_mixer;
                 snd_hda_codec_set_name(codec, "Sound Blaster Z");
@@ -8775,7 +8814,7 @@ static int patch_ca0132(struct hda_codec *codec)
         }
 
         /* Setup whether or not to use alt functions/controls/pci_mmio */
-        switch (spec->quirk) {
+        switch (ca0132_quirk(spec)) {
         case QUIRK_SBZ:
         case QUIRK_R3D:
         case QUIRK_AE5:
@@ -8796,6 +8835,7 @@ static int patch_ca0132(struct hda_codec *codec)
                 break;
         }
 
+#ifdef CONFIG_PCI
         if (spec->use_pci_mmio) {
                 spec->mem_base = pci_iomap(codec->bus->pci, 2, 0xC20);
                 if (spec->mem_base == NULL) {
@@ -8803,6 +8843,7 @@ static int patch_ca0132(struct hda_codec *codec)
                         spec->quirk = QUIRK_NONE;
                 }
         }
+#endif
 
         spec->base_init_verbs = ca0132_base_init_verbs;
         spec->base_exit_verbs = ca0132_base_exit_verbs;
diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c
index 8a945ece9869..3d0f09108c98 100644
--- a/sound/usb/quirks.c
+++ b/sound/usb/quirks.c
@@ -19,6 +19,7 @@
 #include <linux/usb.h>
 #include <linux/usb/audio.h>
 #include <linux/usb/midi.h>
+#include <linux/bits.h>
 
 #include <sound/control.h>
 #include <sound/core.h>
@@ -668,15 +669,133 @@ static int snd_usb_cm106_boot_quirk(struct usb_device *dev)
 }
 
 /*
- * C-Media CM6206 is based on CM106 with two additional
- * registers that are not documented in the data sheet.
- * Values here are chosen based on sniffing USB traffic
- * under Windows.
+ * CM6206 registers from the CM6206 datasheet rev 2.1
  */
+#define CM6206_REG0_DMA_MASTER BIT(15)
+#define CM6206_REG0_SPDIFO_RATE_48K (2 << 12)
+#define CM6206_REG0_SPDIFO_RATE_96K (7 << 12)
+/* Bit 4 thru 11 is the S/PDIF category code */
+#define CM6206_REG0_SPDIFO_CAT_CODE_GENERAL (0 << 4)
+#define CM6206_REG0_SPDIFO_EMPHASIS_CD BIT(3)
+#define CM6206_REG0_SPDIFO_COPYRIGHT_NA BIT(2)
+#define CM6206_REG0_SPDIFO_NON_AUDIO BIT(1)
+#define CM6206_REG0_SPDIFO_PRO_FORMAT BIT(0)
+
+#define CM6206_REG1_TEST_SEL_CLK BIT(14)
+#define CM6206_REG1_PLLBIN_EN BIT(13)
+#define CM6206_REG1_SOFT_MUTE_EN BIT(12)
+#define CM6206_REG1_GPIO4_OUT BIT(11)
+#define CM6206_REG1_GPIO4_OE BIT(10)
+#define CM6206_REG1_GPIO3_OUT BIT(9)
+#define CM6206_REG1_GPIO3_OE BIT(8)
+#define CM6206_REG1_GPIO2_OUT BIT(7)
+#define CM6206_REG1_GPIO2_OE BIT(6)
+#define CM6206_REG1_GPIO1_OUT BIT(5)
+#define CM6206_REG1_GPIO1_OE BIT(4)
+#define CM6206_REG1_SPDIFO_INVALID BIT(3)
+#define CM6206_REG1_SPDIF_LOOP_EN BIT(2)
+#define CM6206_REG1_SPDIFO_DIS BIT(1)
+#define CM6206_REG1_SPDIFI_MIX BIT(0)
+
+#define CM6206_REG2_DRIVER_ON BIT(15)
+#define CM6206_REG2_HEADP_SEL_SIDE_CHANNELS (0 << 13)
+#define CM6206_REG2_HEADP_SEL_SURROUND_CHANNELS (1 << 13)
+#define CM6206_REG2_HEADP_SEL_CENTER_SUBW (2 << 13)
+#define CM6206_REG2_HEADP_SEL_FRONT_CHANNELS (3 << 13)
+#define CM6206_REG2_MUTE_HEADPHONE_RIGHT BIT(12)
+#define CM6206_REG2_MUTE_HEADPHONE_LEFT BIT(11)
+#define CM6206_REG2_MUTE_REAR_SURROUND_RIGHT BIT(10)
+#define CM6206_REG2_MUTE_REAR_SURROUND_LEFT BIT(9)
+#define CM6206_REG2_MUTE_SIDE_SURROUND_RIGHT BIT(8)
+#define CM6206_REG2_MUTE_SIDE_SURROUND_LEFT BIT(7)
+#define CM6206_REG2_MUTE_SUBWOOFER BIT(6)
+#define CM6206_REG2_MUTE_CENTER BIT(5)
+#define CM6206_REG2_MUTE_RIGHT_FRONT BIT(3)
+#define CM6206_REG2_MUTE_LEFT_FRONT BIT(3)
+#define CM6206_REG2_EN_BTL BIT(2)
+#define CM6206_REG2_MCUCLKSEL_1_5_MHZ (0)
+#define CM6206_REG2_MCUCLKSEL_3_MHZ (1)
+#define CM6206_REG2_MCUCLKSEL_6_MHZ (2)
+#define CM6206_REG2_MCUCLKSEL_12_MHZ (3)
+
+/* Bit 11..13 sets the sensitivity to FLY tuner volume control VP/VD signal */
+#define CM6206_REG3_FLYSPEED_DEFAULT (2 << 11)
+#define CM6206_REG3_VRAP25EN BIT(10)
+#define CM6206_REG3_MSEL1 BIT(9)
+#define CM6206_REG3_SPDIFI_RATE_44_1K BIT(0 << 7)
+#define CM6206_REG3_SPDIFI_RATE_48K BIT(2 << 7)
+#define CM6206_REG3_SPDIFI_RATE_32K BIT(3 << 7)
+#define CM6206_REG3_PINSEL BIT(6)
+#define CM6206_REG3_FOE BIT(5)
+#define CM6206_REG3_ROE BIT(4)
+#define CM6206_REG3_CBOE BIT(3)
+#define CM6206_REG3_LOSE BIT(2)
+#define CM6206_REG3_HPOE BIT(1)
+#define CM6206_REG3_SPDIFI_CANREC BIT(0)
+
+#define CM6206_REG5_DA_RSTN BIT(13)
+#define CM6206_REG5_AD_RSTN BIT(12)
+#define CM6206_REG5_SPDIFO_AD2SPDO BIT(12)
+#define CM6206_REG5_SPDIFO_SEL_FRONT (0 << 9)
+#define CM6206_REG5_SPDIFO_SEL_SIDE_SUR (1 << 9)
+#define CM6206_REG5_SPDIFO_SEL_CEN_LFE (2 << 9)
+#define CM6206_REG5_SPDIFO_SEL_REAR_SUR (3 << 9)
+#define CM6206_REG5_CODECM BIT(8)
+#define CM6206_REG5_EN_HPF BIT(7)
+#define CM6206_REG5_T_SEL_DSDA4 BIT(6)
+#define CM6206_REG5_T_SEL_DSDA3 BIT(5)
+#define CM6206_REG5_T_SEL_DSDA2 BIT(4)
+#define CM6206_REG5_T_SEL_DSDA1 BIT(3)
+#define CM6206_REG5_T_SEL_DSDAD_NORMAL 0
+#define CM6206_REG5_T_SEL_DSDAD_FRONT 4
+#define CM6206_REG5_T_SEL_DSDAD_S_SURROUND 5
+#define CM6206_REG5_T_SEL_DSDAD_CEN_LFE 6
+#define CM6206_REG5_T_SEL_DSDAD_R_SURROUND 7
+
 static int snd_usb_cm6206_boot_quirk(struct usb_device *dev)
 {
         int err  = 0, reg;
-        int val[] = {0x2004, 0x3000, 0xf800, 0x143f, 0x0000, 0x3000};
+        int val[] = {
+                /*
+                 * Values here are chosen based on sniffing USB traffic
+                 * under Windows.
+                 *
+                 * REG0: DAC is master, sample rate 48kHz, no copyright
+                 */
+                CM6206_REG0_SPDIFO_RATE_48K |
+                CM6206_REG0_SPDIFO_COPYRIGHT_NA,
+                /*
+                 * REG1: PLL binary search enable, soft mute enable.
+                 */
+                CM6206_REG1_PLLBIN_EN |
+                CM6206_REG1_SOFT_MUTE_EN |
+                /*
+                 * REG2: enable output drivers,
+                 * select front channels to the headphone output,
+                 * then mute the headphone channels, run the MCU
+                 * at 1.5 MHz.
+                 */
+                CM6206_REG2_DRIVER_ON |
+                CM6206_REG2_HEADP_SEL_FRONT_CHANNELS |
+                CM6206_REG2_MUTE_HEADPHONE_RIGHT |
+                CM6206_REG2_MUTE_HEADPHONE_LEFT,
+                /*
+                 * REG3: default flyspeed, set 2.5V mic bias
+                 * enable all line out ports and enable SPDIF
+                 */
+                CM6206_REG3_FLYSPEED_DEFAULT |
+                CM6206_REG3_VRAP25EN |
+                CM6206_REG3_FOE |
+                CM6206_REG3_ROE |
+                CM6206_REG3_CBOE |
+                CM6206_REG3_LOSE |
+                CM6206_REG3_HPOE |
+                CM6206_REG3_SPDIFI_CANREC,
+                /* REG4 is just a bunch of GPIO lines */
+                0x0000,
+                /* REG5: de-assert AD/DA reset signals */
+                CM6206_REG5_DA_RSTN |
+                CM6206_REG5_AD_RSTN };
 
         for (reg = 0; reg < ARRAY_SIZE(val); reg++) {
                 err = snd_usb_cm106_write_int_reg(dev, reg, val[reg]);