ALSA: hda - Add a new fixup type to override pinctl values

Add a new fixup type, HDA_FIXUP_PINCTLS, for overriding the pinctl
values of the given pins.  It takes the same array of struct pintbl
like HDA_FIXUP_PINS, but each entry contains the pinctl value instead
of the pin default config value.

This patch also replaces the corresponding codes in patch_realtek.c.
Without this change, the direct call of verbs may be overridden again
by the later call of pinctl restoration by the driver.

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

1 files changed, 9 insertions, 9 deletions

diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 7a4b78376303..c8fcfa830778 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -1794,9 +1794,9 @@ static const struct hda_fixup alc882_fixups[] = {
                 }
         },
         [ALC882_FIXUP_PB_M5210] = {
-                .type = HDA_FIXUP_VERBS,
-                .v.verbs = (const struct hda_verb[]) {
-                        { 0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF50 },
+                .type = HDA_FIXUP_PINCTLS,
+                .v.pins = (const struct hda_pintbl[]) {
+                        { 0x19, PIN_VREF50 },
                         {}
                 }
         },
@@ -2158,9 +2158,9 @@ static const struct hda_fixup alc262_fixups[] = {
                 }
         },
         [ALC262_FIXUP_LENOVO_3000] = {
-                .type = HDA_FIXUP_VERBS,
-                .v.verbs = (const struct hda_verb[]) {
-                        { 0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF50 },
+                .type = HDA_FIXUP_PINCTLS,
+                .v.pins = (const struct hda_pintbl[]) {
+                        { 0x19, PIN_VREF50 },
                         {}
                 },
                 .chained = true,
@@ -2715,9 +2715,9 @@ enum {
 
 static const struct hda_fixup alc269_fixups[] = {
         [ALC269_FIXUP_SONY_VAIO] = {
-                .type = HDA_FIXUP_VERBS,
-                .v.verbs = (const struct hda_verb[]) {
-                        {0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREFGRD},
+                .type = HDA_FIXUP_PINCTLS,
+                .v.pins = (const struct hda_pintbl[]) {
+                        {0x19, PIN_VREFGRD},
                         {}
                 }
         },