Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

8 files changed, 29 insertions, 10 deletions

diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c
index 66c7fb3ced3e..15f0161ce4a2 100644
--- a/sound/pci/emu10k1/emu10k1_main.c
+++ b/sound/pci/emu10k1/emu10k1_main.c
@@ -926,7 +926,7 @@ static int snd_emu10k1_emu1010_init(struct snd_emu10k1 *emu)
         snd_emu1010_fpga_write(emu, EMU_HANA_MIDI_IN, 0x19);
         /* Unknown. */
         snd_emu1010_fpga_write(emu, EMU_HANA_MIDI_OUT, 0x0c);
-        /* IRQ Enable: Alll on */
+        /* IRQ Enable: All on */
         /* snd_emu1010_fpga_write(emu, 0x09, 0x0f ); */
         /* IRQ Enable: All off */
         snd_emu1010_fpga_write(emu, EMU_HANA_IRQ_ENABLE, 0x00);
@@ -1440,6 +1440,14 @@ static struct snd_emu_chip_details emu_chip_details[] = {
          .ca0102_chip = 1,
          .spk71 = 1,
          .emu_model = EMU_MODEL_EMU0404}, /* EMU 0404 */
+        /* EMU0404 PCIe */
+        {.vendor = 0x1102, .device = 0x0008, .subsystem = 0x40051102,
+         .driver = "Audigy2", .name = "E-mu 0404 PCIe [MAEM8984]",
+         .id = "EMU0404",
+         .emu10k2_chip = 1,
+         .ca0108_chip = 1,
+         .spk71 = 1,
+         .emu_model = EMU_MODEL_EMU0404}, /* EMU 0404 PCIe ver_03 */
         /* Note that all E-mu cards require kernel 2.6 or newer. */
         {.vendor = 0x1102, .device = 0x0008,
          .driver = "Audigy2", .name = "SB Audigy 2 Value [Unknown]",
diff --git a/sound/pci/emu10k1/emu10k1x.c b/sound/pci/emu10k1/emu10k1x.c
index df47f738098d..0c701e4ec8a5 100644
--- a/sound/pci/emu10k1/emu10k1x.c
+++ b/sound/pci/emu10k1/emu10k1x.c
@@ -114,7 +114,7 @@ MODULE_PARM_DESC(enable, "Enable the EMU10K1X soundcard.");
                                                  */
 #define PLAYBACK_LIST_SIZE      0x01            /* Size of list in bytes << 16. E.g. 8 periods -> 0x00380000  */
 #define PLAYBACK_LIST_PTR       0x02            /* Pointer to the current period being played */
-#define PLAYBACK_DMA_ADDR       0x04            /* Playback DMA addresss */
+#define PLAYBACK_DMA_ADDR       0x04            /* Playback DMA address */
 #define PLAYBACK_PERIOD_SIZE    0x05            /* Playback period size */
 #define PLAYBACK_POINTER        0x06            /* Playback period pointer. Sample currently in DAC */
 #define PLAYBACK_UNKNOWN1       0x07
diff --git a/sound/pci/emu10k1/emufx.c b/sound/pci/emu10k1/emufx.c
index 7a9401462c1c..dae4050ede5c 100644
--- a/sound/pci/emu10k1/emufx.c
+++ b/sound/pci/emu10k1/emufx.c
@@ -303,6 +303,9 @@ static const u32 db_table[101] = {
 static const DECLARE_TLV_DB_SCALE(snd_emu10k1_db_scale1, -4000, 40, 1);
 static const DECLARE_TLV_DB_LINEAR(snd_emu10k1_db_linear, TLV_DB_GAIN_MUTE, 0);
 
+/* EMU10K1 bass/treble db gain */
+static const DECLARE_TLV_DB_SCALE(snd_emu10k1_bass_treble_db_scale, -1200, 60, 0);
+
 static const u32 onoff_table[2] = {
         0x00000000, 0x00000001
 };
@@ -2163,6 +2166,7 @@ static int __devinit _snd_emu10k1_init_efx(struct snd_emu10k1 *emu)
         ctl->min = 0;
         ctl->max = 40;
         ctl->value[0] = ctl->value[1] = 20;
+        ctl->tlv = snd_emu10k1_bass_treble_db_scale;
         ctl->translation = EMU10K1_GPR_TRANSLATION_BASS;
         ctl = &controls[i + 1];
         ctl->id.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
@@ -2172,6 +2176,7 @@ static int __devinit _snd_emu10k1_init_efx(struct snd_emu10k1 *emu)
         ctl->min = 0;
         ctl->max = 40;
         ctl->value[0] = ctl->value[1] = 20;
+        ctl->tlv = snd_emu10k1_bass_treble_db_scale;
         ctl->translation = EMU10K1_GPR_TRANSLATION_TREBLE;
 
 #define BASS_GPR        0x8c
diff --git a/sound/pci/emu10k1/emumixer.c b/sound/pci/emu10k1/emumixer.c
index 05afe06e353a..9d890a5aec5a 100644
--- a/sound/pci/emu10k1/emumixer.c
+++ b/sound/pci/emu10k1/emumixer.c
@@ -1729,8 +1729,6 @@ int __devinit snd_emu10k1_mixer(struct snd_emu10k1 *emu,
                 "Master Mono Playback Volume",
                 "PCM Out Path & Mute",
                 "Mono Output Select",
-                "Front Playback Switch",
-                "Front Playback Volume",
                 "Surround Playback Switch",
                 "Surround Playback Volume",
                 "Center Playback Switch",
@@ -1879,6 +1877,8 @@ int __devinit snd_emu10k1_mixer(struct snd_emu10k1 *emu,
                                 emu->rear_ac97 = 1;
                                 snd_emu10k1_ptr_write(emu, AC97SLOT, 0, AC97SLOT_CNTR|AC97SLOT_LFE|AC97SLOT_REAR_LEFT|AC97SLOT_REAR_RIGHT);
                                 snd_ac97_write_cache(emu->ac97, AC97_HEADPHONE, 0x0202);
+                                remove_ctl(card,"Front Playback Volume");
+                                remove_ctl(card,"Front Playback Switch");
                         }
                         /* remove unused AC97 controls */
                         snd_ac97_write_cache(emu->ac97, AC97_SURROUND_MASTER, 0x0202);
@@ -1913,6 +1913,12 @@ int __devinit snd_emu10k1_mixer(struct snd_emu10k1 *emu,
         for (; *c; c += 2)
                 rename_ctl(card, c[0], c[1]);
 
+        if (emu->card_capabilities->subsystem == 0x80401102) { /* SB Live! Platinum CT4760P */
+                remove_ctl(card, "Center Playback Volume");
+                remove_ctl(card, "LFE Playback Volume");
+                remove_ctl(card, "Wave Center Playback Volume");
+                remove_ctl(card, "Wave LFE Playback Volume");
+        }
         if (emu->card_capabilities->subsystem == 0x20071102) {  /* Audigy 4 Pro */
                 rename_ctl(card, "Line2 Capture Volume", "Line1/Mic Capture Volume");
                 rename_ctl(card, "Analog Mix Capture Volume", "Line2 Capture Volume");
diff --git a/sound/pci/emu10k1/emumpu401.c b/sound/pci/emu10k1/emumpu401.c
index 8578c70c61f2..bab564824efe 100644
--- a/sound/pci/emu10k1/emumpu401.c
+++ b/sound/pci/emu10k1/emumpu401.c
@@ -321,7 +321,7 @@ static struct snd_rawmidi_ops snd_emu10k1_midi_input =
 
 static void snd_emu10k1_midi_free(struct snd_rawmidi *rmidi)
 {
-        struct snd_emu10k1_midi *midi = (struct snd_emu10k1_midi *)rmidi->private_data;
+        struct snd_emu10k1_midi *midi = rmidi->private_data;
         midi->interrupt = NULL;
         midi->rmidi = NULL;
 }
diff --git a/sound/pci/emu10k1/memory.c b/sound/pci/emu10k1/memory.c
index 957a311514c8..c250614dadd0 100644
--- a/sound/pci/emu10k1/memory.c
+++ b/sound/pci/emu10k1/memory.c
@@ -248,7 +248,7 @@ static int is_valid_page(struct snd_emu10k1 *emu, dma_addr_t addr)
 /*
  * map the given memory block on PTB.
  * if the block is already mapped, update the link order.
- * if no empty pages are found, tries to release unsed memory blocks
+ * if no empty pages are found, tries to release unused memory blocks
  * and retry the mapping.
  */
 int snd_emu10k1_memblk_map(struct snd_emu10k1 *emu, struct snd_emu10k1_memblk *blk)
diff --git a/sound/pci/emu10k1/p16v.c b/sound/pci/emu10k1/p16v.c
index 61b8ab39800f..a81dc44228ea 100644
--- a/sound/pci/emu10k1/p16v.c
+++ b/sound/pci/emu10k1/p16v.c
@@ -69,7 +69,7 @@
  *    ADC: Philips 1361T (Stereo 24bit)
  *    DAC: CS4382-K (8-channel, 24bit, 192Khz)
  *
- *  This code was initally based on code from ALSA's emu10k1x.c which is:
+ *  This code was initially based on code from ALSA's emu10k1x.c which is:
  *  Copyright (c) by Francisco Moraes <fmoraes@nc.rr.com>
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/sound/pci/emu10k1/p16v.h b/sound/pci/emu10k1/p16v.h
index 153214940336..4e0ee1a9747a 100644
--- a/sound/pci/emu10k1/p16v.h
+++ b/sound/pci/emu10k1/p16v.h
@@ -59,7 +59,7 @@
  *    ADC: Philips 1361T (Stereo 24bit)
  *    DAC: CS4382-K (8-channel, 24bit, 192Khz)
  *
- *  This code was initally based on code from ALSA's emu10k1x.c which is:
+ *  This code was initially based on code from ALSA's emu10k1x.c which is:
  *  Copyright (c) by Francisco Moraes <fmoraes@nc.rr.com>
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -86,7 +86,7 @@
  * The sample rate is also controlled by the same registers that control the rate of the EMU10K2 sample rate converters.
  */
 
-/* Initally all registers from 0x00 to 0x3f have zero contents. */
+/* Initially all registers from 0x00 to 0x3f have zero contents. */
 #define PLAYBACK_LIST_ADDR      0x00            /* Base DMA address of a list of pointers to each period/size */
                                                 /* One list entry: 4 bytes for DMA address, 
                                                  * 4 bytes for period_size << 16.
@@ -96,7 +96,7 @@
 #define PLAYBACK_LIST_SIZE      0x01            /* Size of list in bytes << 16. E.g. 8 periods -> 0x00380000  */
 #define PLAYBACK_LIST_PTR       0x02            /* Pointer to the current period being played */
 #define PLAYBACK_UNKNOWN3       0x03            /* Not used */
-#define PLAYBACK_DMA_ADDR       0x04            /* Playback DMA addresss */
+#define PLAYBACK_DMA_ADDR       0x04            /* Playback DMA address */
 #define PLAYBACK_PERIOD_SIZE    0x05            /* Playback period size. win2000 uses 0x04000000 */
 #define PLAYBACK_POINTER        0x06            /* Playback period pointer. Used with PLAYBACK_LIST_PTR to determine buffer position currently in DAC */
 #define PLAYBACK_FIFO_END_ADDRESS       0x07            /* Playback FIFO end address */