From: Xinlei Lee <[email protected]>
Base on the branch of Linux-next/master.
The series mainly completes:
1. Add compatible for MediaTek MT8188 in the dt-bindings file.
2. Fix the parameters calculated by the enabled flag of disp_pwm in the
mtk_disp_pwm_get_state function;
xinlei lee (2):
dt-bindings: pwm: Add compatible for Mediatek MT8188
drivers: pwm: Add disp_pwm compatiable for MT8188
Documentation/devicetree/bindings/pwm/mediatek,pwm-disp.yaml | 1 +
drivers/pwm/pwm-mtk-disp.c | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
--
2.18.0
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()")
Signed-off-by: xinlei lee <[email protected]>
---
drivers/pwm/pwm-mtk-disp.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/pwm/pwm-mtk-disp.c b/drivers/pwm/pwm-mtk-disp.c
index c605013e4114..50425cd1de61 100644
--- a/drivers/pwm/pwm-mtk-disp.c
+++ b/drivers/pwm/pwm-mtk-disp.c
@@ -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) & BIT(0));
clk_div = FIELD_GET(PWM_CLKDIV_MASK, con0);
period = FIELD_GET(PWM_PERIOD_MASK, con1);
/*
--
2.18.0
From: xinlei lee <[email protected]>
Add dt-binding documentation of pwm for MediaTek MT8188 SoC.
Signed-off-by: xinlei lee <[email protected]>
---
Documentation/devicetree/bindings/pwm/mediatek,pwm-disp.yaml | 1 +
1 file changed, 1 insertion(+)
diff --git a/Documentation/devicetree/bindings/pwm/mediatek,pwm-disp.yaml b/Documentation/devicetree/bindings/pwm/mediatek,pwm-disp.yaml
index e4fe2d1bfef5..2dd93e8499f0 100644
--- a/Documentation/devicetree/bindings/pwm/mediatek,pwm-disp.yaml
+++ b/Documentation/devicetree/bindings/pwm/mediatek,pwm-disp.yaml
@@ -27,6 +27,7 @@ properties:
- items:
- enum:
- mediatek,mt8186-disp-pwm
+ - mediatek,mt8188-disp-pwm
- mediatek,mt8192-disp-pwm
- mediatek,mt8195-disp-pwm
- const: mediatek,mt8183-disp-pwm
--
2.18.0
On 23/08/2022 10:31, [email protected] wrote:
> 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()")
> Signed-off-by: xinlei lee <[email protected]>
This is a fix so not really related with the change adding new device.
Send them separately in the future.
Best regards,
Krzysztof
On 23/08/2022 10:31, [email protected] wrote:
> From: xinlei lee <[email protected]>
>
> Add dt-binding documentation of pwm for MediaTek MT8188 SoC.
>
> Signed-off-by: xinlei lee <[email protected]>
> ---
> Documentation/devicetree/bindings/pwm/mediatek,pwm-disp.yaml | 1 +
Acked-by: Krzysztof Kozlowski <[email protected]>
Best regards,
Krzysztof
> 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()")
> Signed-off-by: xinlei lee <[email protected]>
> ---
> drivers/pwm/pwm-mtk-disp.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/pwm/pwm-mtk-disp.c b/drivers/pwm/pwm-mtk-disp.c
> index c605013e4114..50425cd1de61 100644
> --- a/drivers/pwm/pwm-mtk-disp.c
> +++ b/drivers/pwm/pwm-mtk-disp.c
> @@ -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) & BIT(0));
> clk_div = FIELD_GET(PWM_CLKDIV_MASK, con0);
> period = FIELD_GET(PWM_PERIOD_MASK, con1);
> /*
Reviewed-by: Miles Chen <[email protected]>
Hello,
On Tue, Aug 23, 2022 at 03:31:14PM +0800, [email protected] wrote:
> From: xinlei lee <[email protected]>
>
> Add dt-binding documentation of pwm for MediaTek MT8188 SoC.
>
> Signed-off-by: xinlei lee <[email protected]>
Acked-by: Uwe Kleine-K?nig <[email protected]>
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-K?nig |
Industrial Linux Solutions | https://www.pengutronix.de/ |