Skip to content

Commit

Permalink
[ALSA] hda: fix vref cap and ctl values
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Matt authored and Jaroslav Kysela committed May 29, 2005
1 parent eb8caf3 commit 1a12de1
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 8 deletions.
20 changes: 13 additions & 7 deletions sound/pci/hda/hda_codec.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
2 changes: 1 addition & 1 deletion sound/pci/hda/hda_generic.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 1a12de1

Please sign in to comment.