Merge branch 'for-linus' of git://git.alsa-project.org/alsa-kernel

* 'for-linus' of git://git.alsa-project.org/alsa-kernel: (258 commits)
  ALSA: hda: VREF powerdown for headphones
  ALSA: hda: STAC_HP_M4
  ALSA: ASoC: Check for machine type in GTA01 machine driver
  ALSA: mtpav - Fix race in probe
  ALSA: usb-audio: dynamic detection of MIDI interfaces in uaxx-quirk
  ALSA: Add a note on dependency of RTC stuff
  ALSA: ASoC: add new param mux to dapm_mux_update_power
  ALSA: Increase components array size
  ALSA: ASoC: Correct inverted Mic PGA Switch control in wm8510 driver
  ALSA: hda: comment typo fix
  ALSA: hda: comment typo fix
  ALSA: hda - Fix PCI SSID for ASROCK K18N78FullHD-hSLI
  ALSA: snd-usb-audio: support for Edirol UA-4FX device
  ALSA: usb - Fix possible Oops at USB-MIDI disconnection
  ALSA: hda - Fix another ALC889A (rev 0x100101)
  ALSA: hda: add more board-specific information for Realtek ALC662 rev1
  ALSA: Correct Vladimir Barinov's e-mail address
  ALSA: cs46xx: Add PCI IDs for TerraTec and Hercules cards
  ALSA: hda: SPDIF stream muting support
  ALSA: hda: appletv support
  ...

1 files changed, 44 insertions, 48 deletions

diff --git a/sound/pci/oxygen/oxygen.c b/sound/pci/oxygen/oxygen.c
index c5829d30ef86..b60f6212745a 100644
--- a/sound/pci/oxygen/oxygen.c
+++ b/sound/pci/oxygen/oxygen.c
@@ -58,17 +58,22 @@ MODULE_PARM_DESC(id, "ID string");
 module_param_array(enable, bool, NULL, 0444);
 MODULE_PARM_DESC(enable, "enable card");
 
+enum {
+        MODEL_CMEDIA_REF,       /* C-Media's reference design */
+        MODEL_MERIDIAN,         /* AuzenTech X-Meridian */
+};
+
 static struct pci_device_id oxygen_ids[] __devinitdata = {
-        { OXYGEN_PCI_SUBID(0x10b0, 0x0216) },
-        { OXYGEN_PCI_SUBID(0x10b0, 0x0218) },
-        { OXYGEN_PCI_SUBID(0x10b0, 0x0219) },
-        { OXYGEN_PCI_SUBID(0x13f6, 0x0001) },
-        { OXYGEN_PCI_SUBID(0x13f6, 0x0010) },
-        { OXYGEN_PCI_SUBID(0x13f6, 0x8788) },
-        { OXYGEN_PCI_SUBID(0x147a, 0xa017) },
-        { OXYGEN_PCI_SUBID(0x1a58, 0x0910) },
-        { OXYGEN_PCI_SUBID(0x415a, 0x5431), .driver_data = 1 },
-        { OXYGEN_PCI_SUBID(0x7284, 0x9761) },
+        { OXYGEN_PCI_SUBID(0x10b0, 0x0216), .driver_data = MODEL_CMEDIA_REF },
+        { OXYGEN_PCI_SUBID(0x10b0, 0x0218), .driver_data = MODEL_CMEDIA_REF },
+        { OXYGEN_PCI_SUBID(0x10b0, 0x0219), .driver_data = MODEL_CMEDIA_REF },
+        { OXYGEN_PCI_SUBID(0x13f6, 0x0001), .driver_data = MODEL_CMEDIA_REF },
+        { OXYGEN_PCI_SUBID(0x13f6, 0x0010), .driver_data = MODEL_CMEDIA_REF },
+        { OXYGEN_PCI_SUBID(0x13f6, 0x8788), .driver_data = MODEL_CMEDIA_REF },
+        { OXYGEN_PCI_SUBID(0x147a, 0xa017), .driver_data = MODEL_CMEDIA_REF },
+        { OXYGEN_PCI_SUBID(0x1a58, 0x0910), .driver_data = MODEL_CMEDIA_REF },
+        { OXYGEN_PCI_SUBID(0x415a, 0x5431), .driver_data = MODEL_MERIDIAN },
+        { OXYGEN_PCI_SUBID(0x7284, 0x9761), .driver_data = MODEL_CMEDIA_REF },
         { }
 };
 MODULE_DEVICE_TABLE(pci, oxygen_ids);
@@ -199,6 +204,11 @@ static void generic_resume(struct oxygen *chip)
         wm8785_registers_init(chip);
 }
 
+static void meridian_resume(struct oxygen *chip)
+{
+        ak4396_registers_init(chip);
+}
+
 static void set_ak4396_params(struct oxygen *chip,
                               struct snd_pcm_hw_params *params)
 {
@@ -281,11 +291,28 @@ static void set_ak5385_params(struct oxygen *chip,
 
 static const DECLARE_TLV_DB_LINEAR(ak4396_db_scale, TLV_DB_GAIN_MUTE, 0);
 
+static int generic_probe(struct oxygen *chip, unsigned long driver_data)
+{
+        if (driver_data == MODEL_MERIDIAN) {
+                chip->model.init = meridian_init;
+                chip->model.resume = meridian_resume;
+                chip->model.set_adc_params = set_ak5385_params;
+                chip->model.device_config = PLAYBACK_0_TO_I2S |
+                                            PLAYBACK_1_TO_SPDIF |
+                                            CAPTURE_0_FROM_I2S_2 |
+                                            CAPTURE_1_FROM_SPDIF;
+                chip->model.misc_flags = OXYGEN_MISC_MIDI;
+                chip->model.device_config |= MIDI_OUTPUT | MIDI_INPUT;
+        }
+        return 0;
+}
+
 static const struct oxygen_model model_generic = {
         .shortname = "C-Media CMI8788",
         .longname = "C-Media Oxygen HD Audio",
         .chip = "CMI8788",
         .owner = THIS_MODULE,
+        .probe = generic_probe,
         .init = generic_init,
         .cleanup = generic_cleanup,
         .resume = generic_resume,
@@ -295,44 +322,15 @@ static const struct oxygen_model model_generic = {
         .update_dac_mute = update_ak4396_mute,
         .dac_tlv = ak4396_db_scale,
         .model_data_size = sizeof(struct generic_data),
-        .pcm_dev_cfg = PLAYBACK_0_TO_I2S |
-                       PLAYBACK_1_TO_SPDIF |
-                       PLAYBACK_2_TO_AC97_1 |
-                       CAPTURE_0_FROM_I2S_1 |
-                       CAPTURE_1_FROM_SPDIF |
-                       CAPTURE_2_FROM_AC97_1,
-        .dac_channels = 8,
-        .dac_volume_min = 0,
-        .dac_volume_max = 255,
-        .function_flags = OXYGEN_FUNCTION_SPI |
-                          OXYGEN_FUNCTION_ENABLE_SPI_4_5,
-        .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
-        .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
-};
-static const struct oxygen_model model_meridian = {
-        .shortname = "C-Media CMI8788",
-        .longname = "C-Media Oxygen HD Audio",
-        .chip = "CMI8788",
-        .owner = THIS_MODULE,
-        .init = meridian_init,
-        .cleanup = generic_cleanup,
-        .resume = ak4396_registers_init,
-        .set_dac_params = set_ak4396_params,
-        .set_adc_params = set_ak5385_params,
-        .update_dac_volume = update_ak4396_volume,
-        .update_dac_mute = update_ak4396_mute,
-        .dac_tlv = ak4396_db_scale,
-        .model_data_size = sizeof(struct generic_data),
-        .pcm_dev_cfg = PLAYBACK_0_TO_I2S |
-                       PLAYBACK_1_TO_SPDIF |
-                       PLAYBACK_2_TO_AC97_1 |
-                       CAPTURE_0_FROM_I2S_2 |
-                       CAPTURE_1_FROM_SPDIF |
-                       CAPTURE_2_FROM_AC97_1,
+        .device_config = PLAYBACK_0_TO_I2S |
+                         PLAYBACK_1_TO_SPDIF |
+                         PLAYBACK_2_TO_AC97_1 |
+                         CAPTURE_0_FROM_I2S_1 |
+                         CAPTURE_1_FROM_SPDIF |
+                         CAPTURE_2_FROM_AC97_1,
         .dac_channels = 8,
         .dac_volume_min = 0,
         .dac_volume_max = 255,
-        .misc_flags = OXYGEN_MISC_MIDI,
         .function_flags = OXYGEN_FUNCTION_SPI |
                           OXYGEN_FUNCTION_ENABLE_SPI_4_5,
         .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
@@ -343,7 +341,6 @@ static int __devinit generic_oxygen_probe(struct pci_dev *pci,
                                           const struct pci_device_id *pci_id)
 {
         static int dev;
-        int is_meridian;
         int err;
 
         if (dev >= SNDRV_CARDS)
@@ -352,9 +349,8 @@ static int __devinit generic_oxygen_probe(struct pci_dev *pci,
                 ++dev;
                 return -ENOENT;
         }
-        is_meridian = pci_id->driver_data;
         err = oxygen_pci_probe(pci, index[dev], id[dev],
-                               is_meridian ? &model_meridian : &model_generic);
+                               &model_generic, pci_id->driver_data);
         if (err >= 0)
                 ++dev;
         return err;