Skip to content

Commit 36dd7f5

Browse files
AngeloGioacchino Del Regnothierryreding
authored andcommitted
pwm: mtk-disp: Disable shadow registers before setting backlight values
If shadow registers usage is not desired, disable that before performing any write to CON0/1 registers in the .apply() callback, otherwise we may lose clkdiv or period/width updates. Fixes: cd4b45a ("pwm: Add MediaTek MT2701 display PWM driver support") Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Reviewed-by: Nícolas F. R. A. Prado <nfraprado@collabora.com> Tested-by: Nícolas F. R. A. Prado <nfraprado@collabora.com> Reviewed-by: Alexandre Mergnat <amergnat@baylibre.com> Tested-by: Alexandre Mergnat <amergnat@baylibre.com> Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
1 parent fa359c1 commit 36dd7f5

1 file changed

Lines changed: 13 additions & 11 deletions

File tree

drivers/pwm/pwm-mtk-disp.c

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,19 @@ static int mtk_disp_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,
138138
high_width = mul_u64_u64_div_u64(state->duty_cycle, rate, div);
139139
value = period | (high_width << PWM_HIGH_WIDTH_SHIFT);
140140

141+
if (mdp->data->bls_debug && !mdp->data->has_commit) {
142+
/*
143+
* For MT2701, disable double buffer before writing register
144+
* and select manual mode and use PWM_PERIOD/PWM_HIGH_WIDTH.
145+
*/
146+
mtk_disp_pwm_update_bits(mdp, mdp->data->bls_debug,
147+
mdp->data->bls_debug_mask,
148+
mdp->data->bls_debug_mask);
149+
mtk_disp_pwm_update_bits(mdp, mdp->data->con0,
150+
mdp->data->con0_sel,
151+
mdp->data->con0_sel);
152+
}
153+
141154
mtk_disp_pwm_update_bits(mdp, mdp->data->con0,
142155
PWM_CLKDIV_MASK,
143156
clk_div << PWM_CLKDIV_SHIFT);
@@ -152,17 +165,6 @@ static int mtk_disp_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,
152165
mtk_disp_pwm_update_bits(mdp, mdp->data->commit,
153166
mdp->data->commit_mask,
154167
0x0);
155-
} else {
156-
/*
157-
* For MT2701, disable double buffer before writing register
158-
* and select manual mode and use PWM_PERIOD/PWM_HIGH_WIDTH.
159-
*/
160-
mtk_disp_pwm_update_bits(mdp, mdp->data->bls_debug,
161-
mdp->data->bls_debug_mask,
162-
mdp->data->bls_debug_mask);
163-
mtk_disp_pwm_update_bits(mdp, mdp->data->con0,
164-
mdp->data->con0_sel,
165-
mdp->data->con0_sel);
166168
}
167169

168170
mtk_disp_pwm_update_bits(mdp, DISP_PWM_EN, mdp->data->enable_mask,

0 commit comments

Comments
 (0)