openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ALSA: hdac: Fix to read the correct offset of spcap/link register 

SPCAP and Mutilink register offset were incorrect as offset needs
to be based on capability offset. So correct the offset for
read/write of spcap/link register.

Signed-off-by: Jeeja KP <jeeja.kp@intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Jeeja KP 2015-08-21 21:36:17 +05:30 committed by Takashi Iwai
parent 9bc07dfbcd
commit a7e3dd85ca
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sound/hda/ext/hdac_ext_controller.c
View File

@ -177,8 +177,8 @@ int snd_hdac_ext_bus_get_ml_capabilities(struct hdac_ext_bus *ebus)
hlink->bus = bus; hlink->bus = bus;
hlink->ml_addr = ebus->mlcap + AZX_ML_BASE + hlink->ml_addr = ebus->mlcap + AZX_ML_BASE +
(AZX_ML_INTERVAL * idx); (AZX_ML_INTERVAL * idx);
hlink->lcaps = snd_hdac_chip_readl(bus, ML_LCAP); hlink->lcaps = readl(hlink->ml_addr + AZX_REG_ML_LCAP);
hlink->lsdiid = snd_hdac_chip_readw(bus, ML_LSDIID); hlink->lsdiid = readw(hlink->ml_addr + AZX_REG_ML_LSDIID);
list_add_tail(&hlink->list, &ebus->hlink_list); list_add_tail(&hlink->list, &ebus->hlink_list);
} }
@ -243,7 +243,7 @@ static int check_hdac_link_power_active(struct hdac_ext_link *link, bool enable)
timeout = 50; timeout = 50;
do { do {
val = snd_hdac_chip_readl(link->bus, 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))
return 0; return 0;
@ -263,7 +263,7 @@ static int check_hdac_link_power_active(struct hdac_ext_link *link, bool enable)
*/ */
int snd_hdac_ext_bus_link_power_up(struct hdac_ext_link *link) int snd_hdac_ext_bus_link_power_up(struct hdac_ext_link *link)
{ {
snd_hdac_chip_updatel(link->bus, ML_LCTL, 0, AZX_MLCTL_SPA); snd_hdac_updatel(link->ml_addr, AZX_REG_ML_LCTL, 0, AZX_MLCTL_SPA);
return check_hdac_link_power_active(link, true); return check_hdac_link_power_active(link, true);
} }
@ -275,7 +275,7 @@ EXPORT_SYMBOL_GPL(snd_hdac_ext_bus_link_power_up);
*/ */
int snd_hdac_ext_bus_link_power_down(struct hdac_ext_link *link) int snd_hdac_ext_bus_link_power_down(struct hdac_ext_link *link)
{ {
snd_hdac_chip_updatel(link->bus, ML_LCTL, AZX_MLCTL_SPA, 0); snd_hdac_updatel(link->ml_addr, AZX_REG_ML_LCTL, AZX_MLCTL_SPA, 0);
return check_hdac_link_power_active(link, false); return check_hdac_link_power_active(link, false);
} }

2
sound/hda/ext/hdac_ext_stream.c
View File

@ -423,7 +423,7 @@ void snd_hdac_ext_stream_spbcap_enable(struct hdac_ext_bus *ebus,
mask |= (1 << index); mask |= (1 << index);
register_mask = snd_hdac_chip_readl(bus, SPB_SPBFCCTL); register_mask = readl(ebus->spbcap + AZX_REG_SPB_SPBFCCTL);
mask |= register_mask; mask |= register_mask;