···505505 unsigned short pcmreg[3]; // PCM registers506506 unsigned short codec_cfg[3]; // CODEC_CFG bits507507 unsigned char swap_mic_linein; // AD1986/AD1986A only508508+ unsigned char lo_as_master; /* LO as master */508509 } ad18xx;509510 unsigned int dev_flags; /* device specific */510511 } spec;
+34-14
sound/pci/ac97/ac97_patch.c
···1971197119721972 val = ac97->regs[AC97_AD_MISC];19731973 ucontrol->value.integer.value[0] = !(val & AC97_AD198X_LOSEL);19741974+ if (ac97->spec.ad18xx.lo_as_master)19751975+ ucontrol->value.integer.value[0] =19761976+ !ucontrol->value.integer.value[0];19741977 return 0;19751978}19761979···19821979 struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol);19831980 unsigned short val;1984198119851985- val = !ucontrol->value.integer.value[0]19861986- ? (AC97_AD198X_LOSEL | AC97_AD198X_HPSEL) : 0;19821982+ val = !ucontrol->value.integer.value[0];19831983+ if (ac97->spec.ad18xx.lo_as_master)19841984+ val = !val;19851985+ val = val ? (AC97_AD198X_LOSEL | AC97_AD198X_HPSEL) : 0;19871986 return snd_ac97_update_bits(ac97, AC97_AD_MISC,19881987 AC97_AD198X_LOSEL | AC97_AD198X_HPSEL, val);19891988}···20362031{20372032 unsigned short val = 0;20382033 /* clear LODIS if shared jack is to be used for Surround out */20392039- if (is_shared_linein(ac97))20342034+ if (!ac97->spec.ad18xx.lo_as_master && is_shared_linein(ac97))20402035 val |= (1 << 12);20412036 /* clear CLDIS if shared jack is to be used for C/LFE out */20422037 if (is_shared_micin(ac97))···2072206720732068static int patch_ad1888_specific(struct snd_ac97 *ac97)20742069{20752075- /* rename 0x04 as "Master" and 0x02 as "Master Surround" */20762076- snd_ac97_rename_vol_ctl(ac97, "Master Playback", "Master Surround Playback");20772077- snd_ac97_rename_vol_ctl(ac97, "Headphone Playback", "Master Playback");20702070+ if (!ac97->spec.ad18xx.lo_as_master) {20712071+ /* rename 0x04 as "Master" and 0x02 as "Master Surround" */20722072+ snd_ac97_rename_vol_ctl(ac97, "Master Playback",20732073+ "Master Surround Playback");20742074+ snd_ac97_rename_vol_ctl(ac97, "Headphone Playback",20752075+ "Master Playback");20762076+ }20782077 return patch_build_controls(ac97, snd_ac97_ad1888_controls, ARRAY_SIZE(snd_ac97_ad1888_controls));20792078}20802079···2097208820982089 patch_ad1881(ac97);20992090 ac97->build_ops = &patch_ad1888_build_ops;21002100- /* Switch FRONT/SURROUND LINE-OUT/HP-OUT default connection */21012101- /* it seems that most vendors connect line-out connector to headphone out of AC'97 */20912091+20922092+ /*20932093+ * LO can be used as a real line-out on some devices,20942094+ * and we need to revert the front/surround mixer switches20952095+ */20962096+ if (ac97->subsystem_vendor == 0x1043 &&20972097+ ac97->subsystem_device == 0x1193) /* ASUS A9T laptop */20982098+ ac97->spec.ad18xx.lo_as_master = 1;20992099+21002100+ misc = snd_ac97_read(ac97, AC97_AD_MISC);21022101 /* AD-compatible mode */21032102 /* Stereo mutes enabled */21042104- misc = snd_ac97_read(ac97, AC97_AD_MISC);21052105- snd_ac97_write_cache(ac97, AC97_AD_MISC, misc |21062106- AC97_AD198X_LOSEL |21072107- AC97_AD198X_HPSEL |21082108- AC97_AD198X_MSPLT |21092109- AC97_AD198X_AC97NC);21032103+ misc |= AC97_AD198X_MSPLT | AC97_AD198X_AC97NC;21042104+ if (!ac97->spec.ad18xx.lo_as_master)21052105+ /* Switch FRONT/SURROUND LINE-OUT/HP-OUT default connection */21062106+ /* it seems that most vendors connect line-out connector to21072107+ * headphone out of AC'9721082108+ */21092109+ misc |= AC97_AD198X_LOSEL | AC97_AD198X_HPSEL;21102110+21112111+ snd_ac97_write_cache(ac97, AC97_AD_MISC, misc);21102112 ac97->flags |= AC97_STEREO_MUTES;21112113 return 0;21122114}