Skip to contentSkip to conversation

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

PATCH Superseded [email protected] 2 participants 3 messages Sep 23, 2022 – Sep 29, 2022

Subsystems (2)

v2 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 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, the result of reading con0 & BIT(0) is enabled as disp_pwm.
In order to conform to the register table, we should use the disp_pwm base address as the enabled judgment.

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

---
Base on the branch of Linux-next/master.

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

---
 drivers/pwm/pwm-mtk-disp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pwm/pwm-mtk-disp.c +1 -1
index c605013..1a9880d 100644
@@ -197,7 +197,7 @@ 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));
+	state->enabled = !!(readl(mdp->base + DISP_PWM_EN) & BIT(0));
 	clk_div = FIELD_GET(PWM_CLKDIV_MASK, con0);
 	period = FIELD_GET(PWM_PERIOD_MASK, con1);
 	/*
Signature · 1 line
2.6.4
#1 lore raw

Il 23/09/22 14:06, [email protected] ha scritto:

Quoted 25 lines

From: xinlei lee <[email protected]>

In the original mtk_disp_pwm_get_state() function, the result of reading con0 & BIT(0) is enabled as disp_pwm.
In order to conform to the register table, we should use the disp_pwm base address as the enabled judgment.

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

---
Base on the branch of Linux-next/master.

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

---
  drivers/pwm/pwm-mtk-disp.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pwm/pwm-mtk-disp.c +0 -0
index c605013..1a9880d 100644

drivers/pwm/pwm-mtk-disp.c static void mtk_disp_pwm_get_state(struct pwm_chip *chip, · line 200

Quoted 5 lines
drivers/pwm/pwm-mtk-disp.c +1 -1
@@ -197,7 +197,7 @@ 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));
+	state->enabled = !!(readl(mdp->base + DISP_PWM_EN) & BIT(0));

I think you mean mdp->data->enable_mask here.

Anyway, for the sake of human readability....

u32 clk_div, pwm_en, con0, con1;

pwm_en = readl(mdp->base + DISP_PWM_EN);

state->enabled = !!(pwm_en & mdp->data->enable_mask);

Regards,
Angelo

Quoted 4 lines
drivers/pwm/pwm-mtk-disp.c +0 -0
  	clk_div = FIELD_GET(PWM_CLKDIV_MASK, con0);
  	period = FIELD_GET(PWM_PERIOD_MASK, con1);
  	/*
author
#2 lore raw
Quoted 41 lines · AngeloGioacchino Del Regno

Il 23/09/22 14:06, [email protected] ha scritto:

Quoted 29 lines

From: xinlei lee <[email protected]>

In the original mtk_disp_pwm_get_state() function, the result of reading
con0 & BIT(0) is enabled as disp_pwm.
In order to conform to the register table, we should use the disp_pwm
base address as the enabled judgment.

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

.get_state()")

---
Base on the branch of Linux-next/master.

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

---
  drivers/pwm/pwm-mtk-disp.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pwm/pwm-mtk- renamed from drivers/pwm/pwm-mtk-disp.c +0 -0

disp.c
index c605013..1a9880d 100644

drivers/pwm/pwm-mtk-disp.c static void mtk_disp_pwm_get_state(struct · line 201

Quoted 6 lines
drivers/pwm/pwm-mtk-disp.c +1 -1
@@ -197,7 +197,7 @@ 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));
+	state->enabled = !!(readl(mdp->base + DISP_PWM_EN) & BIT(0));

I think you mean mdp->data->enable_mask here.

Anyway, for the sake of human readability....

Quoted 15 lines

u32 clk_div, pwm_en, con0, con1;

pwm_en = readl(mdp->base + DISP_PWM_EN);

state->enabled = !!(pwm_en & mdp->data->enable_mask);

Regards,
Angelo

Quoted 4 lines
drivers/pwm/pwm-mtk-disp.c +0 -0
  	clk_div = FIELD_GET(PWM_CLKDIV_MASK, con0);
  	period = FIELD_GET(PWM_PERIOD_MASK, con1);

/*

Hi Angelo:

Thanks for your suggestion.
I will modify the code for readability.

Best Regards!
Xinlei