Commit bc13d60e authored by Shuijing Li's avatar Shuijing Li Committed by Thierry Reding

pwm: mtk_disp: Fix the disable flow of disp_pwm

There is a flow error in the original mtk_disp_pwm_apply() function.
If this function is called when the clock is disabled, there will be a
chance to operate the disp_pwm register, resulting in disp_pwm exception.
Fix this accordingly.

Fixes: 888a623d ("pwm: mtk-disp: Implement atomic API .apply()")
Signed-off-by: default avatarShuijing Li <shuijing.li@mediatek.com>
Reviewed-by: default avatarMatthias Brugger <matthias.bgg@gmail.com>
Tested-by: default avatarFei Shao <fshao@chromium.org>
Acked-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Reviewed-by: default avatarAlexandre Mergnat <amergnat@baylibre.com>
Reviewed-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Signed-off-by: default avatarThierry Reding <thierry.reding@gmail.com>
parent 05b743db
...@@ -79,14 +79,11 @@ static int mtk_disp_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm, ...@@ -79,14 +79,11 @@ static int mtk_disp_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,
if (state->polarity != PWM_POLARITY_NORMAL) if (state->polarity != PWM_POLARITY_NORMAL)
return -EINVAL; return -EINVAL;
if (!state->enabled) { if (!state->enabled && mdp->enabled) {
mtk_disp_pwm_update_bits(mdp, DISP_PWM_EN, mdp->data->enable_mask, mtk_disp_pwm_update_bits(mdp, DISP_PWM_EN,
0x0); mdp->data->enable_mask, 0x0);
clk_disable_unprepare(mdp->clk_mm);
if (mdp->enabled) { clk_disable_unprepare(mdp->clk_main);
clk_disable_unprepare(mdp->clk_mm);
clk_disable_unprepare(mdp->clk_main);
}
mdp->enabled = false; mdp->enabled = false;
return 0; return 0;
......
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