Commit ea79b0a6 authored by Syed Saba Kareem's avatar Syed Saba Kareem Committed by Mark Brown

ASoC: amd: ps: refactor acp power on and reset functions.

Instead of a busy waiting while loop using udelay in
acp63_power_on and acp63_reset functions use readl_poll_timeout
function to check the condition.

Signed-off-by: Syed Saba Kareem <Syed.SabaKareem@amd.com
Reviewed-by: Vijendar Mukunda <Vijendar.Mukunda@amd.com
Link: https://lore.kernel.org/r/20230426122219.3745586-2-Syed.SabaKareem@amd.com
Signed-off-by: Mark Brown <broonie@kernel.org
parent ec54f810
...@@ -58,6 +58,9 @@ ...@@ -58,6 +58,9 @@
#define ACP63_PDM_DEV_MASK 1 #define ACP63_PDM_DEV_MASK 1
#define ACP_DMIC_DEV 2 #define ACP_DMIC_DEV 2
/* time in ms for acp timeout */
#define ACP_TIMEOUT 500
enum acp_config { enum acp_config {
ACP_CONFIG_0 = 0, ACP_CONFIG_0 = 0,
ACP_CONFIG_1, ACP_CONFIG_1,
......
...@@ -14,13 +14,13 @@ ...@@ -14,13 +14,13 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <sound/pcm_params.h> #include <sound/pcm_params.h>
#include <linux/pm_runtime.h> #include <linux/pm_runtime.h>
#include <linux/iopoll.h>
#include "acp63.h" #include "acp63.h"
static int acp63_power_on(void __iomem *acp_base) static int acp63_power_on(void __iomem *acp_base)
{ {
u32 val; u32 val;
int timeout;
val = readl(acp_base + ACP_PGFSM_STATUS); val = readl(acp_base + ACP_PGFSM_STATUS);
...@@ -29,38 +29,26 @@ static int acp63_power_on(void __iomem *acp_base) ...@@ -29,38 +29,26 @@ static int acp63_power_on(void __iomem *acp_base)
if ((val & ACP_PGFSM_STATUS_MASK) != ACP_POWER_ON_IN_PROGRESS) if ((val & ACP_PGFSM_STATUS_MASK) != ACP_POWER_ON_IN_PROGRESS)
writel(ACP_PGFSM_CNTL_POWER_ON_MASK, acp_base + ACP_PGFSM_CONTROL); writel(ACP_PGFSM_CNTL_POWER_ON_MASK, acp_base + ACP_PGFSM_CONTROL);
timeout = 0;
while (++timeout < 500) { return readl_poll_timeout(acp_base + ACP_PGFSM_STATUS, val, !val, DELAY_US, ACP_TIMEOUT);
val = readl(acp_base + ACP_PGFSM_STATUS);
if (!val)
return 0;
udelay(1);
}
return -ETIMEDOUT;
} }
static int acp63_reset(void __iomem *acp_base) static int acp63_reset(void __iomem *acp_base)
{ {
u32 val; u32 val;
int timeout; int ret;
writel(1, acp_base + ACP_SOFT_RESET); writel(1, acp_base + ACP_SOFT_RESET);
timeout = 0;
while (++timeout < 500) { ret = readl_poll_timeout(acp_base + ACP_SOFT_RESET, val,
val = readl(acp_base + ACP_SOFT_RESET); val & ACP_SOFT_RESET_SOFTRESET_AUDDONE_MASK,
if (val & ACP_SOFT_RESET_SOFTRESET_AUDDONE_MASK) DELAY_US, ACP_TIMEOUT);
break; if (ret)
cpu_relax(); return ret;
}
writel(0, acp_base + ACP_SOFT_RESET); writel(0, acp_base + ACP_SOFT_RESET);
timeout = 0;
while (++timeout < 500) { return readl_poll_timeout(acp_base + ACP_SOFT_RESET, val, !val, DELAY_US, ACP_TIMEOUT);
val = readl(acp_base + ACP_SOFT_RESET);
if (!val)
return 0;
cpu_relax();
}
return -ETIMEDOUT;
} }
static void acp63_enable_interrupts(void __iomem *acp_base) static void acp63_enable_interrupts(void __iomem *acp_base)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment