aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sound/pci/hda/hda_codec.h12
1 files changed, 5 insertions, 7 deletions
diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h
index 042bcfc6dbb..263f5b698ba 100644
--- a/sound/pci/hda/hda_codec.h
+++ b/sound/pci/hda/hda_codec.h
@@ -185,13 +185,6 @@ enum {
185#define AC_PINCAP_VREF_GRD (1<<2) /* ground */ 185#define AC_PINCAP_VREF_GRD (1<<2) /* ground */
186#define AC_PINCAP_VREF_80 (1<<4) /* 80% */ 186#define AC_PINCAP_VREF_80 (1<<4) /* 80% */
187#define AC_PINCAP_VREF_100 (1<<5) /* 100% */ 187#define AC_PINCAP_VREF_100 (1<<5) /* 100% */
188/* Vref setting (used in pin ctl) */
189#define AC_PINCTL_VREF_HIZ (0) /* Hi-Z */
190#define AC_PINCTL_VREF_50 (1) /* 50% */
191#define AC_PINCTL_VREF_GRD (2) /* ground */
192#define AC_PINCTL_VREF_80 (4) /* 80% */
193#define AC_PINCTL_VREF_100 (5) /* 100% */
194
195 188
196/* Amplifier capabilities */ 189/* Amplifier capabilities */
197#define AC_AMPCAP_OFFSET (0x7f<<0) /* 0dB offset */ 190#define AC_AMPCAP_OFFSET (0x7f<<0) /* 0dB offset */
@@ -254,6 +247,11 @@ enum {
254 247
255/* Pin widget control - 8bit */ 248/* Pin widget control - 8bit */
256#define AC_PINCTL_VREFEN (0x7<<0) 249#define AC_PINCTL_VREFEN (0x7<<0)
250#define AC_PINCTL_VREF_HIZ 0 /* Hi-Z */
251#define AC_PINCTL_VREF_50 1 /* 50% */
252#define AC_PINCTL_VREF_GRD 2 /* ground */
253#define AC_PINCTL_VREF_80 4 /* 80% */
254#define AC_PINCTL_VREF_100 5 /* 100% */
257#define AC_PINCTL_IN_EN (1<<5) 255#define AC_PINCTL_IN_EN (1<<5)
258#define AC_PINCTL_OUT_EN (1<<6) 256#define AC_PINCTL_OUT_EN (1<<6)
259#define AC_PINCTL_HP_EN (1<<7) 257#define AC_PINCTL_HP_EN (1<<7)