shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 03:15:31 +09:00
Code Issues Packages Projects Releases Wiki Activity

pwm: rockchip: fix the global ctrl configurations

Browse Source 
1.Add pinctrl config in rockchip_pwm_global_ctrl().
2.Config the dclk for grant channel in PWM_GLOBAL_CTRL_ENABLE
  and PWM_GLOBAL_CTRL_DISABLE commands.
3.Add flag is_clk_enabled to confirm the status of dclk.

Change-Id: I9a377d6a72d2f242f9df5e707c42d86db0c13f69
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
This commit is contained in:
Damon Ding
2024-02-21 16:00:04 +08:00
committed by Tao Huang
parent a1f5874163
commit 4a1608c53a
1 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/pwm/pwm-rockchip.c
View File

@@ -246,6 +246,7 @@ struct rockchip_pwm_chip {
struct dentry *debugfs;
void __iomem *base;
unsigned long clk_rate;
unsigned long is_clk_enabled;
bool vop_pwm_en; /* indicate voppwm mirror register state */
bool center_aligned;
bool oneshot_en;
@@ -1114,6 +1115,7 @@ static int rockchip_pwm_global_ctrl_v4(struct pwm_chip *chip, struct pwm_device
struct rockchip_pwm_chip *pc = to_rockchip_pwm_chip(chip);
u32 arbiter = 0;
u32 val = 0;
int ret = 0;
switch (cmd) {
case PWM_GLOBAL_CTRL_JOIN:
@@ -1159,6 +1161,12 @@ static int rockchip_pwm_global_ctrl_v4(struct pwm_chip *chip, struct pwm_device
return -EINVAL;
}
if (!test_and_set_bit(0, &pc->is_clk_enabled)) {
ret = clk_enable(pc->clk);
if (ret)
return ret;
}
writel_relaxed(PWM_CLK_EN(true), pc->base + ENABLE);
writel_relaxed(GLOBAL_PWM_EN(true), pc->base + GLOBAL_CTRL);
break;
@@ -1171,6 +1179,10 @@ static int rockchip_pwm_global_ctrl_v4(struct pwm_chip *chip, struct pwm_device
writel_relaxed(PWM_CLK_EN(false), pc->base + ENABLE);
writel_relaxed(GLOBAL_PWM_EN(false), pc->base + GLOBAL_CTRL);
if (test_and_clear_bit(0, &pc->is_clk_enabled))
clk_disable(pc->clk);
break;
default:
dev_err(chip->dev, "Unsupported global ctrl cmd %d\n", cmd);
@@ -1209,6 +1221,12 @@ int rockchip_pwm_global_ctrl(struct pwm_device *pwm, enum rockchip_pwm_global_ct
if (ret)
return ret;
ret = pinctrl_select_state(pc->pinctrl, pc->active_state);
if (ret) {
dev_err(chip->dev, "Failed to select pinctrl state\n");
goto err_disable_pclk;
}
ret = pc->data->funcs.global_ctrl(chip, pwm, cmd);
if (ret) {
dev_err(chip->dev, "Failed to execute global ctrl cmd %d for PWM%d\n",