Commit 457f74ab authored by Simon South's avatar Simon South Committed by Thierry Reding

pwm: rockchip: Keep enabled PWMs running while probing

Following commit cfc4c189 ("pwm: Read initial hardware state at
request time") the Rockchip PWM driver can no longer assume a device's
pwm_state structure has been populated after a call to pwmchip_add().
Consequently, the test in rockchip_pwm_probe() intended to prevent the
driver from stopping PWM devices already enabled by the bootloader no
longer functions reliably and this can lead to the kernel hanging
during startup, particularly on devices like the Pinebook Pro that use
a PWM-controlled backlight for their display.

Avoid this by querying the device directly at probe time to determine
whether or not it is enabled.

Fixes: cfc4c189 ("pwm: Read initial hardware state at request time")
Signed-off-by: default avatarSimon South <simon@simonsouth.net>
Reviewed-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Reviewed-by: default avatarHeiko Stuebner <heiko@sntech.de>
Signed-off-by: default avatarThierry Reding <thierry.reding@gmail.com>
parent 0142ee3f
...@@ -288,6 +288,7 @@ static int rockchip_pwm_probe(struct platform_device *pdev) ...@@ -288,6 +288,7 @@ static int rockchip_pwm_probe(struct platform_device *pdev)
const struct of_device_id *id; const struct of_device_id *id;
struct rockchip_pwm_chip *pc; struct rockchip_pwm_chip *pc;
struct resource *r; struct resource *r;
u32 enable_conf, ctrl;
int ret, count; int ret, count;
id = of_match_device(rockchip_pwm_dt_ids, &pdev->dev); id = of_match_device(rockchip_pwm_dt_ids, &pdev->dev);
...@@ -362,7 +363,9 @@ static int rockchip_pwm_probe(struct platform_device *pdev) ...@@ -362,7 +363,9 @@ static int rockchip_pwm_probe(struct platform_device *pdev)
} }
/* Keep the PWM clk enabled if the PWM appears to be up and running. */ /* Keep the PWM clk enabled if the PWM appears to be up and running. */
if (!pwm_is_enabled(pc->chip.pwms)) enable_conf = pc->data->enable_conf;
ctrl = readl_relaxed(pc->base + pc->data->regs.ctrl);
if ((ctrl & enable_conf) != enable_conf)
clk_disable(pc->clk); clk_disable(pc->clk);
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