Merge remote-tracking branch 'sound-current/for-linus'

[karo-tx-linux.git] / sound / pci / maestro3.c

diff --git a/sound/pci/maestro3.c b/sound/pci/maestro3.c
index 72e89cedc52de3c1f115454e827e9d4e2c88895c..17ae92613de4bc7502f33ff64d4dc076177ef992 100644 (file)
--- a/sound/pci/maestro3.c
+++ b/sound/pci/maestro3.c
@@ -1929,15 +1929,32 @@ snd_m3_ac97_write(struct snd_ac97 *ac97, unsigned short reg, unsigned short val)
                return;
        snd_m3_outw(chip, val, CODEC_DATA);
        snd_m3_outb(chip, reg & 0x7f, CODEC_COMMAND);
+       /*
+        * Workaround for buggy ES1988 integrated AC'97 codec. It remains silent
+        * until the MASTER volume or mute is touched (alsactl restore does not
+        * work).
+        */
+       if (ac97->id == 0x45838308 && reg == AC97_MASTER) {
+               snd_m3_ac97_wait(chip);
+               snd_m3_outw(chip, val, CODEC_DATA);
+               snd_m3_outb(chip, reg & 0x7f, CODEC_COMMAND);
+       }
 }
 
 
-static void snd_m3_remote_codec_config(int io, int isremote)
+static void snd_m3_remote_codec_config(struct snd_m3 *chip, int isremote)
 {
+       int io = chip->iobase;
+       u16 tmp;
+
        isremote = isremote ? 1 : 0;
 
-       outw((inw(io + RING_BUS_CTRL_B) & ~SECOND_CODEC_ID_MASK) | isremote,
-            io + RING_BUS_CTRL_B);
+       tmp = inw(io + RING_BUS_CTRL_B) & ~SECOND_CODEC_ID_MASK;
+       /* enable dock on Dell Latitude C810 */
+       if (chip->pci->subsystem_vendor == 0x1028 &&
+           chip->pci->subsystem_device == 0x00e5)
+               tmp |= M3I_DOCK_ENABLE;
+       outw(tmp | isremote, io + RING_BUS_CTRL_B);
        outw((inw(io + SDO_OUT_DEST_CTRL) & ~COMMAND_ADDR_OUT) | isremote,
             io + SDO_OUT_DEST_CTRL);
        outw((inw(io + SDO_IN_DEST_CTRL) & ~STATUS_ADDR_IN) | isremote,
@@ -1989,7 +2006,7 @@ static void snd_m3_ac97_reset(struct snd_m3 *chip)
                if (!chip->irda_workaround)
                        dir |= 0x10; /* assuming pci bus master? */
 
-               snd_m3_remote_codec_config(io, 0);
+               snd_m3_remote_codec_config(chip, 0);
 
                outw(IO_SRAM_ENABLE, io + RING_BUS_CTRL_A);
                udelay(20);