From: Takashi Iwai <tiwai@suse.de>
To: libin.yang@intel.com
Cc: mengdong.lin@intel.com, alsa-devel@alsa-project.org,
infernix@infernix.net, rakesh.a.ughreja@intel.com,
jeeja.kp@intel.com
Subject: Re: [PATCH 1/2 v2] ALSA: hda - add more ML register definitions
Date: Fri, 07 Apr 2017 10:40:35 +0200 [thread overview]
Message-ID: <s5h37dka9vg.wl-tiwai@suse.de> (raw)
In-Reply-To: <1491477501-12379-1-git-send-email-libin.yang@intel.com>
On Thu, 06 Apr 2017 13:18:20 +0200,
libin.yang@intel.com wrote:
>
> From: Libin Yang <libin.yang@intel.com>
>
> 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>
Applied, thanks.
Takashi
> ---
> include/sound/hda_register.h | 8 +++++---
> sound/hda/ext/hdac_ext_controller.c | 6 +++---
> 2 files changed, 8 insertions(+), 6 deletions(-)
>
> diff --git a/include/sound/hda_register.h b/include/sound/hda_register.h
> index 0013063..8df12e4 100644
> --- a/include/sound/hda_register.h
> +++ b/include/sound/hda_register.h
> @@ -243,9 +243,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 2614691..84f3b81 100644
> --- 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);
> --
> 2.7.4
>
prev parent reply other threads:[~2017-04-07 8:40 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-06 11:18 [PATCH 1/2 v2] ALSA: hda - add more ML register definitions libin.yang
2017-04-06 11:18 ` [PATCH 2/2 v2] ALSA: hda - set intel audio clock to a proper value libin.yang
2017-04-07 8:40 ` Takashi Iwai
2017-04-07 8:40 ` Takashi Iwai [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=s5h37dka9vg.wl-tiwai@suse.de \
--to=tiwai@suse.de \
--cc=alsa-devel@alsa-project.org \
--cc=infernix@infernix.net \
--cc=jeeja.kp@intel.com \
--cc=libin.yang@intel.com \
--cc=mengdong.lin@intel.com \
--cc=rakesh.a.ughreja@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.