Skip to content

ASoC: madera: Unset SYSCLK_ENA while configuring system clock #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
swstephenson wants to merge 1 commit into
base: v5.4-madera
Choose a base branch
from
Open

ASoC: madera: Unset SYSCLK_ENA while configuring system clock #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 19 additions & 2 deletions sound/soc/codecs/madera.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2911,7 +2911,7 @@ int madera_set_sysclk(struct snd_soc_component *component, int clk_id,
reg = MADERA_SYSTEM_CLOCK_1;
clk = &priv->sysclk;
clk_freq_sel = madera_get_sysclk_setting(freq);
mask |= MADERA_SYSCLK_FRAC;
mask |= MADERA_SYSCLK_FRAC | MADERA_SYSCLK_ENA;
break;
case MADERA_CLK_ASYNCCLK_1:
name = "ASYNCCLK";
Expand Down Expand Up @@ -2971,7 +2971,24 @@ int madera_set_sysclk(struct snd_soc_component *component, int clk_id,

dev_dbg(madera->dev, "%s set to %uHz\n", name, freq);

return regmap_update_bits(madera->regmap, reg, mask, val);
ret = regmap_update_bits(madera->regmap, reg, mask, val);
if (ret)
{
dev_err(madera->dev, "Failed to set sysclk\n");
return ret;
}

if (clk_id == MADERA_CLK_SYSCLK_1)
{
ret = regmap_update_bits(madera->regmap, reg, MADERA_SYSCLK_ENA_MASK, MADERA_SYSCLK_ENA);
if (ret)
{
dev_err(madera->dev, "Failed to set SYSCLK_ENA");
return ret;
}
}

return 0;
}
EXPORT_SYMBOL_GPL(madera_set_sysclk);

Expand Down