ALSA: hda - add more ML register definitions

This patch refines the definition of AZX_MLCTL_SPA and AZX_MLCTL_CPA
and add more definitions of ML registers

Signed-off-by: Libin Yang <libin.yang@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/include/sound/hda_register.h b/include/sound/hda_register.h
index 1251ff41c9d3efbc729e634846804b06aa5a69c9..15fc6daf909657ac7237c896cbc2de9b4ff04b18 100644 (file)
--- a/include/sound/hda_register.h
+++ b/include/sound/hda_register.h
@@ -261,9 +261,11 @@ enum { SDI0, SDI1, SDI2, SDI3, SDO0, SDO1, SDO2, SDO3 };
 #define AZX_REG_ML_LOUTPAY             0x20
 #define AZX_REG_ML_LINPAY              0x30
 
-#define AZX_MLCTL_SPA                  (1<<16)
-#define AZX_MLCTL_CPA                  23
-
+#define ML_LCTL_SCF_MASK                       0xF
+#define AZX_MLCTL_SPA                          (0x1 << 16)
+#define AZX_MLCTL_CPA                          (0x1 << 23)
+#define AZX_MLCTL_SPA_SHIFT                    16
+#define AZX_MLCTL_CPA_SHIFT                    23
 
 /* registers for DMA Resume Capability Structure */
 #define AZX_DRSM_CAP_ID                        0x5

diff --git a/sound/hda/ext/hdac_ext_controller.c b/sound/hda/ext/hdac_ext_controller.c
index 261469188566c95eb1677266b8c92a7f34d53ad5..84f3b81687164d419b4cff063011d774790273f3 100644 (file)
--- a/sound/hda/ext/hdac_ext_controller.c
+++ b/sound/hda/ext/hdac_ext_controller.c
@@ -171,7 +171,7 @@ static int check_hdac_link_power_active(struct hdac_ext_link *link, bool enable)
 {
        int timeout;
        u32 val;
-       int mask = (1 << AZX_MLCTL_CPA);
+       int mask = (1 << AZX_MLCTL_CPA_SHIFT);
 
        udelay(3);
        timeout = 150;
@@ -179,10 +179,10 @@ static int check_hdac_link_power_active(struct hdac_ext_link *link, bool enable)
        do {
                val = readl(link->ml_addr + AZX_REG_ML_LCTL);
                if (enable) {
-                       if (((val & mask) >> AZX_MLCTL_CPA))
+                       if (((val & mask) >> AZX_MLCTL_CPA_SHIFT))
                                return 0;
                } else {
-                       if (!((val & mask) >> AZX_MLCTL_CPA))
+                       if (!((val & mask) >> AZX_MLCTL_CPA_SHIFT))
                                return 0;
                }
                udelay(3);