Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/perex/alsa

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/perex/alsa: (299 commits)
  [ALSA] version 1.0.16rc2
  [ALSA] hda: fix Mic in as output
  [ALSA] emu10k1 - Another EMU0404 Board ID
  [ALSA] emu10k1 - Fix kthread handling at resume
  [ALSA] emu10k1: General cleanup, add new locks, fix alsa bug#3501, kernel bug#9304.
  [ALSA] emu10k1 - Use enum for emu_model types
  [ALSA] emu10k1 - Don't create emu1010 controls for non-emu boards
  [ALSA] emu10k1 - 1616(M) cardbus improvements
  [ALSA] snd:emu10k1: E-Mu updates. Fixes to firmware loading and support for 0404.
  [ALSA] emu10k1: Add comments regarding E-Mu ins and outs.
  [ALSA] oxygen: revert SPI clock frequency change for AK4396/WM8785
  [ALSA] es1938 - improve capture hw pointer reads
  [ALSA] HDA-Intel - Add support for Intel SCH
  [ALSA] hda: Add GPIO mute support to STAC9205
  [ALSA] hda-codec - Add Dell T3400 support
  [ALSA] hda-codec - Add model for HP DV9553EG laptop
  [ALSA] hda-codec - Control SPDIF as slave
  [ALSA] hda_intel: ALSA HD Audio patch for Intel ICH10 DeviceID's
  [ALSA] Fix Oops with PCM OSS sync
  [ALSA] hda-codec - Add speaker automute to ALC262 HP models
  ...

1 files changed, 385 insertions, 0 deletions

diff --git a/sound/pci/oxygen/oxygen.c b/sound/pci/oxygen/oxygen.c
new file mode 100644
index 000000000000..f31a0eb409b0
--- /dev/null
+++ b/sound/pci/oxygen/oxygen.c
@@ -0,0 +1,385 @@
+/*
+ * C-Media CMI8788 driver for C-Media's reference design and for the X-Meridian
+ *
+ * Copyright (c) Clemens Ladisch <clemens@ladisch.de>
+ *
+ *
+ *  This driver is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License, version 2.
+ *
+ *  This driver is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this driver; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ */
+
+/*
+ * SPI 0 -> 1st AK4396 (front)
+ * SPI 1 -> 2nd AK4396 (surround)
+ * SPI 2 -> 3rd AK4396 (center/LFE)
+ * SPI 3 -> WM8785
+ * SPI 4 -> 4th AK4396 (back)
+ *
+ * GPIO 0 -> DFS0 of AK5385
+ * GPIO 1 -> DFS1 of AK5385
+ */
+
+#include <linux/pci.h>
+#include <sound/control.h>
+#include <sound/core.h>
+#include <sound/initval.h>
+#include <sound/pcm.h>
+#include <sound/pcm_params.h>
+#include <sound/tlv.h>
+#include "oxygen.h"
+#include "ak4396.h"
+
+MODULE_AUTHOR("Clemens Ladisch <clemens@ladisch.de>");
+MODULE_DESCRIPTION("C-Media CMI8788 driver");
+MODULE_LICENSE("GPL");
+MODULE_SUPPORTED_DEVICE("{{C-Media,CMI8788}}");
+
+static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;
+static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;
+static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;
+
+module_param_array(index, int, NULL, 0444);
+MODULE_PARM_DESC(index, "card index");
+module_param_array(id, charp, NULL, 0444);
+MODULE_PARM_DESC(id, "ID string");
+module_param_array(enable, bool, NULL, 0444);
+MODULE_PARM_DESC(enable, "enable card");
+
+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) },
+        { }
+};
+MODULE_DEVICE_TABLE(pci, oxygen_ids);
+
+
+#define GPIO_AK5385_DFS_MASK    0x0003
+#define GPIO_AK5385_DFS_NORMAL  0x0000
+#define GPIO_AK5385_DFS_DOUBLE  0x0001
+#define GPIO_AK5385_DFS_QUAD    0x0002
+
+#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;
+};
+
+static void ak4396_write(struct oxygen *chip, unsigned int codec,
+                         u8 reg, u8 value)
+{
+        /* maps ALSA channel pair number to SPI output */
+        static const u8 codec_spi_map[4] = {
+                0, 1, 2, 4
+        };
+        oxygen_write_spi(chip, OXYGEN_SPI_TRIGGER |
+                         OXYGEN_SPI_DATA_LENGTH_2 |
+                         OXYGEN_SPI_CLOCK_160 |
+                         (codec_spi_map[codec] << OXYGEN_SPI_CODEC_SHIFT) |
+                         OXYGEN_SPI_CEN_LATCH_CLOCK_HI,
+                         AK4396_WRITE | (reg << 8) | value);
+}
+
+static void wm8785_write(struct oxygen *chip, u8 reg, unsigned int value)
+{
+        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);
+}
+
+static void ak4396_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);
+                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, 0xff);
+                ak4396_write(chip, i, AK4396_RCH_ATT, 0xff);
+        }
+        snd_component_add(chip->card, "AK4396");
+}
+
+static void ak5385_init(struct oxygen *chip)
+{
+        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, 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");
+}
+
+static void generic_init(struct oxygen *chip)
+{
+        ak4396_init(chip);
+        wm8785_init(chip);
+}
+
+static void meridian_init(struct oxygen *chip)
+{
+        ak4396_init(chip);
+        ak5385_init(chip);
+}
+
+static void generic_cleanup(struct oxygen *chip)
+{
+}
+
+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 = data->ak4396_ctl2 & ~AK4396_DFS_MASK;
+        if (params_rate(params) <= 54000)
+                value |= AK4396_DFS_NORMAL;
+        else if (params_rate(params) <= 108000)
+                value |= AK4396_DFS_DOUBLE;
+        else
+                value |= AK4396_DFS_QUAD;
+        data->ak4396_ctl2 = value;
+        for (i = 0; i < 4; ++i) {
+                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);
+        }
+}
+
+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;
+        unsigned int i;
+        u8 value;
+
+        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, AK4396_CONTROL_2, value);
+}
+
+static void set_wm8785_params(struct oxygen *chip,
+                              struct snd_pcm_hw_params *params)
+{
+        unsigned int value;
+
+        wm8785_write(chip, WM8785_R7, 0);
+
+        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
+                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, WM8785_R1, value);
+}
+
+static void set_ak5385_params(struct oxygen *chip,
+                              struct snd_pcm_hw_params *params)
+{
+        unsigned int value;
+
+        if (params_rate(params) <= 54000)
+                value = GPIO_AK5385_DFS_NORMAL;
+        else if (params_rate(params) <= 108000)
+                value = GPIO_AK5385_DFS_DOUBLE;
+        else
+                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,
+        .set_dac_params = set_ak4396_params,
+        .set_adc_params = set_wm8785_params,
+        .update_dac_volume = update_ak4396_volume,
+        .update_dac_mute = update_ak4396_mute,
+        .model_data_size = sizeof(struct generic_data),
+        .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_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,
+        .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,
+        .model_data_size = sizeof(struct generic_data),
+        .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_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
+        .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
+};
+
+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)
+                return -ENODEV;
+        if (!enable[dev]) {
+                ++dev;
+                return -ENOENT;
+        }
+        is_meridian = pci_id->driver_data;
+        err = oxygen_pci_probe(pci, index[dev], id[dev], is_meridian,
+                               is_meridian ? &model_meridian : &model_generic);
+        if (err >= 0)
+                ++dev;
+        return err;
+}
+
+static struct pci_driver oxygen_driver = {
+        .name = "CMI8788",
+        .id_table = oxygen_ids,
+        .probe = generic_oxygen_probe,
+        .remove = __devexit_p(oxygen_pci_remove),
+};
+
+static int __init alsa_card_oxygen_init(void)
+{
+        return pci_register_driver(&oxygen_driver);
+}
+
+static void __exit alsa_card_oxygen_exit(void)
+{
+        pci_unregister_driver(&oxygen_driver);
+}
+
+module_init(alsa_card_oxygen_init)
+module_exit(alsa_card_oxygen_exit)