projects / ipfire-2.x.git / blame
| Commit | Line | Data |
|---|---|---|
| 2cb7cef9 BS |
1 | From: Takashi Iwai <tiwai@suse.de> |
| 2 | Subject: ALSA: hda - Fix GPIO initialization in patch_stac92hd71bxx() | |
| 3 | Patch-mainline: | |
| 4 | References: bnc#445321,bnc#445161 | |
| 5 | ||
| 6 | Fixed the GPIO mask and co initialization in patch_stac92hd71bxx() | |
| 7 | so that the gpio_maks for HP_M4 model is set properly. | |
| 8 | ||
| 9 | Signed-off-by: Takashi Iwai <tiwai@suse.de> | |
| 10 | ||
| 11 | --- | |
| 12 | sound/pci/hda/patch_sigmatel.c | 14 +++++++------- | |
| 13 | 1 file changed, 7 insertions(+), 7 deletions(-) | |
| 14 | ||
| 15 | --- a/sound/pci/hda/patch_sigmatel.c | |
| 16 | +++ b/sound/pci/hda/patch_sigmatel.c | |
| 17 | @@ -4482,6 +4482,13 @@ again: | |
| 18 | stac92xx_set_config_regs(codec); | |
| 19 | } | |
| 20 | ||
| 21 | + if (spec->board_config > STAC_92HD71BXX_REF) { | |
| 22 | + /* GPIO0 = EAPD */ | |
| 23 | + spec->gpio_mask = 0x01; | |
| 24 | + spec->gpio_dir = 0x01; | |
| 25 | + spec->gpio_data = 0x01; | |
| 26 | + } | |
| 27 | + | |
| 28 | switch (codec->vendor_id) { | |
| 29 | case 0x111d76b6: /* 4 Port without Analog Mixer */ | |
| 30 | case 0x111d76b7: | |
| 31 | @@ -4541,13 +4548,6 @@ again: | |
| 32 | spec->aloopback_mask = 0x50; | |
| 33 | spec->aloopback_shift = 0; | |
| 34 | ||
| 35 | - if (spec->board_config > STAC_92HD71BXX_REF) { | |
| 36 | - /* GPIO0 = EAPD */ | |
| 37 | - spec->gpio_mask = 0x01; | |
| 38 | - spec->gpio_dir = 0x01; | |
| 39 | - spec->gpio_data = 0x01; | |
| 40 | - } | |
| 41 | - | |
| 42 | spec->powerdown_adcs = 1; | |
| 43 | spec->digbeep_nid = 0x26; | |
| 44 | spec->mux_nids = stac92hd71bxx_mux_nids; |