hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[ALSA] maestro3: Fix hw volume on HP OmniBook 

Make the hw volume buttons work correctly on some HP OmniBook laptops.
The original quirk was apparently applied a bit too early and it was
also lacking some critial register writes. This improved sequence was
discovered by trial and error (like the original sequence). Tested and
found working on OB500 and OB6000 laptops.

Signed-off-by: Ville Syrjala <syrjala@sci.fi>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Ville Syrjälä 2008-06-03 20:52:10 +03:00 committed by Takashi Iwai
parent 607d982bbe
commit 8b83afe0d2
1 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
sound/pci/maestro3.c
View File

@ -2427,6 +2427,29 @@ snd_m3_amp_enable(struct snd_m3 *chip, int enable)
outw(0xffff, io + GPIO_MASK); outw(0xffff, io + GPIO_MASK);
} }
static void
snd_m3_hv_init(struct snd_m3 *chip)
{
unsigned long io = chip->iobase;
u16 val = GPI_VOL_DOWN | GPI_VOL_UP;
if (!chip->is_omnibook)
return;
/*
* Volume buttons on some HP OmniBook laptops
* require some GPIO magic to work correctly.
*/
outw(0xffff, io + GPIO_MASK);
outw(0x0000, io + GPIO_DATA);
outw(~val, io + GPIO_MASK);
outw(inw(io + GPIO_DIRECTION) & ~val, io + GPIO_DIRECTION);
outw(val, io + GPIO_MASK);
outw(0xffff, io + GPIO_MASK);
}
static int static int
snd_m3_chip_init(struct snd_m3 *chip) snd_m3_chip_init(struct snd_m3 *chip)
{ {
@ -2442,21 +2465,6 @@ snd_m3_chip_init(struct snd_m3 *chip)
DISABLE_LEGACY); DISABLE_LEGACY);
pci_write_config_word(pcidev, PCI_LEGACY_AUDIO_CTRL, w); pci_write_config_word(pcidev, PCI_LEGACY_AUDIO_CTRL, w);
if (chip->is_omnibook) {
/*
* Volume buttons on some HP OmniBook laptops don't work
* correctly. This makes them work for the most part.
*
* Volume up and down buttons on the laptop side work.
* Fn+cursor_up (volme up) works.
* Fn+cursor_down (volume down) doesn't work.
* Fn+F7 (mute) works acts as volume up.
*/
outw(~(GPI_VOL_DOWN|GPI_VOL_UP), io + GPIO_MASK);
outw(inw(io + GPIO_DIRECTION) & ~(GPI_VOL_DOWN|GPI_VOL_UP), io + GPIO_DIRECTION);
outw((GPI_VOL_DOWN|GPI_VOL_UP), io + GPIO_DATA);
outw(0xffff, io + GPIO_MASK);
}
pci_read_config_dword(pcidev, PCI_ALLEGRO_CONFIG, &n); pci_read_config_dword(pcidev, PCI_ALLEGRO_CONFIG, &n);
n &= ~(HV_CTRL_ENABLE | REDUCED_DEBOUNCE | HV_BUTTON_FROM_GD); n &= ~(HV_CTRL_ENABLE | REDUCED_DEBOUNCE | HV_BUTTON_FROM_GD);
n |= chip->hv_config; n |= chip->hv_config;
@ -2642,6 +2650,8 @@ static int m3_resume(struct pci_dev *pci)
snd_m3_enable_ints(chip); snd_m3_enable_ints(chip);
snd_m3_amp_enable(chip, 1); snd_m3_amp_enable(chip, 1);
snd_m3_hv_init(chip);
snd_power_change_state(card, SNDRV_CTL_POWER_D0); snd_power_change_state(card, SNDRV_CTL_POWER_D0);
return 0; return 0;
} }
@ -2781,6 +2791,8 @@ snd_m3_create(struct snd_card *card, struct pci_dev *pci,
snd_m3_amp_enable(chip, 1); snd_m3_amp_enable(chip, 1);
snd_m3_hv_init(chip);
tasklet_init(&chip->hwvol_tq, snd_m3_update_hw_volume, (unsigned long)chip); tasklet_init(&chip->hwvol_tq, snd_m3_update_hw_volume, (unsigned long)chip);
if (request_irq(pci->irq, snd_m3_interrupt, IRQF_SHARED, if (request_irq(pci->irq, snd_m3_interrupt, IRQF_SHARED,