ALSA: hda - Split verb definitions into sound/hda_verbs.h

Since there are more HD-audio compatible codecs, move the definitions
of HD-audio verbs into common header location, include/sound, so that
it can be included cleanly from other drivers than HD-audio driver.

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

2 files changed, 555 insertions, 546 deletions

diff --git a/include/sound/hda_verbs.h b/include/sound/hda_verbs.h
new file mode 100644
index 000000000000..d0509db6d0ec
--- /dev/null
+++ b/include/sound/hda_verbs.h
@@ -0,0 +1,554 @@
+/*
+ * HD-audio codec verbs
+ */
+
+#ifndef __SOUND_HDA_VERBS_H
+#define __SOUND_HDA_VERBS_H
+
+/*
+ * nodes
+ */
+#define AC_NODE_ROOT            0x00
+
+/*
+ * function group types
+ */
+enum {
+        AC_GRP_AUDIO_FUNCTION = 0x01,
+        AC_GRP_MODEM_FUNCTION = 0x02,
+};
+
+/*
+ * widget types
+ */
+enum {
+        AC_WID_AUD_OUT,         /* Audio Out */
+        AC_WID_AUD_IN,          /* Audio In */
+        AC_WID_AUD_MIX,         /* Audio Mixer */
+        AC_WID_AUD_SEL,         /* Audio Selector */
+        AC_WID_PIN,             /* Pin Complex */
+        AC_WID_POWER,           /* Power */
+        AC_WID_VOL_KNB,         /* Volume Knob */
+        AC_WID_BEEP,            /* Beep Generator */
+        AC_WID_VENDOR = 0x0f    /* Vendor specific */
+};
+
+/*
+ * GET verbs
+ */
+#define AC_VERB_GET_STREAM_FORMAT               0x0a00
+#define AC_VERB_GET_AMP_GAIN_MUTE               0x0b00
+#define AC_VERB_GET_PROC_COEF                   0x0c00
+#define AC_VERB_GET_COEF_INDEX                  0x0d00
+#define AC_VERB_PARAMETERS                      0x0f00
+#define AC_VERB_GET_CONNECT_SEL                 0x0f01
+#define AC_VERB_GET_CONNECT_LIST                0x0f02
+#define AC_VERB_GET_PROC_STATE                  0x0f03
+#define AC_VERB_GET_SDI_SELECT                  0x0f04
+#define AC_VERB_GET_POWER_STATE                 0x0f05
+#define AC_VERB_GET_CONV                        0x0f06
+#define AC_VERB_GET_PIN_WIDGET_CONTROL          0x0f07
+#define AC_VERB_GET_UNSOLICITED_RESPONSE        0x0f08
+#define AC_VERB_GET_PIN_SENSE                   0x0f09
+#define AC_VERB_GET_BEEP_CONTROL                0x0f0a
+#define AC_VERB_GET_EAPD_BTLENABLE              0x0f0c
+#define AC_VERB_GET_DIGI_CONVERT_1              0x0f0d
+#define AC_VERB_GET_DIGI_CONVERT_2              0x0f0e /* unused */
+#define AC_VERB_GET_VOLUME_KNOB_CONTROL         0x0f0f
+/* f10-f1a: GPIO */
+#define AC_VERB_GET_GPIO_DATA                   0x0f15
+#define AC_VERB_GET_GPIO_MASK                   0x0f16
+#define AC_VERB_GET_GPIO_DIRECTION              0x0f17
+#define AC_VERB_GET_GPIO_WAKE_MASK              0x0f18
+#define AC_VERB_GET_GPIO_UNSOLICITED_RSP_MASK   0x0f19
+#define AC_VERB_GET_GPIO_STICKY_MASK            0x0f1a
+#define AC_VERB_GET_CONFIG_DEFAULT              0x0f1c
+/* f20: AFG/MFG */
+#define AC_VERB_GET_SUBSYSTEM_ID                0x0f20
+#define AC_VERB_GET_CVT_CHAN_COUNT              0x0f2d
+#define AC_VERB_GET_HDMI_DIP_SIZE               0x0f2e
+#define AC_VERB_GET_HDMI_ELDD                   0x0f2f
+#define AC_VERB_GET_HDMI_DIP_INDEX              0x0f30
+#define AC_VERB_GET_HDMI_DIP_DATA               0x0f31
+#define AC_VERB_GET_HDMI_DIP_XMIT               0x0f32
+#define AC_VERB_GET_HDMI_CP_CTRL                0x0f33
+#define AC_VERB_GET_HDMI_CHAN_SLOT              0x0f34
+#define AC_VERB_GET_DEVICE_SEL                  0xf35
+#define AC_VERB_GET_DEVICE_LIST                 0xf36
+
+/*
+ * SET verbs
+ */
+#define AC_VERB_SET_STREAM_FORMAT               0x200
+#define AC_VERB_SET_AMP_GAIN_MUTE               0x300
+#define AC_VERB_SET_PROC_COEF                   0x400
+#define AC_VERB_SET_COEF_INDEX                  0x500
+#define AC_VERB_SET_CONNECT_SEL                 0x701
+#define AC_VERB_SET_PROC_STATE                  0x703
+#define AC_VERB_SET_SDI_SELECT                  0x704
+#define AC_VERB_SET_POWER_STATE                 0x705
+#define AC_VERB_SET_CHANNEL_STREAMID            0x706
+#define AC_VERB_SET_PIN_WIDGET_CONTROL          0x707
+#define AC_VERB_SET_UNSOLICITED_ENABLE          0x708
+#define AC_VERB_SET_PIN_SENSE                   0x709
+#define AC_VERB_SET_BEEP_CONTROL                0x70a
+#define AC_VERB_SET_EAPD_BTLENABLE              0x70c
+#define AC_VERB_SET_DIGI_CONVERT_1              0x70d
+#define AC_VERB_SET_DIGI_CONVERT_2              0x70e
+#define AC_VERB_SET_VOLUME_KNOB_CONTROL         0x70f
+#define AC_VERB_SET_GPIO_DATA                   0x715
+#define AC_VERB_SET_GPIO_MASK                   0x716
+#define AC_VERB_SET_GPIO_DIRECTION              0x717
+#define AC_VERB_SET_GPIO_WAKE_MASK              0x718
+#define AC_VERB_SET_GPIO_UNSOLICITED_RSP_MASK   0x719
+#define AC_VERB_SET_GPIO_STICKY_MASK            0x71a
+#define AC_VERB_SET_CONFIG_DEFAULT_BYTES_0      0x71c
+#define AC_VERB_SET_CONFIG_DEFAULT_BYTES_1      0x71d
+#define AC_VERB_SET_CONFIG_DEFAULT_BYTES_2      0x71e
+#define AC_VERB_SET_CONFIG_DEFAULT_BYTES_3      0x71f
+#define AC_VERB_SET_EAPD                                0x788
+#define AC_VERB_SET_CODEC_RESET                 0x7ff
+#define AC_VERB_SET_CVT_CHAN_COUNT              0x72d
+#define AC_VERB_SET_HDMI_DIP_INDEX              0x730
+#define AC_VERB_SET_HDMI_DIP_DATA               0x731
+#define AC_VERB_SET_HDMI_DIP_XMIT               0x732
+#define AC_VERB_SET_HDMI_CP_CTRL                0x733
+#define AC_VERB_SET_HDMI_CHAN_SLOT              0x734
+#define AC_VERB_SET_DEVICE_SEL                  0x735
+
+/*
+ * Parameter IDs
+ */
+#define AC_PAR_VENDOR_ID                0x00
+#define AC_PAR_SUBSYSTEM_ID             0x01
+#define AC_PAR_REV_ID                   0x02
+#define AC_PAR_NODE_COUNT               0x04
+#define AC_PAR_FUNCTION_TYPE            0x05
+#define AC_PAR_AUDIO_FG_CAP             0x08
+#define AC_PAR_AUDIO_WIDGET_CAP         0x09
+#define AC_PAR_PCM                      0x0a
+#define AC_PAR_STREAM                   0x0b
+#define AC_PAR_PIN_CAP                  0x0c
+#define AC_PAR_AMP_IN_CAP               0x0d
+#define AC_PAR_CONNLIST_LEN             0x0e
+#define AC_PAR_POWER_STATE              0x0f
+#define AC_PAR_PROC_CAP                 0x10
+#define AC_PAR_GPIO_CAP                 0x11
+#define AC_PAR_AMP_OUT_CAP              0x12
+#define AC_PAR_VOL_KNB_CAP              0x13
+#define AC_PAR_DEVLIST_LEN              0x15
+#define AC_PAR_HDMI_LPCM_CAP            0x20
+
+/*
+ * AC_VERB_PARAMETERS results (32bit)
+ */
+
+/* Function Group Type */
+#define AC_FGT_TYPE                     (0xff<<0)
+#define AC_FGT_TYPE_SHIFT               0
+#define AC_FGT_UNSOL_CAP                (1<<8)
+
+/* Audio Function Group Capabilities */
+#define AC_AFG_OUT_DELAY                (0xf<<0)
+#define AC_AFG_IN_DELAY                 (0xf<<8)
+#define AC_AFG_BEEP_GEN                 (1<<16)
+
+/* Audio Widget Capabilities */
+#define AC_WCAP_STEREO                  (1<<0)  /* stereo I/O */
+#define AC_WCAP_IN_AMP                  (1<<1)  /* AMP-in present */
+#define AC_WCAP_OUT_AMP                 (1<<2)  /* AMP-out present */
+#define AC_WCAP_AMP_OVRD                (1<<3)  /* AMP-parameter override */
+#define AC_WCAP_FORMAT_OVRD             (1<<4)  /* format override */
+#define AC_WCAP_STRIPE                  (1<<5)  /* stripe */
+#define AC_WCAP_PROC_WID                (1<<6)  /* Proc Widget */
+#define AC_WCAP_UNSOL_CAP               (1<<7)  /* Unsol capable */
+#define AC_WCAP_CONN_LIST               (1<<8)  /* connection list */
+#define AC_WCAP_DIGITAL                 (1<<9)  /* digital I/O */
+#define AC_WCAP_POWER                   (1<<10) /* power control */
+#define AC_WCAP_LR_SWAP                 (1<<11) /* L/R swap */
+#define AC_WCAP_CP_CAPS                 (1<<12) /* content protection */
+#define AC_WCAP_CHAN_CNT_EXT            (7<<13) /* channel count ext */
+#define AC_WCAP_DELAY                   (0xf<<16)
+#define AC_WCAP_DELAY_SHIFT             16
+#define AC_WCAP_TYPE                    (0xf<<20)
+#define AC_WCAP_TYPE_SHIFT              20
+
+/* supported PCM rates and bits */
+#define AC_SUPPCM_RATES                 (0xfff << 0)
+#define AC_SUPPCM_BITS_8                (1<<16)
+#define AC_SUPPCM_BITS_16               (1<<17)
+#define AC_SUPPCM_BITS_20               (1<<18)
+#define AC_SUPPCM_BITS_24               (1<<19)
+#define AC_SUPPCM_BITS_32               (1<<20)
+
+/* supported PCM stream format */
+#define AC_SUPFMT_PCM                   (1<<0)
+#define AC_SUPFMT_FLOAT32               (1<<1)
+#define AC_SUPFMT_AC3                   (1<<2)
+
+/* GP I/O count */
+#define AC_GPIO_IO_COUNT                (0xff<<0)
+#define AC_GPIO_O_COUNT                 (0xff<<8)
+#define AC_GPIO_O_COUNT_SHIFT           8
+#define AC_GPIO_I_COUNT                 (0xff<<16)
+#define AC_GPIO_I_COUNT_SHIFT           16
+#define AC_GPIO_UNSOLICITED             (1<<30)
+#define AC_GPIO_WAKE                    (1<<31)
+
+/* Converter stream, channel */
+#define AC_CONV_CHANNEL                 (0xf<<0)
+#define AC_CONV_STREAM                  (0xf<<4)
+#define AC_CONV_STREAM_SHIFT            4
+
+/* Input converter SDI select */
+#define AC_SDI_SELECT                   (0xf<<0)
+
+/* stream format id */
+#define AC_FMT_CHAN_SHIFT               0
+#define AC_FMT_CHAN_MASK                (0x0f << 0)
+#define AC_FMT_BITS_SHIFT               4
+#define AC_FMT_BITS_MASK                (7 << 4)
+#define AC_FMT_BITS_8                   (0 << 4)
+#define AC_FMT_BITS_16                  (1 << 4)
+#define AC_FMT_BITS_20                  (2 << 4)
+#define AC_FMT_BITS_24                  (3 << 4)
+#define AC_FMT_BITS_32                  (4 << 4)
+#define AC_FMT_DIV_SHIFT                8
+#define AC_FMT_DIV_MASK                 (7 << 8)
+#define AC_FMT_MULT_SHIFT               11
+#define AC_FMT_MULT_MASK                (7 << 11)
+#define AC_FMT_BASE_SHIFT               14
+#define AC_FMT_BASE_48K                 (0 << 14)
+#define AC_FMT_BASE_44K                 (1 << 14)
+#define AC_FMT_TYPE_SHIFT               15
+#define AC_FMT_TYPE_PCM                 (0 << 15)
+#define AC_FMT_TYPE_NON_PCM             (1 << 15)
+
+/* Unsolicited response control */
+#define AC_UNSOL_TAG                    (0x3f<<0)
+#define AC_UNSOL_ENABLED                (1<<7)
+#define AC_USRSP_EN                     AC_UNSOL_ENABLED
+
+/* Unsolicited responses */
+#define AC_UNSOL_RES_TAG                (0x3f<<26)
+#define AC_UNSOL_RES_TAG_SHIFT          26
+#define AC_UNSOL_RES_SUBTAG             (0x1f<<21)
+#define AC_UNSOL_RES_SUBTAG_SHIFT       21
+#define AC_UNSOL_RES_DE                 (0x3f<<15)  /* Device Entry
+                                                     * (for DP1.2 MST)
+                                                     */
+#define AC_UNSOL_RES_DE_SHIFT           15
+#define AC_UNSOL_RES_IA                 (1<<2)  /* Inactive (for DP1.2 MST) */
+#define AC_UNSOL_RES_ELDV               (1<<1)  /* ELD Data valid (for HDMI) */
+#define AC_UNSOL_RES_PD                 (1<<0)  /* pinsense detect */
+#define AC_UNSOL_RES_CP_STATE           (1<<1)  /* content protection */
+#define AC_UNSOL_RES_CP_READY           (1<<0)  /* content protection */
+
+/* Pin widget capabilies */
+#define AC_PINCAP_IMP_SENSE             (1<<0)  /* impedance sense capable */
+#define AC_PINCAP_TRIG_REQ              (1<<1)  /* trigger required */
+#define AC_PINCAP_PRES_DETECT           (1<<2)  /* presence detect capable */
+#define AC_PINCAP_HP_DRV                (1<<3)  /* headphone drive capable */
+#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 */
+/* Note: This LR_SWAP pincap is defined in the Realtek ALC883 specification,
+ *       but is marked reserved in the Intel HDA specification.
+ */
+#define AC_PINCAP_LR_SWAP               (1<<7)  /* L/R swap */
+/* Note: The same bit as LR_SWAP is newly defined as HDMI capability
+ *       in HD-audio specification
+ */
+#define AC_PINCAP_HDMI                  (1<<7)  /* HDMI pin */
+#define AC_PINCAP_DP                    (1<<24) /* DisplayPort pin, can
+                                                 * coexist with AC_PINCAP_HDMI
+                                                 */
+#define AC_PINCAP_VREF                  (0x37<<8)
+#define AC_PINCAP_VREF_SHIFT            8
+#define AC_PINCAP_EAPD                  (1<<16) /* EAPD capable */
+#define AC_PINCAP_HBR                   (1<<27) /* High Bit Rate */
+/* 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% */
+
+/* Amplifier capabilities */
+#define AC_AMPCAP_OFFSET                (0x7f<<0)  /* 0dB offset */
+#define AC_AMPCAP_OFFSET_SHIFT          0
+#define AC_AMPCAP_NUM_STEPS             (0x7f<<8)  /* number of steps */
+#define AC_AMPCAP_NUM_STEPS_SHIFT       8
+#define AC_AMPCAP_STEP_SIZE             (0x7f<<16) /* step size 0-32dB
+                                                    * in 0.25dB
+                                                    */
+#define AC_AMPCAP_STEP_SIZE_SHIFT       16
+#define AC_AMPCAP_MUTE                  (1<<31)    /* mute capable */
+#define AC_AMPCAP_MUTE_SHIFT            31
+
+/* driver-specific amp-caps: using bits 24-30 */
+#define AC_AMPCAP_MIN_MUTE              (1 << 30) /* min-volume = mute */
+
+/* Connection list */
+#define AC_CLIST_LENGTH                 (0x7f<<0)
+#define AC_CLIST_LONG                   (1<<7)
+
+/* Supported power status */
+#define AC_PWRST_D0SUP                  (1<<0)
+#define AC_PWRST_D1SUP                  (1<<1)
+#define AC_PWRST_D2SUP                  (1<<2)
+#define AC_PWRST_D3SUP                  (1<<3)
+#define AC_PWRST_D3COLDSUP              (1<<4)
+#define AC_PWRST_S3D3COLDSUP            (1<<29)
+#define AC_PWRST_CLKSTOP                (1<<30)
+#define AC_PWRST_EPSS                   (1U<<31)
+
+/* Power state values */
+#define AC_PWRST_SETTING                (0xf<<0)
+#define AC_PWRST_ACTUAL                 (0xf<<4)
+#define AC_PWRST_ACTUAL_SHIFT           4
+#define AC_PWRST_D0                     0x00
+#define AC_PWRST_D1                     0x01
+#define AC_PWRST_D2                     0x02
+#define AC_PWRST_D3                     0x03
+#define AC_PWRST_ERROR                  (1<<8)
+#define AC_PWRST_CLK_STOP_OK            (1<<9)
+#define AC_PWRST_SETTING_RESET          (1<<10)
+
+/* Processing capabilies */
+#define AC_PCAP_BENIGN                  (1<<0)
+#define AC_PCAP_NUM_COEF                (0xff<<8)
+#define AC_PCAP_NUM_COEF_SHIFT          8
+
+/* Volume knobs capabilities */
+#define AC_KNBCAP_NUM_STEPS             (0x7f<<0)
+#define AC_KNBCAP_DELTA                 (1<<7)
+
+/* HDMI LPCM capabilities */
+#define AC_LPCMCAP_48K_CP_CHNS          (0x0f<<0) /* max channels w/ CP-on */
+#define AC_LPCMCAP_48K_NO_CHNS          (0x0f<<4) /* max channels w/o CP-on */
+#define AC_LPCMCAP_48K_20BIT            (1<<8)  /* 20b bitrate supported */
+#define AC_LPCMCAP_48K_24BIT            (1<<9)  /* 24b bitrate supported */
+#define AC_LPCMCAP_96K_CP_CHNS          (0x0f<<10) /* max channels w/ CP-on */
+#define AC_LPCMCAP_96K_NO_CHNS          (0x0f<<14) /* max channels w/o CP-on */
+#define AC_LPCMCAP_96K_20BIT            (1<<18) /* 20b bitrate supported */
+#define AC_LPCMCAP_96K_24BIT            (1<<19) /* 24b bitrate supported */
+#define AC_LPCMCAP_192K_CP_CHNS         (0x0f<<20) /* max channels w/ CP-on */
+#define AC_LPCMCAP_192K_NO_CHNS         (0x0f<<24) /* max channels w/o CP-on */
+#define AC_LPCMCAP_192K_20BIT           (1<<28) /* 20b bitrate supported */
+#define AC_LPCMCAP_192K_24BIT           (1<<29) /* 24b bitrate supported */
+#define AC_LPCMCAP_44K                  (1<<30) /* 44.1kHz support */
+#define AC_LPCMCAP_44K_MS               (1<<31) /* 44.1kHz-multiplies support */
+
+/* Display pin's device list length */
+#define AC_DEV_LIST_LEN_MASK            0x3f
+#define AC_MAX_DEV_LIST_LEN             64
+
+/*
+ * Control Parameters
+ */
+
+/* Amp gain/mute */
+#define AC_AMP_MUTE                     (1<<7)
+#define AC_AMP_GAIN                     (0x7f)
+#define AC_AMP_GET_INDEX                (0xf<<0)
+
+#define AC_AMP_GET_LEFT                 (1<<13)
+#define AC_AMP_GET_RIGHT                (0<<13)
+#define AC_AMP_GET_OUTPUT               (1<<15)
+#define AC_AMP_GET_INPUT                (0<<15)
+
+#define AC_AMP_SET_INDEX                (0xf<<8)
+#define AC_AMP_SET_INDEX_SHIFT          8
+#define AC_AMP_SET_RIGHT                (1<<12)
+#define AC_AMP_SET_LEFT                 (1<<13)
+#define AC_AMP_SET_INPUT                (1<<14)
+#define AC_AMP_SET_OUTPUT               (1<<15)
+
+/* DIGITAL1 bits */
+#define AC_DIG1_ENABLE                  (1<<0)
+#define AC_DIG1_V                       (1<<1)
+#define AC_DIG1_VCFG                    (1<<2)
+#define AC_DIG1_EMPHASIS                (1<<3)
+#define AC_DIG1_COPYRIGHT               (1<<4)
+#define AC_DIG1_NONAUDIO                (1<<5)
+#define AC_DIG1_PROFESSIONAL            (1<<6)
+#define AC_DIG1_LEVEL                   (1<<7)
+
+/* DIGITAL2 bits */
+#define AC_DIG2_CC                      (0x7f<<0)
+
+/* DIGITAL3 bits */
+#define AC_DIG3_ICT                     (0xf<<0)
+#define AC_DIG3_KAE                     (1<<7)
+
+/* Pin widget control - 8bit */
+#define AC_PINCTL_EPT                   (0x3<<0)
+#define AC_PINCTL_EPT_NATIVE            0
+#define AC_PINCTL_EPT_HBR               3
+#define AC_PINCTL_VREFEN                (0x7<<0)
+#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% */
+#define AC_PINCTL_IN_EN                 (1<<5)
+#define AC_PINCTL_OUT_EN                (1<<6)
+#define AC_PINCTL_HP_EN                 (1<<7)
+
+/* Pin sense - 32bit */
+#define AC_PINSENSE_IMPEDANCE_MASK      (0x7fffffff)
+#define AC_PINSENSE_PRESENCE            (1<<31)
+#define AC_PINSENSE_ELDV                (1<<30) /* ELD valid (HDMI) */
+
+/* EAPD/BTL enable - 32bit */
+#define AC_EAPDBTL_BALANCED             (1<<0)
+#define AC_EAPDBTL_EAPD                 (1<<1)
+#define AC_EAPDBTL_LR_SWAP              (1<<2)
+
+/* HDMI ELD data */
+#define AC_ELDD_ELD_VALID               (1<<31)
+#define AC_ELDD_ELD_DATA                0xff
+
+/* HDMI DIP size */
+#define AC_DIPSIZE_ELD_BUF              (1<<3) /* ELD buf size of packet size */
+#define AC_DIPSIZE_PACK_IDX             (0x07<<0) /* packet index */
+
+/* HDMI DIP index */
+#define AC_DIPIDX_PACK_IDX              (0x07<<5) /* packet idnex */
+#define AC_DIPIDX_BYTE_IDX              (0x1f<<0) /* byte index */
+
+/* HDMI DIP xmit (transmit) control */
+#define AC_DIPXMIT_MASK                 (0x3<<6)
+#define AC_DIPXMIT_DISABLE              (0x0<<6) /* disable xmit */
+#define AC_DIPXMIT_ONCE                 (0x2<<6) /* xmit once then disable */
+#define AC_DIPXMIT_BEST                 (0x3<<6) /* best effort */
+
+/* HDMI content protection (CP) control */
+#define AC_CPCTRL_CES                   (1<<9) /* current encryption state */
+#define AC_CPCTRL_READY                 (1<<8) /* ready bit */
+#define AC_CPCTRL_SUBTAG                (0x1f<<3) /* subtag for unsol-resp */
+#define AC_CPCTRL_STATE                 (3<<0) /* current CP request state */
+
+/* Converter channel <-> HDMI slot mapping */
+#define AC_CVTMAP_HDMI_SLOT             (0xf<<0) /* HDMI slot number */
+#define AC_CVTMAP_CHAN                  (0xf<<4) /* converter channel number */
+
+/* configuration default - 32bit */
+#define AC_DEFCFG_SEQUENCE              (0xf<<0)
+#define AC_DEFCFG_DEF_ASSOC             (0xf<<4)
+#define AC_DEFCFG_ASSOC_SHIFT           4
+#define AC_DEFCFG_MISC                  (0xf<<8)
+#define AC_DEFCFG_MISC_SHIFT            8
+#define AC_DEFCFG_MISC_NO_PRESENCE      (1<<0)
+#define AC_DEFCFG_COLOR                 (0xf<<12)
+#define AC_DEFCFG_COLOR_SHIFT           12
+#define AC_DEFCFG_CONN_TYPE             (0xf<<16)
+#define AC_DEFCFG_CONN_TYPE_SHIFT       16
+#define AC_DEFCFG_DEVICE                (0xf<<20)
+#define AC_DEFCFG_DEVICE_SHIFT          20
+#define AC_DEFCFG_LOCATION              (0x3f<<24)
+#define AC_DEFCFG_LOCATION_SHIFT        24
+#define AC_DEFCFG_PORT_CONN             (0x3<<30)
+#define AC_DEFCFG_PORT_CONN_SHIFT       30
+
+/* Display pin's device list entry */
+#define AC_DE_PD                        (1<<0)
+#define AC_DE_ELDV                      (1<<1)
+#define AC_DE_IA                        (1<<2)
+
+/* device device types (0x0-0xf) */
+enum {
+        AC_JACK_LINE_OUT,
+        AC_JACK_SPEAKER,
+        AC_JACK_HP_OUT,
+        AC_JACK_CD,
+        AC_JACK_SPDIF_OUT,
+        AC_JACK_DIG_OTHER_OUT,
+        AC_JACK_MODEM_LINE_SIDE,
+        AC_JACK_MODEM_HAND_SIDE,
+        AC_JACK_LINE_IN,
+        AC_JACK_AUX,
+        AC_JACK_MIC_IN,
+        AC_JACK_TELEPHONY,
+        AC_JACK_SPDIF_IN,
+        AC_JACK_DIG_OTHER_IN,
+        AC_JACK_OTHER = 0xf,
+};
+
+/* jack connection types (0x0-0xf) */
+enum {
+        AC_JACK_CONN_UNKNOWN,
+        AC_JACK_CONN_1_8,
+        AC_JACK_CONN_1_4,
+        AC_JACK_CONN_ATAPI,
+        AC_JACK_CONN_RCA,
+        AC_JACK_CONN_OPTICAL,
+        AC_JACK_CONN_OTHER_DIGITAL,
+        AC_JACK_CONN_OTHER_ANALOG,
+        AC_JACK_CONN_DIN,
+        AC_JACK_CONN_XLR,
+        AC_JACK_CONN_RJ11,
+        AC_JACK_CONN_COMB,
+        AC_JACK_CONN_OTHER = 0xf,
+};
+
+/* jack colors (0x0-0xf) */
+enum {
+        AC_JACK_COLOR_UNKNOWN,
+        AC_JACK_COLOR_BLACK,
+        AC_JACK_COLOR_GREY,
+        AC_JACK_COLOR_BLUE,
+        AC_JACK_COLOR_GREEN,
+        AC_JACK_COLOR_RED,
+        AC_JACK_COLOR_ORANGE,
+        AC_JACK_COLOR_YELLOW,
+        AC_JACK_COLOR_PURPLE,
+        AC_JACK_COLOR_PINK,
+        AC_JACK_COLOR_WHITE = 0xe,
+        AC_JACK_COLOR_OTHER,
+};
+
+/* Jack location (0x0-0x3f) */
+/* common case */
+enum {
+        AC_JACK_LOC_NONE,
+        AC_JACK_LOC_REAR,
+        AC_JACK_LOC_FRONT,
+        AC_JACK_LOC_LEFT,
+        AC_JACK_LOC_RIGHT,
+        AC_JACK_LOC_TOP,
+        AC_JACK_LOC_BOTTOM,
+};
+/* bits 4-5 */
+enum {
+        AC_JACK_LOC_EXTERNAL = 0x00,
+        AC_JACK_LOC_INTERNAL = 0x10,
+        AC_JACK_LOC_SEPARATE = 0x20,
+        AC_JACK_LOC_OTHER    = 0x30,
+};
+enum {
+        /* external on primary chasis */
+        AC_JACK_LOC_REAR_PANEL = 0x07,
+        AC_JACK_LOC_DRIVE_BAY,
+        /* internal */
+        AC_JACK_LOC_RISER = 0x17,
+        AC_JACK_LOC_HDMI,
+        AC_JACK_LOC_ATAPI,
+        /* others */
+        AC_JACK_LOC_MOBILE_IN = 0x37,
+        AC_JACK_LOC_MOBILE_OUT,
+};
+
+/* Port connectivity (0-3) */
+enum {
+        AC_JACK_PORT_COMPLEX,
+        AC_JACK_PORT_NONE,
+        AC_JACK_PORT_FIXED,
+        AC_JACK_PORT_BOTH,
+};
+
+/* max. codec address */
+#define HDA_MAX_CODEC_ADDRESS   0x0f
+
+#endif /* __SOUND_HDA_VERBS_H */
diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h
index 260b190adf74..3c484c27048b 100644
--- a/sound/pci/hda/hda_codec.h
+++ b/sound/pci/hda/hda_codec.h
@@ -25,552 +25,7 @@
 #include <sound/control.h>
 #include <sound/pcm.h>
 #include <sound/hwdep.h>
-
-/*
- * nodes
- */
-#define AC_NODE_ROOT            0x00
-
-/*
- * function group types
- */
-enum {
-        AC_GRP_AUDIO_FUNCTION = 0x01,
-        AC_GRP_MODEM_FUNCTION = 0x02,
-};
-        
-/*
- * widget types
- */
-enum {
-        AC_WID_AUD_OUT,         /* Audio Out */
-        AC_WID_AUD_IN,          /* Audio In */
-        AC_WID_AUD_MIX,         /* Audio Mixer */
-        AC_WID_AUD_SEL,         /* Audio Selector */
-        AC_WID_PIN,             /* Pin Complex */
-        AC_WID_POWER,           /* Power */
-        AC_WID_VOL_KNB,         /* Volume Knob */
-        AC_WID_BEEP,            /* Beep Generator */
-        AC_WID_VENDOR = 0x0f    /* Vendor specific */
-};
-
-/*
- * GET verbs
- */
-#define AC_VERB_GET_STREAM_FORMAT               0x0a00
-#define AC_VERB_GET_AMP_GAIN_MUTE               0x0b00
-#define AC_VERB_GET_PROC_COEF                   0x0c00
-#define AC_VERB_GET_COEF_INDEX                  0x0d00
-#define AC_VERB_PARAMETERS                      0x0f00
-#define AC_VERB_GET_CONNECT_SEL                 0x0f01
-#define AC_VERB_GET_CONNECT_LIST                0x0f02
-#define AC_VERB_GET_PROC_STATE                  0x0f03
-#define AC_VERB_GET_SDI_SELECT                  0x0f04
-#define AC_VERB_GET_POWER_STATE                 0x0f05
-#define AC_VERB_GET_CONV                        0x0f06
-#define AC_VERB_GET_PIN_WIDGET_CONTROL          0x0f07
-#define AC_VERB_GET_UNSOLICITED_RESPONSE        0x0f08
-#define AC_VERB_GET_PIN_SENSE                   0x0f09
-#define AC_VERB_GET_BEEP_CONTROL                0x0f0a
-#define AC_VERB_GET_EAPD_BTLENABLE              0x0f0c
-#define AC_VERB_GET_DIGI_CONVERT_1              0x0f0d
-#define AC_VERB_GET_DIGI_CONVERT_2              0x0f0e /* unused */
-#define AC_VERB_GET_VOLUME_KNOB_CONTROL         0x0f0f
-/* f10-f1a: GPIO */
-#define AC_VERB_GET_GPIO_DATA                   0x0f15
-#define AC_VERB_GET_GPIO_MASK                   0x0f16
-#define AC_VERB_GET_GPIO_DIRECTION              0x0f17
-#define AC_VERB_GET_GPIO_WAKE_MASK              0x0f18
-#define AC_VERB_GET_GPIO_UNSOLICITED_RSP_MASK   0x0f19
-#define AC_VERB_GET_GPIO_STICKY_MASK            0x0f1a
-#define AC_VERB_GET_CONFIG_DEFAULT              0x0f1c
-/* f20: AFG/MFG */
-#define AC_VERB_GET_SUBSYSTEM_ID                0x0f20
-#define AC_VERB_GET_CVT_CHAN_COUNT              0x0f2d
-#define AC_VERB_GET_HDMI_DIP_SIZE               0x0f2e
-#define AC_VERB_GET_HDMI_ELDD                   0x0f2f
-#define AC_VERB_GET_HDMI_DIP_INDEX              0x0f30
-#define AC_VERB_GET_HDMI_DIP_DATA               0x0f31
-#define AC_VERB_GET_HDMI_DIP_XMIT               0x0f32
-#define AC_VERB_GET_HDMI_CP_CTRL                0x0f33
-#define AC_VERB_GET_HDMI_CHAN_SLOT              0x0f34
-#define AC_VERB_GET_DEVICE_SEL                  0xf35
-#define AC_VERB_GET_DEVICE_LIST                 0xf36
-
-/*
- * SET verbs
- */
-#define AC_VERB_SET_STREAM_FORMAT               0x200
-#define AC_VERB_SET_AMP_GAIN_MUTE               0x300
-#define AC_VERB_SET_PROC_COEF                   0x400
-#define AC_VERB_SET_COEF_INDEX                  0x500
-#define AC_VERB_SET_CONNECT_SEL                 0x701
-#define AC_VERB_SET_PROC_STATE                  0x703
-#define AC_VERB_SET_SDI_SELECT                  0x704
-#define AC_VERB_SET_POWER_STATE                 0x705
-#define AC_VERB_SET_CHANNEL_STREAMID            0x706
-#define AC_VERB_SET_PIN_WIDGET_CONTROL          0x707
-#define AC_VERB_SET_UNSOLICITED_ENABLE          0x708
-#define AC_VERB_SET_PIN_SENSE                   0x709
-#define AC_VERB_SET_BEEP_CONTROL                0x70a
-#define AC_VERB_SET_EAPD_BTLENABLE              0x70c
-#define AC_VERB_SET_DIGI_CONVERT_1              0x70d
-#define AC_VERB_SET_DIGI_CONVERT_2              0x70e
-#define AC_VERB_SET_VOLUME_KNOB_CONTROL         0x70f
-#define AC_VERB_SET_GPIO_DATA                   0x715
-#define AC_VERB_SET_GPIO_MASK                   0x716
-#define AC_VERB_SET_GPIO_DIRECTION              0x717
-#define AC_VERB_SET_GPIO_WAKE_MASK              0x718
-#define AC_VERB_SET_GPIO_UNSOLICITED_RSP_MASK   0x719
-#define AC_VERB_SET_GPIO_STICKY_MASK            0x71a
-#define AC_VERB_SET_CONFIG_DEFAULT_BYTES_0      0x71c
-#define AC_VERB_SET_CONFIG_DEFAULT_BYTES_1      0x71d
-#define AC_VERB_SET_CONFIG_DEFAULT_BYTES_2      0x71e
-#define AC_VERB_SET_CONFIG_DEFAULT_BYTES_3      0x71f
-#define AC_VERB_SET_EAPD                                0x788
-#define AC_VERB_SET_CODEC_RESET                 0x7ff
-#define AC_VERB_SET_CVT_CHAN_COUNT              0x72d
-#define AC_VERB_SET_HDMI_DIP_INDEX              0x730
-#define AC_VERB_SET_HDMI_DIP_DATA               0x731
-#define AC_VERB_SET_HDMI_DIP_XMIT               0x732
-#define AC_VERB_SET_HDMI_CP_CTRL                0x733
-#define AC_VERB_SET_HDMI_CHAN_SLOT              0x734
-#define AC_VERB_SET_DEVICE_SEL                  0x735
-
-/*
- * Parameter IDs
- */
-#define AC_PAR_VENDOR_ID                0x00
-#define AC_PAR_SUBSYSTEM_ID             0x01
-#define AC_PAR_REV_ID                   0x02
-#define AC_PAR_NODE_COUNT               0x04
-#define AC_PAR_FUNCTION_TYPE            0x05
-#define AC_PAR_AUDIO_FG_CAP             0x08
-#define AC_PAR_AUDIO_WIDGET_CAP         0x09
-#define AC_PAR_PCM                      0x0a
-#define AC_PAR_STREAM                   0x0b
-#define AC_PAR_PIN_CAP                  0x0c
-#define AC_PAR_AMP_IN_CAP               0x0d
-#define AC_PAR_CONNLIST_LEN             0x0e
-#define AC_PAR_POWER_STATE              0x0f
-#define AC_PAR_PROC_CAP                 0x10
-#define AC_PAR_GPIO_CAP                 0x11
-#define AC_PAR_AMP_OUT_CAP              0x12
-#define AC_PAR_VOL_KNB_CAP              0x13
-#define AC_PAR_DEVLIST_LEN              0x15
-#define AC_PAR_HDMI_LPCM_CAP            0x20
-
-/*
- * AC_VERB_PARAMETERS results (32bit)
- */
-
-/* Function Group Type */
-#define AC_FGT_TYPE                     (0xff<<0)
-#define AC_FGT_TYPE_SHIFT               0
-#define AC_FGT_UNSOL_CAP                (1<<8)
-
-/* Audio Function Group Capabilities */
-#define AC_AFG_OUT_DELAY                (0xf<<0)
-#define AC_AFG_IN_DELAY                 (0xf<<8)
-#define AC_AFG_BEEP_GEN                 (1<<16)
-
-/* Audio Widget Capabilities */
-#define AC_WCAP_STEREO                  (1<<0)  /* stereo I/O */
-#define AC_WCAP_IN_AMP                  (1<<1)  /* AMP-in present */
-#define AC_WCAP_OUT_AMP                 (1<<2)  /* AMP-out present */
-#define AC_WCAP_AMP_OVRD                (1<<3)  /* AMP-parameter override */
-#define AC_WCAP_FORMAT_OVRD             (1<<4)  /* format override */
-#define AC_WCAP_STRIPE                  (1<<5)  /* stripe */
-#define AC_WCAP_PROC_WID                (1<<6)  /* Proc Widget */
-#define AC_WCAP_UNSOL_CAP               (1<<7)  /* Unsol capable */
-#define AC_WCAP_CONN_LIST               (1<<8)  /* connection list */
-#define AC_WCAP_DIGITAL                 (1<<9)  /* digital I/O */
-#define AC_WCAP_POWER                   (1<<10) /* power control */
-#define AC_WCAP_LR_SWAP                 (1<<11) /* L/R swap */
-#define AC_WCAP_CP_CAPS                 (1<<12) /* content protection */
-#define AC_WCAP_CHAN_CNT_EXT            (7<<13) /* channel count ext */
-#define AC_WCAP_DELAY                   (0xf<<16)
-#define AC_WCAP_DELAY_SHIFT             16
-#define AC_WCAP_TYPE                    (0xf<<20)
-#define AC_WCAP_TYPE_SHIFT              20
-
-/* supported PCM rates and bits */
-#define AC_SUPPCM_RATES                 (0xfff << 0)
-#define AC_SUPPCM_BITS_8                (1<<16)
-#define AC_SUPPCM_BITS_16               (1<<17)
-#define AC_SUPPCM_BITS_20               (1<<18)
-#define AC_SUPPCM_BITS_24               (1<<19)
-#define AC_SUPPCM_BITS_32               (1<<20)
-
-/* supported PCM stream format */
-#define AC_SUPFMT_PCM                   (1<<0)
-#define AC_SUPFMT_FLOAT32               (1<<1)
-#define AC_SUPFMT_AC3                   (1<<2)
-
-/* GP I/O count */
-#define AC_GPIO_IO_COUNT                (0xff<<0)
-#define AC_GPIO_O_COUNT                 (0xff<<8)
-#define AC_GPIO_O_COUNT_SHIFT           8
-#define AC_GPIO_I_COUNT                 (0xff<<16)
-#define AC_GPIO_I_COUNT_SHIFT           16
-#define AC_GPIO_UNSOLICITED             (1<<30)
-#define AC_GPIO_WAKE                    (1<<31)
-
-/* Converter stream, channel */
-#define AC_CONV_CHANNEL                 (0xf<<0)
-#define AC_CONV_STREAM                  (0xf<<4)
-#define AC_CONV_STREAM_SHIFT            4
-
-/* Input converter SDI select */
-#define AC_SDI_SELECT                   (0xf<<0)
-
-/* stream format id */
-#define AC_FMT_CHAN_SHIFT               0
-#define AC_FMT_CHAN_MASK                (0x0f << 0)
-#define AC_FMT_BITS_SHIFT               4
-#define AC_FMT_BITS_MASK                (7 << 4)
-#define AC_FMT_BITS_8                   (0 << 4)
-#define AC_FMT_BITS_16                  (1 << 4)
-#define AC_FMT_BITS_20                  (2 << 4)
-#define AC_FMT_BITS_24                  (3 << 4)
-#define AC_FMT_BITS_32                  (4 << 4)
-#define AC_FMT_DIV_SHIFT                8
-#define AC_FMT_DIV_MASK                 (7 << 8)
-#define AC_FMT_MULT_SHIFT               11
-#define AC_FMT_MULT_MASK                (7 << 11)
-#define AC_FMT_BASE_SHIFT               14
-#define AC_FMT_BASE_48K                 (0 << 14)
-#define AC_FMT_BASE_44K                 (1 << 14)
-#define AC_FMT_TYPE_SHIFT               15
-#define AC_FMT_TYPE_PCM                 (0 << 15)
-#define AC_FMT_TYPE_NON_PCM             (1 << 15)
-
-/* Unsolicited response control */
-#define AC_UNSOL_TAG                    (0x3f<<0)
-#define AC_UNSOL_ENABLED                (1<<7)
-#define AC_USRSP_EN                     AC_UNSOL_ENABLED
-
-/* Unsolicited responses */
-#define AC_UNSOL_RES_TAG                (0x3f<<26)
-#define AC_UNSOL_RES_TAG_SHIFT          26
-#define AC_UNSOL_RES_SUBTAG             (0x1f<<21)
-#define AC_UNSOL_RES_SUBTAG_SHIFT       21
-#define AC_UNSOL_RES_DE                 (0x3f<<15)  /* Device Entry
-                                                     * (for DP1.2 MST)
-                                                     */
-#define AC_UNSOL_RES_DE_SHIFT           15
-#define AC_UNSOL_RES_IA                 (1<<2)  /* Inactive (for DP1.2 MST) */
-#define AC_UNSOL_RES_ELDV               (1<<1)  /* ELD Data valid (for HDMI) */
-#define AC_UNSOL_RES_PD                 (1<<0)  /* pinsense detect */
-#define AC_UNSOL_RES_CP_STATE           (1<<1)  /* content protection */
-#define AC_UNSOL_RES_CP_READY           (1<<0)  /* content protection */
-
-/* Pin widget capabilies */
-#define AC_PINCAP_IMP_SENSE             (1<<0)  /* impedance sense capable */
-#define AC_PINCAP_TRIG_REQ              (1<<1)  /* trigger required */
-#define AC_PINCAP_PRES_DETECT           (1<<2)  /* presence detect capable */
-#define AC_PINCAP_HP_DRV                (1<<3)  /* headphone drive capable */
-#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 */
-/* Note: This LR_SWAP pincap is defined in the Realtek ALC883 specification,
- *       but is marked reserved in the Intel HDA specification.
- */
-#define AC_PINCAP_LR_SWAP               (1<<7)  /* L/R swap */
-/* Note: The same bit as LR_SWAP is newly defined as HDMI capability
- *       in HD-audio specification
- */
-#define AC_PINCAP_HDMI                  (1<<7)  /* HDMI pin */
-#define AC_PINCAP_DP                    (1<<24) /* DisplayPort pin, can
-                                                 * coexist with AC_PINCAP_HDMI
-                                                 */
-#define AC_PINCAP_VREF                  (0x37<<8)
-#define AC_PINCAP_VREF_SHIFT            8
-#define AC_PINCAP_EAPD                  (1<<16) /* EAPD capable */
-#define AC_PINCAP_HBR                   (1<<27) /* High Bit Rate */
-/* 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% */
-
-/* Amplifier capabilities */
-#define AC_AMPCAP_OFFSET                (0x7f<<0)  /* 0dB offset */
-#define AC_AMPCAP_OFFSET_SHIFT          0
-#define AC_AMPCAP_NUM_STEPS             (0x7f<<8)  /* number of steps */
-#define AC_AMPCAP_NUM_STEPS_SHIFT       8
-#define AC_AMPCAP_STEP_SIZE             (0x7f<<16) /* step size 0-32dB
-                                                    * in 0.25dB
-                                                    */
-#define AC_AMPCAP_STEP_SIZE_SHIFT       16
-#define AC_AMPCAP_MUTE                  (1<<31)    /* mute capable */
-#define AC_AMPCAP_MUTE_SHIFT            31
-
-/* driver-specific amp-caps: using bits 24-30 */
-#define AC_AMPCAP_MIN_MUTE              (1 << 30) /* min-volume = mute */
-
-/* Connection list */
-#define AC_CLIST_LENGTH                 (0x7f<<0)
-#define AC_CLIST_LONG                   (1<<7)
-
-/* Supported power status */
-#define AC_PWRST_D0SUP                  (1<<0)
-#define AC_PWRST_D1SUP                  (1<<1)
-#define AC_PWRST_D2SUP                  (1<<2)
-#define AC_PWRST_D3SUP                  (1<<3)
-#define AC_PWRST_D3COLDSUP              (1<<4)
-#define AC_PWRST_S3D3COLDSUP            (1<<29)
-#define AC_PWRST_CLKSTOP                (1<<30)
-#define AC_PWRST_EPSS                   (1U<<31)
-
-/* Power state values */
-#define AC_PWRST_SETTING                (0xf<<0)
-#define AC_PWRST_ACTUAL                 (0xf<<4)
-#define AC_PWRST_ACTUAL_SHIFT           4
-#define AC_PWRST_D0                     0x00
-#define AC_PWRST_D1                     0x01
-#define AC_PWRST_D2                     0x02
-#define AC_PWRST_D3                     0x03
-#define AC_PWRST_ERROR                  (1<<8)
-#define AC_PWRST_CLK_STOP_OK            (1<<9)
-#define AC_PWRST_SETTING_RESET          (1<<10)
-
-/* Processing capabilies */
-#define AC_PCAP_BENIGN                  (1<<0)
-#define AC_PCAP_NUM_COEF                (0xff<<8)
-#define AC_PCAP_NUM_COEF_SHIFT          8
-
-/* Volume knobs capabilities */
-#define AC_KNBCAP_NUM_STEPS             (0x7f<<0)
-#define AC_KNBCAP_DELTA                 (1<<7)
-
-/* HDMI LPCM capabilities */
-#define AC_LPCMCAP_48K_CP_CHNS          (0x0f<<0) /* max channels w/ CP-on */   
-#define AC_LPCMCAP_48K_NO_CHNS          (0x0f<<4) /* max channels w/o CP-on */
-#define AC_LPCMCAP_48K_20BIT            (1<<8)  /* 20b bitrate supported */
-#define AC_LPCMCAP_48K_24BIT            (1<<9)  /* 24b bitrate supported */
-#define AC_LPCMCAP_96K_CP_CHNS          (0x0f<<10) /* max channels w/ CP-on */  
-#define AC_LPCMCAP_96K_NO_CHNS          (0x0f<<14) /* max channels w/o CP-on */
-#define AC_LPCMCAP_96K_20BIT            (1<<18) /* 20b bitrate supported */
-#define AC_LPCMCAP_96K_24BIT            (1<<19) /* 24b bitrate supported */
-#define AC_LPCMCAP_192K_CP_CHNS         (0x0f<<20) /* max channels w/ CP-on */  
-#define AC_LPCMCAP_192K_NO_CHNS         (0x0f<<24) /* max channels w/o CP-on */
-#define AC_LPCMCAP_192K_20BIT           (1<<28) /* 20b bitrate supported */
-#define AC_LPCMCAP_192K_24BIT           (1<<29) /* 24b bitrate supported */
-#define AC_LPCMCAP_44K                  (1<<30) /* 44.1kHz support */
-#define AC_LPCMCAP_44K_MS               (1<<31) /* 44.1kHz-multiplies support */
-
-/* Display pin's device list length */
-#define AC_DEV_LIST_LEN_MASK            0x3f
-#define AC_MAX_DEV_LIST_LEN             64
-
-/*
- * Control Parameters
- */
-
-/* Amp gain/mute */
-#define AC_AMP_MUTE                     (1<<7)
-#define AC_AMP_GAIN                     (0x7f)
-#define AC_AMP_GET_INDEX                (0xf<<0)
-
-#define AC_AMP_GET_LEFT                 (1<<13)
-#define AC_AMP_GET_RIGHT                (0<<13)
-#define AC_AMP_GET_OUTPUT               (1<<15)
-#define AC_AMP_GET_INPUT                (0<<15)
-
-#define AC_AMP_SET_INDEX                (0xf<<8)
-#define AC_AMP_SET_INDEX_SHIFT          8
-#define AC_AMP_SET_RIGHT                (1<<12)
-#define AC_AMP_SET_LEFT                 (1<<13)
-#define AC_AMP_SET_INPUT                (1<<14)
-#define AC_AMP_SET_OUTPUT               (1<<15)
-
-/* DIGITAL1 bits */
-#define AC_DIG1_ENABLE                  (1<<0)
-#define AC_DIG1_V                       (1<<1)
-#define AC_DIG1_VCFG                    (1<<2)
-#define AC_DIG1_EMPHASIS                (1<<3)
-#define AC_DIG1_COPYRIGHT               (1<<4)
-#define AC_DIG1_NONAUDIO                (1<<5)
-#define AC_DIG1_PROFESSIONAL            (1<<6)
-#define AC_DIG1_LEVEL                   (1<<7)
-
-/* DIGITAL2 bits */
-#define AC_DIG2_CC                      (0x7f<<0)
-
-/* DIGITAL3 bits */
-#define AC_DIG3_ICT                     (0xf<<0)
-#define AC_DIG3_KAE                     (1<<7)
-
-/* Pin widget control - 8bit */
-#define AC_PINCTL_EPT                   (0x3<<0)
-#define AC_PINCTL_EPT_NATIVE            0
-#define AC_PINCTL_EPT_HBR               3
-#define AC_PINCTL_VREFEN                (0x7<<0)
-#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% */
-#define AC_PINCTL_IN_EN                 (1<<5)
-#define AC_PINCTL_OUT_EN                (1<<6)
-#define AC_PINCTL_HP_EN                 (1<<7)
-
-/* Pin sense - 32bit */
-#define AC_PINSENSE_IMPEDANCE_MASK      (0x7fffffff)
-#define AC_PINSENSE_PRESENCE            (1<<31)
-#define AC_PINSENSE_ELDV                (1<<30) /* ELD valid (HDMI) */
-
-/* EAPD/BTL enable - 32bit */
-#define AC_EAPDBTL_BALANCED             (1<<0)
-#define AC_EAPDBTL_EAPD                 (1<<1)
-#define AC_EAPDBTL_LR_SWAP              (1<<2)
-
-/* HDMI ELD data */
-#define AC_ELDD_ELD_VALID               (1<<31)
-#define AC_ELDD_ELD_DATA                0xff
-
-/* HDMI DIP size */
-#define AC_DIPSIZE_ELD_BUF              (1<<3) /* ELD buf size of packet size */
-#define AC_DIPSIZE_PACK_IDX             (0x07<<0) /* packet index */
-
-/* HDMI DIP index */
-#define AC_DIPIDX_PACK_IDX              (0x07<<5) /* packet idnex */
-#define AC_DIPIDX_BYTE_IDX              (0x1f<<0) /* byte index */
-
-/* HDMI DIP xmit (transmit) control */
-#define AC_DIPXMIT_MASK                 (0x3<<6)
-#define AC_DIPXMIT_DISABLE              (0x0<<6) /* disable xmit */
-#define AC_DIPXMIT_ONCE                 (0x2<<6) /* xmit once then disable */
-#define AC_DIPXMIT_BEST                 (0x3<<6) /* best effort */
-
-/* HDMI content protection (CP) control */
-#define AC_CPCTRL_CES                   (1<<9) /* current encryption state */
-#define AC_CPCTRL_READY                 (1<<8) /* ready bit */
-#define AC_CPCTRL_SUBTAG                (0x1f<<3) /* subtag for unsol-resp */
-#define AC_CPCTRL_STATE                 (3<<0) /* current CP request state */
-
-/* Converter channel <-> HDMI slot mapping */
-#define AC_CVTMAP_HDMI_SLOT             (0xf<<0) /* HDMI slot number */
-#define AC_CVTMAP_CHAN                  (0xf<<4) /* converter channel number */
-
-/* configuration default - 32bit */
-#define AC_DEFCFG_SEQUENCE              (0xf<<0)
-#define AC_DEFCFG_DEF_ASSOC             (0xf<<4)
-#define AC_DEFCFG_ASSOC_SHIFT           4
-#define AC_DEFCFG_MISC                  (0xf<<8)
-#define AC_DEFCFG_MISC_SHIFT            8
-#define AC_DEFCFG_MISC_NO_PRESENCE      (1<<0)
-#define AC_DEFCFG_COLOR                 (0xf<<12)
-#define AC_DEFCFG_COLOR_SHIFT           12
-#define AC_DEFCFG_CONN_TYPE             (0xf<<16)
-#define AC_DEFCFG_CONN_TYPE_SHIFT       16
-#define AC_DEFCFG_DEVICE                (0xf<<20)
-#define AC_DEFCFG_DEVICE_SHIFT          20
-#define AC_DEFCFG_LOCATION              (0x3f<<24)
-#define AC_DEFCFG_LOCATION_SHIFT        24
-#define AC_DEFCFG_PORT_CONN             (0x3<<30)
-#define AC_DEFCFG_PORT_CONN_SHIFT       30
-
-/* Display pin's device list entry */
-#define AC_DE_PD                        (1<<0)
-#define AC_DE_ELDV                      (1<<1)
-#define AC_DE_IA                        (1<<2)
-
-/* device device types (0x0-0xf) */
-enum {
-        AC_JACK_LINE_OUT,
-        AC_JACK_SPEAKER,
-        AC_JACK_HP_OUT,
-        AC_JACK_CD,
-        AC_JACK_SPDIF_OUT,
-        AC_JACK_DIG_OTHER_OUT,
-        AC_JACK_MODEM_LINE_SIDE,
-        AC_JACK_MODEM_HAND_SIDE,
-        AC_JACK_LINE_IN,
-        AC_JACK_AUX,
-        AC_JACK_MIC_IN,
-        AC_JACK_TELEPHONY,
-        AC_JACK_SPDIF_IN,
-        AC_JACK_DIG_OTHER_IN,
-        AC_JACK_OTHER = 0xf,
-};
-
-/* jack connection types (0x0-0xf) */
-enum {
-        AC_JACK_CONN_UNKNOWN,
-        AC_JACK_CONN_1_8,
-        AC_JACK_CONN_1_4,
-        AC_JACK_CONN_ATAPI,
-        AC_JACK_CONN_RCA,
-        AC_JACK_CONN_OPTICAL,
-        AC_JACK_CONN_OTHER_DIGITAL,
-        AC_JACK_CONN_OTHER_ANALOG,
-        AC_JACK_CONN_DIN,
-        AC_JACK_CONN_XLR,
-        AC_JACK_CONN_RJ11,
-        AC_JACK_CONN_COMB,
-        AC_JACK_CONN_OTHER = 0xf,
-};
-
-/* jack colors (0x0-0xf) */
-enum {
-        AC_JACK_COLOR_UNKNOWN,
-        AC_JACK_COLOR_BLACK,
-        AC_JACK_COLOR_GREY,
-        AC_JACK_COLOR_BLUE,
-        AC_JACK_COLOR_GREEN,
-        AC_JACK_COLOR_RED,
-        AC_JACK_COLOR_ORANGE,
-        AC_JACK_COLOR_YELLOW,
-        AC_JACK_COLOR_PURPLE,
-        AC_JACK_COLOR_PINK,
-        AC_JACK_COLOR_WHITE = 0xe,
-        AC_JACK_COLOR_OTHER,
-};
-
-/* Jack location (0x0-0x3f) */
-/* common case */
-enum {
-        AC_JACK_LOC_NONE,
-        AC_JACK_LOC_REAR,
-        AC_JACK_LOC_FRONT,
-        AC_JACK_LOC_LEFT,
-        AC_JACK_LOC_RIGHT,
-        AC_JACK_LOC_TOP,
-        AC_JACK_LOC_BOTTOM,
-};
-/* bits 4-5 */
-enum {
-        AC_JACK_LOC_EXTERNAL = 0x00,
-        AC_JACK_LOC_INTERNAL = 0x10,
-        AC_JACK_LOC_SEPARATE = 0x20,
-        AC_JACK_LOC_OTHER    = 0x30,
-};
-enum {
-        /* external on primary chasis */
-        AC_JACK_LOC_REAR_PANEL = 0x07,
-        AC_JACK_LOC_DRIVE_BAY,
-        /* internal */
-        AC_JACK_LOC_RISER = 0x17,
-        AC_JACK_LOC_HDMI,
-        AC_JACK_LOC_ATAPI,
-        /* others */
-        AC_JACK_LOC_MOBILE_IN = 0x37,
-        AC_JACK_LOC_MOBILE_OUT,
-};
-
-/* Port connectivity (0-3) */
-enum {
-        AC_JACK_PORT_COMPLEX,
-        AC_JACK_PORT_NONE,
-        AC_JACK_PORT_FIXED,
-        AC_JACK_PORT_BOTH,
-};
-
-/* max. codec address */
-#define HDA_MAX_CODEC_ADDRESS   0x0f
+#include <sound/hda_verbs.h>
 
 /*
  * generic arrays