Skip to contentSkip to conversation

pwm: mtk-disp: Fix the parameters calculated by the enabled flag of disp_pwm

PATCH In review [email protected] 3 participants 3 messages Oct 19, 2022

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v4 1/1 pwm: mtk-disp: Fix the parameters calculated by the enabled flag of disp_pwm

From: xinlei lee <[email protected]>

In the original mtk_disp_pwm_get_state() function wrongly uses bit 0 of CON0 to judge if the PWM is enabled.
However that is indicated by a bit (at a machine dependent position) in the DISP_PWM_EN register. Fix this accordingly.

Fixes 3f2b16734914 ("pwm: mtk-disp: Implement atomic API .get_state()")

---
Rebase on linus/master v6.1-rc1.

change since v3:
1. Remove the empty line between Fixes: and S-o-b.

change since v2:
1. Modify the code for readability.

change since v1:
1. Modify the way to set disp_pwm enbale.
---

---
 drivers/pwm/pwm-mtk-disp.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/pwm/pwm-mtk-disp.c +3 -2
index c605013e4114..3fbb4bae93a4 100644
@@ -178,7 +178,7 @@ static void mtk_disp_pwm_get_state(struct pwm_chip *chip,
 {
 	struct mtk_disp_pwm *mdp = to_mtk_disp_pwm(chip);
 	u64 rate, period, high_width;
-	u32 clk_div, con0, con1;
+	u32 clk_div, pwm_en, con0, con1;
 	int err;
 
 	err = clk_prepare_enable(mdp->clk_main);
@@ -197,7 +197,8 @@ static void mtk_disp_pwm_get_state(struct pwm_chip *chip,
 	rate = clk_get_rate(mdp->clk_main);
 	con0 = readl(mdp->base + mdp->data->con0);
 	con1 = readl(mdp->base + mdp->data->con1);
-	state->enabled = !!(con0 & BIT(0));
+	pwm_en = readl(mdp->base + DISP_PWM_EN);
+	state->enabled = !!(pwm_en & mdp->data->enable_mask);
 	clk_div = FIELD_GET(PWM_CLKDIV_MASK, con0);
 	period = FIELD_GET(PWM_PERIOD_MASK, con1);
 	/*
Signature · 1 line
2.18.0
Reviewed-by on v4 1/1
#1 lore raw
Quoted 9 lines · On Wed, Oct 19, 2022 at 05:42:18PM +0800, [email protected] wrote:

From: xinlei lee <[email protected]>

In the original mtk_disp_pwm_get_state() function wrongly uses bit 0 of CON0 to judge if the PWM is enabled.
However that is indicated by a bit (at a machine dependent position) in the DISP_PWM_EN register. Fix this accordingly.

Fixes 3f2b16734914 ("pwm: mtk-disp: Implement atomic API .get_state()")

Nice commit log text :-)

This now matches the bit that the .apply() callback sets, so looks right.

Best regards
Uwe

Signature · 2 lines
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | https://www.pengutronix.de/ |
maintainer Reviewed-by on v4 1/1
#2 lore raw
In reply to [email protected]

Il 19/10/22 11:42, [email protected] ha scritto:

Quoted 10 lines

From: xinlei lee <[email protected]>

In the original mtk_disp_pwm_get_state() function wrongly uses bit 0 of CON0 to judge if the PWM is enabled.
However that is indicated by a bit (at a machine dependent position) in the DISP_PWM_EN register. Fix this accordingly.

Fixes 3f2b16734914 ("pwm: mtk-disp: Implement atomic API .get_state()")