]> err.no Git - linux-2.6/blobdiff - sound/pci/oxygen/oxygen.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
[linux-2.6] / sound / pci / oxygen / oxygen.c
index 9a9941bb0460c08575385c9f1aa8d4a33cf5ac17..7c8ae31eb4685b857488e931a55efcd8f4e1826e 100644 (file)
 #include <sound/tlv.h>
 #include "oxygen.h"
 #include "ak4396.h"
-#include "cm9780.h"
+#include "wm8785.h"
 
 MODULE_AUTHOR("Clemens Ladisch <clemens@ladisch.de>");
 MODULE_DESCRIPTION("C-Media CMI8788 driver");
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");
 MODULE_SUPPORTED_DEVICE("{{C-Media,CMI8788}}");
 
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;
@@ -78,51 +78,9 @@ MODULE_DEVICE_TABLE(pci, oxygen_ids);
 #define GPIO_AK5385_DFS_DOUBLE 0x0001
 #define GPIO_AK5385_DFS_QUAD   0x0002
 
-#define GPIO_LINE_MUTE         CM9780_GPO0
-
-#define WM8785_R0      0
-#define WM8785_R1      1
-#define WM8785_R2      2
-#define WM8785_R7      7
-
-/* R0 */
-#define WM8785_MCR_MASK                0x007
-#define WM8785_MCR_SLAVE       0x000
-#define WM8785_MCR_MASTER_128  0x001
-#define WM8785_MCR_MASTER_192  0x002
-#define WM8785_MCR_MASTER_256  0x003
-#define WM8785_MCR_MASTER_384  0x004
-#define WM8785_MCR_MASTER_512  0x005
-#define WM8785_MCR_MASTER_768  0x006
-#define WM8785_OSR_MASK                0x018
-#define WM8785_OSR_SINGLE      0x000
-#define WM8785_OSR_DOUBLE      0x008
-#define WM8785_OSR_QUAD                0x010
-#define WM8785_FORMAT_MASK     0x060
-#define WM8785_FORMAT_RJUST    0x000
-#define WM8785_FORMAT_LJUST    0x020
-#define WM8785_FORMAT_I2S      0x040
-#define WM8785_FORMAT_DSP      0x060
-/* R1 */
-#define WM8785_WL_MASK         0x003
-#define WM8785_WL_16           0x000
-#define WM8785_WL_20           0x001
-#define WM8785_WL_24           0x002
-#define WM8785_WL_32           0x003
-#define WM8785_LRP             0x004
-#define WM8785_BCLKINV         0x008
-#define WM8785_LRSWAP          0x010
-#define WM8785_DEVNO_MASK      0x0e0
-/* R2 */
-#define WM8785_HPFR            0x001
-#define WM8785_HPFL            0x002
-#define WM8785_SDODIS          0x004
-#define WM8785_PWRDNR          0x008
-#define WM8785_PWRDNL          0x010
-#define WM8785_TDM_MASK                0x1c0
-
 struct generic_data {
        u8 ak4396_ctl2;
+       u16 saved_wm8785_registers[2];
 };
 
 static void ak4396_write(struct oxygen *chip, unsigned int codec,
@@ -142,20 +100,35 @@ static void ak4396_write(struct oxygen *chip, unsigned int codec,
 
 static void wm8785_write(struct oxygen *chip, u8 reg, unsigned int value)
 {
+       struct generic_data *data = chip->model_data;
+
        oxygen_write_spi(chip, OXYGEN_SPI_TRIGGER |
                         OXYGEN_SPI_DATA_LENGTH_2 |
                         OXYGEN_SPI_CLOCK_160 |
                         (3 << OXYGEN_SPI_CODEC_SHIFT) |
                         OXYGEN_SPI_CEN_LATCH_CLOCK_LO,
                         (reg << 9) | value);
+       if (reg < ARRAY_SIZE(data->saved_wm8785_registers))
+               data->saved_wm8785_registers[reg] = value;
 }
 
-static void ak4396_init(struct oxygen *chip)
+static void update_ak4396_volume(struct oxygen *chip)
+{
+       unsigned int i;
+
+       for (i = 0; i < 4; ++i) {
+               ak4396_write(chip, i,
+                            AK4396_LCH_ATT, chip->dac_volume[i * 2]);
+               ak4396_write(chip, i,
+                            AK4396_RCH_ATT, chip->dac_volume[i * 2 + 1]);
+       }
+}
+
+static void ak4396_registers_init(struct oxygen *chip)
 {
        struct generic_data *data = chip->model_data;
        unsigned int i;
 
-       data->ak4396_ctl2 = AK4396_DEM_OFF | AK4396_DFS_NORMAL;
        for (i = 0; i < 4; ++i) {
                ak4396_write(chip, i,
                             AK4396_CONTROL_1, AK4396_DIF_24_MSB | AK4396_RSTN);
@@ -163,9 +136,16 @@ static void ak4396_init(struct oxygen *chip)
                             AK4396_CONTROL_2, data->ak4396_ctl2);
                ak4396_write(chip, i,
                             AK4396_CONTROL_3, AK4396_PCM);
-               ak4396_write(chip, i, AK4396_LCH_ATT, 0xff);
-               ak4396_write(chip, i, AK4396_RCH_ATT, 0xff);
        }
+       update_ak4396_volume(chip);
+}
+
+static void ak4396_init(struct oxygen *chip)
+{
+       struct generic_data *data = chip->model_data;
+
+       data->ak4396_ctl2 = AK4396_SMUTE | AK4396_DEM_OFF | AK4396_DFS_NORMAL;
+       ak4396_registers_init(chip);
        snd_component_add(chip->card, "AK4396");
 }
 
@@ -176,38 +156,48 @@ static void ak5385_init(struct oxygen *chip)
        snd_component_add(chip->card, "AK5385");
 }
 
-static void wm8785_init(struct oxygen *chip)
+static void wm8785_registers_init(struct oxygen *chip)
 {
+       struct generic_data *data = chip->model_data;
+
        wm8785_write(chip, WM8785_R7, 0);
-       wm8785_write(chip, WM8785_R0, WM8785_MCR_SLAVE |
-                    WM8785_OSR_SINGLE | WM8785_FORMAT_LJUST);
-       wm8785_write(chip, WM8785_R1, WM8785_WL_24);
-       snd_component_add(chip->card, "WM8785");
+       wm8785_write(chip, WM8785_R0, data->saved_wm8785_registers[0]);
+       wm8785_write(chip, WM8785_R1, data->saved_wm8785_registers[1]);
 }
 
-static void cmi9780_init(struct oxygen *chip)
+static void wm8785_init(struct oxygen *chip)
 {
-       oxygen_ac97_clear_bits(chip, 0, CM9780_GPIO_STATUS, GPIO_LINE_MUTE);
+       struct generic_data *data = chip->model_data;
+
+       data->saved_wm8785_registers[0] = WM8785_MCR_SLAVE |
+               WM8785_OSR_SINGLE | WM8785_FORMAT_LJUST;
+       data->saved_wm8785_registers[1] = WM8785_WL_24;
+       wm8785_registers_init(chip);
+       snd_component_add(chip->card, "WM8785");
 }
 
 static void generic_init(struct oxygen *chip)
 {
        ak4396_init(chip);
        wm8785_init(chip);
-       cmi9780_init(chip);
 }
 
 static void meridian_init(struct oxygen *chip)
 {
        ak4396_init(chip);
        ak5385_init(chip);
-       cmi9780_init(chip);
 }
 
 static void generic_cleanup(struct oxygen *chip)
 {
 }
 
+static void generic_resume(struct oxygen *chip)
+{
+       ak4396_registers_init(chip);
+       wm8785_registers_init(chip);
+}
+
 static void set_ak4396_params(struct oxygen *chip,
                              struct snd_pcm_hw_params *params)
 {
@@ -233,18 +223,6 @@ static void set_ak4396_params(struct oxygen *chip,
        }
 }
 
-static void update_ak4396_volume(struct oxygen *chip)
-{
-       unsigned int i;
-
-       for (i = 0; i < 4; ++i) {
-               ak4396_write(chip, i,
-                            AK4396_LCH_ATT, chip->dac_volume[i * 2]);
-               ak4396_write(chip, i,
-                            AK4396_RCH_ATT, chip->dac_volume[i * 2 + 1]);
-       }
-}
-
 static void update_ak4396_mute(struct oxygen *chip)
 {
        struct generic_data *data = chip->model_data;
@@ -297,59 +275,33 @@ static void set_ak5385_params(struct oxygen *chip,
                              value, GPIO_AK5385_DFS_MASK);
 }
 
-static void cmi9780_switch_hook(struct oxygen *chip, unsigned int codec,
-                               unsigned int reg, int mute)
-{
-       if (codec != 0)
-               return;
-       switch (reg) {
-       case AC97_LINE:
-               oxygen_write_ac97_masked(chip, 0, CM9780_GPIO_STATUS,
-                                        mute ? GPIO_LINE_MUTE : 0,
-                                        GPIO_LINE_MUTE);
-               break;
-       case AC97_MIC:
-       case AC97_CD:
-       case AC97_AUX:
-               if (!mute)
-                       oxygen_ac97_set_bits(chip, 0, CM9780_GPIO_STATUS,
-                                            GPIO_LINE_MUTE);
-               break;
-       }
-}
-
 static const DECLARE_TLV_DB_LINEAR(ak4396_db_scale, TLV_DB_GAIN_MUTE, 0);
 
-static int ak4396_control_filter(struct snd_kcontrol_new *template)
-{
-       if (!strcmp(template->name, "Master Playback Volume")) {
-               template->access |= SNDRV_CTL_ELEM_ACCESS_TLV_READ;
-               template->tlv.p = ak4396_db_scale;
-       }
-       return 0;
-}
-
 static const struct oxygen_model model_generic = {
        .shortname = "C-Media CMI8788",
        .longname = "C-Media Oxygen HD Audio",
        .chip = "CMI8788",
        .owner = THIS_MODULE,
        .init = generic_init,
-       .control_filter = ak4396_control_filter,
        .cleanup = generic_cleanup,
+       .resume = generic_resume,
        .set_dac_params = set_ak4396_params,
        .set_adc_params = set_wm8785_params,
        .update_dac_volume = update_ak4396_volume,
        .update_dac_mute = update_ak4396_mute,
-       .ac97_switch_hook = cmi9780_switch_hook,
+       .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,
-       .used_channels = OXYGEN_CHANNEL_A |
-                        OXYGEN_CHANNEL_C |
-                        OXYGEN_CHANNEL_SPDIF |
-                        OXYGEN_CHANNEL_MULTICH |
-                        OXYGEN_CHANNEL_AC97,
-       .function_flags = OXYGEN_FUNCTION_ENABLE_SPI_4_5,
+       .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,
 };
@@ -359,21 +311,26 @@ static const struct oxygen_model model_meridian = {
        .chip = "CMI8788",
        .owner = THIS_MODULE,
        .init = meridian_init,
-       .control_filter = ak4396_control_filter,
        .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,
-       .ac97_switch_hook = cmi9780_switch_hook,
+       .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,
        .dac_channels = 8,
-       .used_channels = OXYGEN_CHANNEL_B |
-                        OXYGEN_CHANNEL_C |
-                        OXYGEN_CHANNEL_SPDIF |
-                        OXYGEN_CHANNEL_MULTICH |
-                        OXYGEN_CHANNEL_AC97,
-       .function_flags = OXYGEN_FUNCTION_ENABLE_SPI_4_5,
+       .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,
        .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
 };
@@ -392,7 +349,7 @@ static int __devinit generic_oxygen_probe(struct pci_dev *pci,
                return -ENOENT;
        }
        is_meridian = pci_id->driver_data;
-       err = oxygen_pci_probe(pci, index[dev], id[dev], is_meridian,
+       err = oxygen_pci_probe(pci, index[dev], id[dev],
                               is_meridian ? &model_meridian : &model_generic);
        if (err >= 0)
                ++dev;
@@ -404,6 +361,10 @@ static struct pci_driver oxygen_driver = {
        .id_table = oxygen_ids,
        .probe = generic_oxygen_probe,
        .remove = __devexit_p(oxygen_pci_remove),
+#ifdef CONFIG_PM
+       .suspend = oxygen_pci_suspend,
+       .resume = oxygen_pci_resume,
+#endif
 };
 
 static int __init alsa_card_oxygen_init(void)