summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt <matt@embeddedalley.com>2005-04-13 14:37:50 +0200
committerJaroslav Kysela <perex@suse.cz>2005-05-29 10:00:51 +0200
commit1a12de1edf234b54ce94971d5604f85809c391b9 (patch)
tree099cd910f5a313f17838e96740b50493ef16877c
parenteb8caf30f4c059ddfdfa32b6034549622953db6f (diff)
downloadop-kernel-dev-1a12de1edf234b54ce94971d5604f85809c391b9.zip
op-kernel-dev-1a12de1edf234b54ce94971d5604f85809c391b9.tar.gz
[ALSA] hda: fix vref cap and ctl values
HDA Codec driver,HDA generic driver Fix some vref defines so they are valid for the different bits in the pin cap and pin control registers. Please apply. Signed-off-by: Matt <matt@embeddedalley.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/pci/hda/hda_codec.h20
-rw-r--r--sound/pci/hda/hda_generic.c2
2 files changed, 14 insertions, 8 deletions
diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h
index c9e9dc9..042bcfc6 100644
--- a/sound/pci/hda/hda_codec.h
+++ b/sound/pci/hda/hda_codec.h
@@ -176,15 +176,21 @@ enum {
#define AC_PINCAP_OUT (1<<4) /* output capable */
#define AC_PINCAP_IN (1<<5) /* input capable */
#define AC_PINCAP_BALANCE (1<<6) /* balanced I/O capable */
-#define AC_PINCAP_VREF (7<<8)
+#define AC_PINCAP_VREF (0x37<<8)
#define AC_PINCAP_VREF_SHIFT 8
#define AC_PINCAP_EAPD (1<<16) /* EAPD capable */
-/* Vref status (used in pin cap and pin ctl) */
-#define AC_PIN_VREF_HIZ (1<<0) /* Hi-Z */
-#define AC_PIN_VREF_50 (1<<1) /* 50% */
-#define AC_PIN_VREF_GRD (1<<2) /* ground */
-#define AC_PIN_VREF_80 (1<<4) /* 80% */
-#define AC_PIN_VREF_100 (1<<5) /* 100% */
+/* Vref status (used in pin cap) */
+#define AC_PINCAP_VREF_HIZ (1<<0) /* Hi-Z */
+#define AC_PINCAP_VREF_50 (1<<1) /* 50% */
+#define AC_PINCAP_VREF_GRD (1<<2) /* ground */
+#define AC_PINCAP_VREF_80 (1<<4) /* 80% */
+#define AC_PINCAP_VREF_100 (1<<5) /* 100% */
+/* Vref setting (used in pin ctl) */
+#define AC_PINCTL_VREF_HIZ (0) /* Hi-Z */
+#define AC_PINCTL_VREF_50 (1) /* 50% */
+#define AC_PINCTL_VREF_GRD (2) /* ground */
+#define AC_PINCTL_VREF_80 (4) /* 80% */
+#define AC_PINCTL_VREF_100 (5) /* 100% */
/* Amplifier capabilities */
diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c
index 69f7b6c..c233e7f 100644
--- a/sound/pci/hda/hda_generic.c
+++ b/sound/pci/hda/hda_generic.c
@@ -426,7 +426,7 @@ static const char *get_input_type(struct hda_gnode *node, unsigned int *pinctl)
return "Line";
case AC_JACK_CD:
if (pinctl)
- *pinctl |= AC_PIN_VREF_GRD;
+ *pinctl |= AC_PINCTL_VREF_GRD;
return "CD";
case AC_JACK_AUX:
if ((location & 0x0f) == AC_JACK_LOC_FRONT)
OpenPOWER on IntegriCloud