ASoC: Fixes for v5.19
A few more small fixes, they could all wait for the merge window if you prefer. -----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmLiiAAACgkQJNaLcl1U h9Bx5wf+I5flO6A6/bYzZumDQyJOwMAt8Dv9Try9B0BaReUdSlZWAn1lpCPjA8lj mYxCui20xSfvp2suRqVLU3UbhjqwOlYw7p1Jc3G1VHQQ+U7FQNNrQ4vFqlNpLj7B 0xychg6iKZFmqEPbcYMGuBch6W4GWo+7l83kyQu+UO6zRFHh9kHGK2OM+dznKB5g 9X8CO84/Jol38iZWf6JaiuyEoh33ZZ1TGqCrfSyS/VRWc2Phtj1QLgqMFeGf+7H3 DhajvNNcPcgiyNpaBwL9M9Uu/EE11czX+G/8kHy0Qc8yWNmWLIOCCn9V2/DXans8 CVsvsmssm7I4qmPPUlgq0nu4Yne2jA== =wNZ9 -----END PGP SIGNATURE----- Merge tag 'asoc-fix-v5.19-rc8' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus ASoC: Fixes for v5.19 A few more small fixes, they could all wait for the merge window if you prefer.
This commit is contained in:
Коммит
f38e6458e1
|
@ -199,6 +199,7 @@ struct va_macro {
|
|||
struct clk *mclk;
|
||||
struct clk *macro;
|
||||
struct clk *dcodec;
|
||||
struct clk *fsgen;
|
||||
struct clk_hw hw;
|
||||
struct lpass_macro *pds;
|
||||
|
||||
|
@ -467,9 +468,9 @@ static int va_macro_mclk_event(struct snd_soc_dapm_widget *w,
|
|||
|
||||
switch (event) {
|
||||
case SND_SOC_DAPM_PRE_PMU:
|
||||
return va_macro_mclk_enable(va, true);
|
||||
return clk_prepare_enable(va->fsgen);
|
||||
case SND_SOC_DAPM_POST_PMD:
|
||||
return va_macro_mclk_enable(va, false);
|
||||
clk_disable_unprepare(va->fsgen);
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
@ -1473,6 +1474,12 @@ static int va_macro_probe(struct platform_device *pdev)
|
|||
if (ret)
|
||||
goto err_clkout;
|
||||
|
||||
va->fsgen = clk_hw_get_clk(&va->hw, "fsgen");
|
||||
if (IS_ERR(va->fsgen)) {
|
||||
ret = PTR_ERR(va->fsgen);
|
||||
goto err_clkout;
|
||||
}
|
||||
|
||||
ret = devm_snd_soc_register_component(dev, &va_macro_component_drv,
|
||||
va_macro_dais,
|
||||
ARRAY_SIZE(va_macro_dais));
|
||||
|
|
|
@ -442,7 +442,6 @@ static bool max98373_volatile_reg(struct device *dev, unsigned int reg)
|
|||
{
|
||||
switch (reg) {
|
||||
case MAX98373_R2000_SW_RESET ... MAX98373_R2009_INT_FLAG3:
|
||||
case MAX98373_R203E_AMP_PATH_GAIN:
|
||||
case MAX98373_R2054_MEAS_ADC_PVDD_CH_READBACK:
|
||||
case MAX98373_R2055_MEAS_ADC_THERM_CH_READBACK:
|
||||
case MAX98373_R20B6_BDE_CUR_STATE_READBACK:
|
||||
|
|
|
@ -417,6 +417,7 @@ static struct rsnd_mod_ops rsnd_ssiu_ops_gen2 = {
|
|||
.name = SSIU_NAME,
|
||||
.dma_req = rsnd_ssiu_dma_req,
|
||||
.init = rsnd_ssiu_init_gen2,
|
||||
.quit = rsnd_ssiu_quit,
|
||||
.start = rsnd_ssiu_start_gen2,
|
||||
.stop = rsnd_ssiu_stop_gen2,
|
||||
.get_status = rsnd_ssiu_get_status,
|
||||
|
|
Загрузка…
Ссылка в новой задаче