]> err.no Git - linux-2.6/blobdiff - sound/pci/oxygen/oxygen.c
Merge branch 'fb' into devel
[linux-2.6] / sound / pci / oxygen / oxygen.c
index b11341f01c1dd80a181eba492191c86570faeffa..63f185c1ed1ed899a0af6786d4092731a87f0c26 100644 (file)
@@ -28,7 +28,9 @@
  * GPIO 1 -> DFS1 of AK5385
  */
 
+#include <linux/mutex.h>
 #include <linux/pci.h>
+#include <sound/ac97_codec.h>
 #include <sound/control.h>
 #include <sound/core.h>
 #include <sound/initval.h>
@@ -36,6 +38,8 @@
 #include <sound/pcm_params.h>
 #include <sound/tlv.h>
 #include "oxygen.h"
+#include "ak4396.h"
+#include "wm8785.h"
 
 MODULE_AUTHOR("Clemens Ladisch <clemens@ladisch.de>");
 MODULE_DESCRIPTION("C-Media CMI8788 driver");
@@ -61,8 +65,6 @@ static struct pci_device_id oxygen_ids[] __devinitdata = {
        { OXYGEN_PCI_SUBID(0x13f6, 0x0010) },
        { OXYGEN_PCI_SUBID(0x13f6, 0x8788) },
        { OXYGEN_PCI_SUBID(0x147a, 0xa017) },
-       { OXYGEN_PCI_SUBID(0x14c3, 0x1710) },
-       { OXYGEN_PCI_SUBID(0x14c3, 0x1711) },
        { OXYGEN_PCI_SUBID(0x1a58, 0x0910) },
        { OXYGEN_PCI_SUBID(0x415a, 0x5431), .driver_data = 1 },
        { OXYGEN_PCI_SUBID(0x7284, 0x9761) },
@@ -70,30 +72,15 @@ static struct pci_device_id oxygen_ids[] __devinitdata = {
 };
 MODULE_DEVICE_TABLE(pci, oxygen_ids);
 
-#define AK4396_WRITE   0x2000
-
-/* register 0 */
-#define AK4396_RSTN            0x01
-#define AK4396_DIF_24_MSB      0x04
-/* register 1 */
-#define AK4396_SMUTE           0x01
-#define AK4396_DEM_OFF         0x02
-#define AK4396_DFS_MASK                0x18
-#define AK4396_DFS_NORMAL      0x00
-#define AK4396_DFS_DOUBLE      0x08
-#define AK4396_DFS_QUAD                0x10
-
-/* register 0 */
-#define WM8785_OSR_SINGLE      0x000
-#define WM8785_OSR_DOUBLE      0x008
-#define WM8785_OSR_QUAD                0x010
-#define WM8785_FORMAT_LJUST    0x020
-#define WM8785_FORMAT_I2S      0x040
-/* register 1 */
-#define WM8785_WL_16           0x000
-#define WM8785_WL_20           0x001
-#define WM8785_WL_24           0x002
-#define WM8785_WL_32           0x003
+
+#define GPIO_AK5385_DFS_MASK   0x0003
+#define GPIO_AK5385_DFS_NORMAL 0x0000
+#define GPIO_AK5385_DFS_DOUBLE 0x0001
+#define GPIO_AK5385_DFS_QUAD   0x0002
+
+struct generic_data {
+       u8 ak4396_ctl2;
+};
 
 static void ak4396_write(struct oxygen *chip, unsigned int codec,
                         u8 reg, u8 value)
@@ -122,31 +109,36 @@ static void wm8785_write(struct oxygen *chip, u8 reg, unsigned int value)
 
 static void ak4396_init(struct oxygen *chip)
 {
+       struct generic_data *data = chip->model_data;
        unsigned int i;
 
-       chip->ak4396_reg1 = AK4396_DEM_OFF | AK4396_DFS_NORMAL;
+       data->ak4396_ctl2 = AK4396_SMUTE | AK4396_DEM_OFF | AK4396_DFS_NORMAL;
        for (i = 0; i < 4; ++i) {
-               ak4396_write(chip, i, 0, AK4396_DIF_24_MSB | AK4396_RSTN);
-               ak4396_write(chip, i, 1, chip->ak4396_reg1);
-               ak4396_write(chip, i, 2, 0);
-               ak4396_write(chip, i, 3, 0xff);
-               ak4396_write(chip, i, 4, 0xff);
+               ak4396_write(chip, i,
+                            AK4396_CONTROL_1, AK4396_DIF_24_MSB | AK4396_RSTN);
+               ak4396_write(chip, i,
+                            AK4396_CONTROL_2, data->ak4396_ctl2);
+               ak4396_write(chip, i,
+                            AK4396_CONTROL_3, AK4396_PCM);
+               ak4396_write(chip, i, AK4396_LCH_ATT, 0);
+               ak4396_write(chip, i, AK4396_RCH_ATT, 0);
        }
        snd_component_add(chip->card, "AK4396");
 }
 
 static void ak5385_init(struct oxygen *chip)
 {
-       oxygen_set_bits16(chip, OXYGEN_GPIO_CONTROL, 0x0003);
-       oxygen_clear_bits16(chip, OXYGEN_GPIO_DATA, 0x0003);
+       oxygen_set_bits16(chip, OXYGEN_GPIO_CONTROL, GPIO_AK5385_DFS_MASK);
+       oxygen_clear_bits16(chip, OXYGEN_GPIO_DATA, GPIO_AK5385_DFS_MASK);
        snd_component_add(chip->card, "AK5385");
 }
 
 static void wm8785_init(struct oxygen *chip)
 {
-       wm8785_write(chip, 7, 0);
-       wm8785_write(chip, 0, WM8785_FORMAT_LJUST | WM8785_OSR_SINGLE);
-       wm8785_write(chip, 1, WM8785_WL_24);
+       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");
 }
 
@@ -166,36 +158,28 @@ static void generic_cleanup(struct oxygen *chip)
 {
 }
 
-static void generic_pcm_hardware_filter(unsigned int channel,
-                                       struct snd_pcm_hardware *hardware)
-{
-       if (channel == PCM_A) {
-               hardware->rates = SNDRV_PCM_RATE_44100 |
-                                 SNDRV_PCM_RATE_48000 |
-                                 SNDRV_PCM_RATE_96000 |
-                                 SNDRV_PCM_RATE_192000;
-               hardware->rate_min = 44100;
-       }
-}
-
 static void set_ak4396_params(struct oxygen *chip,
                              struct snd_pcm_hw_params *params)
 {
+       struct generic_data *data = chip->model_data;
        unsigned int i;
        u8 value;
 
-       value = chip->ak4396_reg1 & ~AK4396_DFS_MASK;
+       value = data->ak4396_ctl2 & ~AK4396_DFS_MASK;
        if (params_rate(params) <= 54000)
                value |= AK4396_DFS_NORMAL;
-       else if (params_rate(params) < 120000)
+       else if (params_rate(params) <= 108000)
                value |= AK4396_DFS_DOUBLE;
        else
                value |= AK4396_DFS_QUAD;
-       chip->ak4396_reg1 = value;
+       data->ak4396_ctl2 = value;
        for (i = 0; i < 4; ++i) {
-               ak4396_write(chip, i, 0, AK4396_DIF_24_MSB);
-               ak4396_write(chip, i, 1, value);
-               ak4396_write(chip, i, 0, AK4396_DIF_24_MSB | AK4396_RSTN);
+               ak4396_write(chip, i,
+                            AK4396_CONTROL_1, AK4396_DIF_24_MSB);
+               ak4396_write(chip, i,
+                            AK4396_CONTROL_2, value);
+               ak4396_write(chip, i,
+                            AK4396_CONTROL_1, AK4396_DIF_24_MSB | AK4396_RSTN);
        }
 }
 
@@ -204,21 +188,25 @@ static void update_ak4396_volume(struct oxygen *chip)
        unsigned int i;
 
        for (i = 0; i < 4; ++i) {
-               ak4396_write(chip, i, 3, chip->dac_volume[i * 2]);
-               ak4396_write(chip, i, 4, chip->dac_volume[i * 2 + 1]);
+               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;
        unsigned int i;
        u8 value;
 
-       value = chip->ak4396_reg1 & ~AK4396_SMUTE;
+       value = data->ak4396_ctl2 & ~AK4396_SMUTE;
        if (chip->dac_mute)
                value |= AK4396_SMUTE;
+       data->ak4396_ctl2 = value;
        for (i = 0; i < 4; ++i)
-               ak4396_write(chip, i, 1, value);
+               ak4396_write(chip, i, AK4396_CONTROL_2, value);
 }
 
 static void set_wm8785_params(struct oxygen *chip,
@@ -226,22 +214,22 @@ static void set_wm8785_params(struct oxygen *chip,
 {
        unsigned int value;
 
-       wm8785_write(chip, 7, 0);
+       wm8785_write(chip, WM8785_R7, 0);
 
-       value = WM8785_FORMAT_LJUST;
-       if (params_rate(params) == 96000)
+       value = WM8785_MCR_SLAVE | WM8785_FORMAT_LJUST;
+       if (params_rate(params) <= 48000)
+               value |= WM8785_OSR_SINGLE;
+       else if (params_rate(params) <= 96000)
                value |= WM8785_OSR_DOUBLE;
-       else if (params_rate(params) == 192000)
-               value |= WM8785_OSR_QUAD;
        else
-               value |= WM8785_OSR_SINGLE;
-       wm8785_write(chip, 0, value);
+               value |= WM8785_OSR_QUAD;
+       wm8785_write(chip, WM8785_R0, value);
 
        if (snd_pcm_format_width(params_format(params)) <= 16)
                value = WM8785_WL_16;
        else
                value = WM8785_WL_24;
-       wm8785_write(chip, 1, value);
+       wm8785_write(chip, WM8785_R1, value);
 }
 
 static void set_ak5385_params(struct oxygen *chip,
@@ -250,44 +238,41 @@ static void set_ak5385_params(struct oxygen *chip,
        unsigned int value;
 
        if (params_rate(params) <= 54000)
-               value = 0;
+               value = GPIO_AK5385_DFS_NORMAL;
        else if (params_rate(params) <= 108000)
-               value = 1;
+               value = GPIO_AK5385_DFS_DOUBLE;
        else
-               value = 2;
-       oxygen_write16_masked(chip, OXYGEN_GPIO_DATA, value, 0x0003);
+               value = GPIO_AK5385_DFS_QUAD;
+       oxygen_write16_masked(chip, OXYGEN_GPIO_DATA,
+                             value, GPIO_AK5385_DFS_MASK);
 }
 
 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,
-       .pcm_hardware_filter = generic_pcm_hardware_filter,
        .set_dac_params = set_ak4396_params,
        .set_adc_params = set_wm8785_params,
        .update_dac_volume = update_ak4396_volume,
        .update_dac_mute = update_ak4396_mute,
-       .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_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,
 };
@@ -297,18 +282,25 @@ static const struct oxygen_model model_meridian = {
        .chip = "CMI8788",
        .owner = THIS_MODULE,
        .init = meridian_init,
-       .control_filter = ak4396_control_filter,
        .cleanup = generic_cleanup,
        .set_dac_params = set_ak4396_params,
        .set_adc_params = set_ak5385_params,
        .update_dac_volume = update_ak4396_volume,
        .update_dac_mute = update_ak4396_mute,
-       .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_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,
+       .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,
 };
@@ -317,7 +309,7 @@ static int __devinit generic_oxygen_probe(struct pci_dev *pci,
                                          const struct pci_device_id *pci_id)
 {
        static int dev;
-       const struct oxygen_model *model;
+       int is_meridian;
        int err;
 
        if (dev >= SNDRV_CARDS)
@@ -326,8 +318,9 @@ static int __devinit generic_oxygen_probe(struct pci_dev *pci,
                ++dev;
                return -ENOENT;
        }
-       model = pci_id->driver_data ? &model_meridian : &model_generic;
-       err = oxygen_pci_probe(pci, index[dev], id[dev], 1, model);
+       is_meridian = pci_id->driver_data;
+       err = oxygen_pci_probe(pci, index[dev], id[dev],
+                              is_meridian ? &model_meridian : &model_generic);
        if (err >= 0)
                ++dev;
        return err;