Skip to content

Commit 58803ad

Browse files
author
Uwe Kleine-König
committed
pwm: vt8500: Change prototype of a helper to prepare further changes
This prepares the driver for further changes that will make it harder to determine the pwm_chip from a given vt8500_chip. To just not have to do that, rework vt8500_pwm_busy_wait() to take a pwm_chip. Link: https://lore.kernel.org/r/fb384c550b359e7707219f87872bcf36482875ff.1707900770.git.u.kleine-koenig@pengutronix.de Signed-off-by: Uwe Kleine-König <[email protected]>
1 parent 7fe0932 commit 58803ad

File tree

1 file changed

+10
-9
lines changed

1 file changed

+10
-9
lines changed

drivers/pwm/pwm-vt8500.c

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -53,16 +53,17 @@ struct vt8500_chip {
5353
#define to_vt8500_chip(chip) container_of(chip, struct vt8500_chip, chip)
5454

5555
#define msecs_to_loops(t) (loops_per_jiffy / 1000 * HZ * t)
56-
static inline void vt8500_pwm_busy_wait(struct vt8500_chip *vt8500, int nr, u8 bitmask)
56+
static inline void vt8500_pwm_busy_wait(struct pwm_chip *chip, int nr, u8 bitmask)
5757
{
58+
struct vt8500_chip *vt8500 = to_vt8500_chip(chip);
5859
int loops = msecs_to_loops(10);
5960
u32 mask = bitmask << (nr << 8);
6061

6162
while ((readl(vt8500->base + REG_STATUS) & mask) && --loops)
6263
cpu_relax();
6364

6465
if (unlikely(!loops))
65-
dev_warn(vt8500->chip.dev, "Waiting for status bits 0x%x to clear timed out\n",
66+
dev_warn(chip->dev, "Waiting for status bits 0x%x to clear timed out\n",
6667
mask);
6768
}
6869

@@ -103,18 +104,18 @@ static int vt8500_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm,
103104
dc = div64_u64(c, period_ns);
104105

105106
writel(prescale, vt8500->base + REG_SCALAR(pwm->hwpwm));
106-
vt8500_pwm_busy_wait(vt8500, pwm->hwpwm, STATUS_SCALAR_UPDATE);
107+
vt8500_pwm_busy_wait(chip, pwm->hwpwm, STATUS_SCALAR_UPDATE);
107108

108109
writel(pv, vt8500->base + REG_PERIOD(pwm->hwpwm));
109-
vt8500_pwm_busy_wait(vt8500, pwm->hwpwm, STATUS_PERIOD_UPDATE);
110+
vt8500_pwm_busy_wait(chip, pwm->hwpwm, STATUS_PERIOD_UPDATE);
110111

111112
writel(dc, vt8500->base + REG_DUTY(pwm->hwpwm));
112-
vt8500_pwm_busy_wait(vt8500, pwm->hwpwm, STATUS_DUTY_UPDATE);
113+
vt8500_pwm_busy_wait(chip, pwm->hwpwm, STATUS_DUTY_UPDATE);
113114

114115
val = readl(vt8500->base + REG_CTRL(pwm->hwpwm));
115116
val |= CTRL_AUTOLOAD;
116117
writel(val, vt8500->base + REG_CTRL(pwm->hwpwm));
117-
vt8500_pwm_busy_wait(vt8500, pwm->hwpwm, STATUS_CTRL_UPDATE);
118+
vt8500_pwm_busy_wait(chip, pwm->hwpwm, STATUS_CTRL_UPDATE);
118119

119120
clk_disable(vt8500->clk);
120121
return 0;
@@ -135,7 +136,7 @@ static int vt8500_pwm_enable(struct pwm_chip *chip, struct pwm_device *pwm)
135136
val = readl(vt8500->base + REG_CTRL(pwm->hwpwm));
136137
val |= CTRL_ENABLE;
137138
writel(val, vt8500->base + REG_CTRL(pwm->hwpwm));
138-
vt8500_pwm_busy_wait(vt8500, pwm->hwpwm, STATUS_CTRL_UPDATE);
139+
vt8500_pwm_busy_wait(chip, pwm->hwpwm, STATUS_CTRL_UPDATE);
139140

140141
return 0;
141142
}
@@ -148,7 +149,7 @@ static void vt8500_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm)
148149
val = readl(vt8500->base + REG_CTRL(pwm->hwpwm));
149150
val &= ~CTRL_ENABLE;
150151
writel(val, vt8500->base + REG_CTRL(pwm->hwpwm));
151-
vt8500_pwm_busy_wait(vt8500, pwm->hwpwm, STATUS_CTRL_UPDATE);
152+
vt8500_pwm_busy_wait(chip, pwm->hwpwm, STATUS_CTRL_UPDATE);
152153

153154
clk_disable(vt8500->clk);
154155
}
@@ -168,7 +169,7 @@ static int vt8500_pwm_set_polarity(struct pwm_chip *chip,
168169
val &= ~CTRL_INVERT;
169170

170171
writel(val, vt8500->base + REG_CTRL(pwm->hwpwm));
171-
vt8500_pwm_busy_wait(vt8500, pwm->hwpwm, STATUS_CTRL_UPDATE);
172+
vt8500_pwm_busy_wait(chip, pwm->hwpwm, STATUS_CTRL_UPDATE);
172173

173174
return 0;
174175
}

0 commit comments

Comments
 (0)