TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ALSA: hda - add more ML register definitions

Browse Source 
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>
This commit is contained in:
Libin Yang
2017-04-06 19:18:20 +08:00
committed by Takashi Iwai
parent 7e1621de14
commit dde5bff541
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/sound/hda_register.h
+5 -3
View File
@@ -261,9 +261,11 @@ enum { SDI0, SDI1, SDI2, SDI3, SDO0, SDO1, SDO2, SDO3 };
#define AZX_REG_ML_LOUTPAY 0x20 #define AZX_REG_ML_LOUTPAY 0x20
#define AZX_REG_ML_LINPAY 0x30 #define AZX_REG_ML_LINPAY 0x30
#define AZX_MLCTL_SPA (1<<16) #define ML_LCTL_SCF_MASK 0xF
#define AZX_MLCTL_CPA 23 #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 */ /* registers for DMA Resume Capability Structure */
#define AZX_DRSM_CAP_ID 0x5 #define AZX_DRSM_CAP_ID 0x5
sound/hda/ext/hdac_ext_controller.c
+3 -3
View File
@@ -171,7 +171,7 @@ static int check_hdac_link_power_active(struct hdac_ext_link *link, bool enable)
{ {
int timeout; int timeout;
u32 val; u32 val;
int mask = (1 << AZX_MLCTL_CPA); int mask = (1 << AZX_MLCTL_CPA_SHIFT);
udelay(3); udelay(3);
timeout = 150; timeout = 150;
@@ -179,10 +179,10 @@ static int check_hdac_link_power_active(struct hdac_ext_link *link, bool enable)
do { do {
val = readl(link->ml_addr + AZX_REG_ML_LCTL); val = readl(link->ml_addr + AZX_REG_ML_LCTL);
if (enable) { if (enable) {
if (((val & mask) >> AZX_MLCTL_CPA)) if (((val & mask) >> AZX_MLCTL_CPA_SHIFT))
return 0; return 0;
} else { } else {
if (!((val & mask) >> AZX_MLCTL_CPA)) if (!((val & mask) >> AZX_MLCTL_CPA_SHIFT))
return 0; return 0;
} }
udelay(3); udelay(3);