Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 41c3b648bd4cdc34fd1918e288f8afe78903432e

Authored by Takashi Iwai
1 parent 8e5f262bfc
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

ALSA: hda - Fix GPIO initialization in patch_stac92hd71bxx() 

Fixed the GPIO mask and co initialization in patch_stac92hd71bxx()
so that the gpio_maks for HP_M4 model is set properly.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

Showing 1 changed file with 7 additions and 7 deletions Side-by-side Diff

sound/pci/hda/patch_sigmatel.c
Diff comments   View file @ 41c3b64
... ... @@ -4478,6 +4478,13 @@
4478 4478 stac92xx_set_config_regs(codec);
4479 4479 }
4480 4480  
  4481 + if (spec->board_config > STAC_92HD71BXX_REF) {
  4482 + /* GPIO0 = EAPD */
  4483 + spec->gpio_mask = 0x01;
  4484 + spec->gpio_dir = 0x01;
  4485 + spec->gpio_data = 0x01;
  4486 + }
  4487 +
4481 4488 switch (codec->vendor_id) {
4482 4489 case 0x111d76b6: /* 4 Port without Analog Mixer */
4483 4490 case 0x111d76b7:
... ... @@ -4536,13 +4543,6 @@
4536 4543  
4537 4544 spec->aloopback_mask = 0x50;
4538 4545 spec->aloopback_shift = 0;
4539   -
4540   - if (spec->board_config > STAC_92HD71BXX_REF) {
4541   - /* GPIO0 = EAPD */
4542   - spec->gpio_mask = 0x01;
4543   - spec->gpio_dir = 0x01;
4544   - spec->gpio_data = 0x01;
4545   - }
4546 4546  
4547 4547 spec->powerdown_adcs = 1;
4548 4548 spec->digbeep_nid = 0x26;