summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchasewu <chasewu@google.com>2021-09-24 00:18:18 +0800
committerChase Wu <chasewu@google.com>2021-09-30 06:30:36 +0000
commit0b8c23f3a0d6ec55cf4f152040bb62a67845778e (patch)
treee16a3ded698b9c0210bf470b5b5c4683fa9eb510
parent17d6627ee33948a121eed5c98347eca7f711b54e (diff)
downloadamplifiers-0b8c23f3a0d6ec55cf4f152040bb62a67845778e.tar.gz
ASoC: cs40l25: Remove standby and wake from clock swap
Remove force firmware standby and force firmware wake since it is not required. Bug: 200067948 Test: Manual trigger audio coupled haptics by sound picker Test: Typing, receive a notification Change-Id: I96155838a0edb165bf0d19e531606d9a75e8b585 Signed-off-by: Paul Handrigan <Paul.Handrigan@cirrus.com> Signed-off-by: chasewu <chasewu@google.com>
-rw-r--r--cs40l25/snd-soc-codec-cs40l2x.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/cs40l25/snd-soc-codec-cs40l2x.c b/cs40l25/snd-soc-codec-cs40l2x.c
index 1e95888..de4aff8 100644
--- a/cs40l25/snd-soc-codec-cs40l2x.c
+++ b/cs40l25/snd-soc-codec-cs40l2x.c
@@ -130,8 +130,7 @@ static int cs40l2x_swap_ext_clk(struct cs40l2x_codec *priv,
{
struct device *dev = priv->dev;
struct regmap *regmap = priv->regmap;
- struct cs40l2x_private *core = priv->core;
- int clk_cfg, ret;
+ int clk_cfg;
if (src == CS40L2X_32KHZ_CLK)
clk_cfg = cs40l2x_get_clk_config(CS40L2X_MCLK_FREQ);
@@ -143,11 +142,6 @@ static int cs40l2x_swap_ext_clk(struct cs40l2x_codec *priv,
return -EINVAL;
}
- ret = cs40l2x_ack_write(core, CS40L2X_MBOX_POWERCONTROL,
- CS40L2X_PWRCTL_FORCE_STBY, CS40L2X_PWRCTL_NONE);
- if (ret)
- return ret;
-
regmap_update_bits(regmap, CS40L2X_PLL_CLK_CTRL,
CS40L2X_PLL_OPEN_LOOP_MASK,
CS40L2X_PLL_OPEN_LOOP_MASK);
@@ -173,8 +167,7 @@ static int cs40l2x_swap_ext_clk(struct cs40l2x_codec *priv,
usleep_range(1000, 1500);
- return cs40l2x_ack_write(core, CS40L2X_MBOX_POWERCONTROL,
- CS40L2X_PWRCTL_WAKE, CS40L2X_PWRCTL_NONE);
+ return 0;
}
static int cs40l2x_clk_en(struct snd_soc_dapm_widget *w,