Commit 15da7b50 authored by Boris Brezillon's avatar Boris Brezillon Committed by Thierry Reding

pwm: Make use of pwm_get_xxx() helpers where appropriate

Use the pwm_get_xxx() helpers instead of directly accessing the fields
in struct pwm_device. This will allow us to smoothly move to the atomic
update approach.
Signed-off-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: default avatarThierry Reding <thierry.reding@gmail.com>
parent 011e7631
...@@ -114,7 +114,7 @@ static int atmel_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm, ...@@ -114,7 +114,7 @@ static int atmel_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm,
u32 val; u32 val;
int ret; int ret;
if (pwm_is_enabled(pwm) && (period_ns != pwm->period)) { if (pwm_is_enabled(pwm) && (period_ns != pwm_get_period(pwm))) {
dev_err(chip->dev, "cannot change PWM period while enabled\n"); dev_err(chip->dev, "cannot change PWM period while enabled\n");
return -EBUSY; return -EBUSY;
} }
......
...@@ -194,7 +194,8 @@ static int kona_pwmc_enable(struct pwm_chip *chip, struct pwm_device *pwm) ...@@ -194,7 +194,8 @@ static int kona_pwmc_enable(struct pwm_chip *chip, struct pwm_device *pwm)
return ret; return ret;
} }
ret = kona_pwmc_config(chip, pwm, pwm->duty_cycle, pwm->period); ret = kona_pwmc_config(chip, pwm, pwm_get_duty_cycle(pwm),
pwm_get_period(pwm));
if (ret < 0) { if (ret < 0) {
clk_disable_unprepare(kp->clk); clk_disable_unprepare(kp->clk);
return ret; return ret;
......
...@@ -129,7 +129,8 @@ static int imx_pwm_config_v2(struct pwm_chip *chip, ...@@ -129,7 +129,8 @@ static int imx_pwm_config_v2(struct pwm_chip *chip,
sr = readl(imx->mmio_base + MX3_PWMSR); sr = readl(imx->mmio_base + MX3_PWMSR);
fifoav = sr & MX3_PWMSR_FIFOAV_MASK; fifoav = sr & MX3_PWMSR_FIFOAV_MASK;
if (fifoav == MX3_PWMSR_FIFOAV_4WORDS) { if (fifoav == MX3_PWMSR_FIFOAV_4WORDS) {
period_ms = DIV_ROUND_UP(pwm->period, NSEC_PER_MSEC); period_ms = DIV_ROUND_UP(pwm_get_period(pwm),
NSEC_PER_MSEC);
msleep(period_ms); msleep(period_ms);
sr = readl(imx->mmio_base + MX3_PWMSR); sr = readl(imx->mmio_base + MX3_PWMSR);
......
...@@ -83,7 +83,7 @@ static void rockchip_pwm_set_enable_v2(struct pwm_chip *chip, ...@@ -83,7 +83,7 @@ static void rockchip_pwm_set_enable_v2(struct pwm_chip *chip,
PWM_CONTINUOUS; PWM_CONTINUOUS;
u32 val; u32 val;
if (pwm->polarity == PWM_POLARITY_INVERSED) if (pwm_get_polarity(pwm) == PWM_POLARITY_INVERSED)
enable_conf |= PWM_DUTY_NEGATIVE | PWM_INACTIVE_POSITIVE; enable_conf |= PWM_DUTY_NEGATIVE | PWM_INACTIVE_POSITIVE;
else else
enable_conf |= PWM_DUTY_POSITIVE | PWM_INACTIVE_NEGATIVE; enable_conf |= PWM_DUTY_POSITIVE | PWM_INACTIVE_NEGATIVE;
......
...@@ -46,7 +46,7 @@ static ssize_t pwm_period_show(struct device *child, ...@@ -46,7 +46,7 @@ static ssize_t pwm_period_show(struct device *child,
{ {
const struct pwm_device *pwm = child_to_pwm_device(child); const struct pwm_device *pwm = child_to_pwm_device(child);
return sprintf(buf, "%u\n", pwm->period); return sprintf(buf, "%u\n", pwm_get_period(pwm));
} }
static ssize_t pwm_period_store(struct device *child, static ssize_t pwm_period_store(struct device *child,
...@@ -61,7 +61,7 @@ static ssize_t pwm_period_store(struct device *child, ...@@ -61,7 +61,7 @@ static ssize_t pwm_period_store(struct device *child,
if (ret) if (ret)
return ret; return ret;
ret = pwm_config(pwm, pwm->duty_cycle, val); ret = pwm_config(pwm, pwm_get_duty_cycle(pwm), val);
return ret ? : size; return ret ? : size;
} }
...@@ -72,7 +72,7 @@ static ssize_t pwm_duty_cycle_show(struct device *child, ...@@ -72,7 +72,7 @@ static ssize_t pwm_duty_cycle_show(struct device *child,
{ {
const struct pwm_device *pwm = child_to_pwm_device(child); const struct pwm_device *pwm = child_to_pwm_device(child);
return sprintf(buf, "%u\n", pwm->duty_cycle); return sprintf(buf, "%u\n", pwm_get_duty_cycle(pwm));
} }
static ssize_t pwm_duty_cycle_store(struct device *child, static ssize_t pwm_duty_cycle_store(struct device *child,
...@@ -87,7 +87,7 @@ static ssize_t pwm_duty_cycle_store(struct device *child, ...@@ -87,7 +87,7 @@ static ssize_t pwm_duty_cycle_store(struct device *child,
if (ret) if (ret)
return ret; return ret;
ret = pwm_config(pwm, val, pwm->period); ret = pwm_config(pwm, val, pwm_get_period(pwm));
return ret ? : size; return ret ? : size;
} }
...@@ -134,7 +134,8 @@ static ssize_t pwm_polarity_show(struct device *child, ...@@ -134,7 +134,8 @@ static ssize_t pwm_polarity_show(struct device *child,
{ {
const struct pwm_device *pwm = child_to_pwm_device(child); const struct pwm_device *pwm = child_to_pwm_device(child);
return sprintf(buf, "%s\n", pwm->polarity ? "inversed" : "normal"); return sprintf(buf, "%s\n",
pwm_get_polarity(pwm) ? "inversed" : "normal");
} }
static ssize_t pwm_polarity_store(struct device *child, static ssize_t pwm_polarity_store(struct device *child,
......
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