hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pwm: rcar: Remove legacy APIs 

This patch removes legacy APIs. Since rcar_pwm_{en,dis}able() functions
are reused on "atomic" API, this patch changes the arguments of these
functions. No change in behavior.

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
This commit is contained in:
Yoshihiro Shimoda 2019-01-09 17:19:07 +09:00 committed by Thierry Reding
parent 87f50ce981
commit 8cc2b97039
1 changed files with 4 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
drivers/pwm/pwm-rcar.c
View File

@ -139,39 +139,8 @@ static void rcar_pwm_free(struct pwm_chip *chip, struct pwm_device *pwm)
pm_runtime_put(chip->dev); pm_runtime_put(chip->dev);
} }
static int rcar_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm, static int rcar_pwm_enable(struct rcar_pwm_chip *rp)
int duty_ns, int period_ns)
{ {
struct rcar_pwm_chip *rp = to_rcar_pwm_chip(chip);
int div, ret;
div = rcar_pwm_get_clock_division(rp, period_ns);
if (div < 0)
return div;
/*
* Let the core driver set pwm->period if disabled and duty_ns == 0.
* But, this driver should prevent to set the new duty_ns if current
* duty_cycle is not set
*/
if (!pwm_is_enabled(pwm) && !duty_ns && !pwm->state.duty_cycle)
return 0;
rcar_pwm_update(rp, RCAR_PWMCR_SYNC, RCAR_PWMCR_SYNC, RCAR_PWMCR);
ret = rcar_pwm_set_counter(rp, div, duty_ns, period_ns);
if (!ret)
rcar_pwm_set_clock_control(rp, div);
/* The SYNC should be set to 0 even if rcar_pwm_set_counter failed */
rcar_pwm_update(rp, RCAR_PWMCR_SYNC, 0, RCAR_PWMCR);
return ret;
}
static int rcar_pwm_enable(struct pwm_chip *chip, struct pwm_device *pwm)
{
struct rcar_pwm_chip *rp = to_rcar_pwm_chip(chip);
u32 value; u32 value;
/* Don't enable the PWM device if CYC0 or PH0 is 0 */ /* Don't enable the PWM device if CYC0 or PH0 is 0 */
@ -185,10 +154,8 @@ static int rcar_pwm_enable(struct pwm_chip *chip, struct pwm_device *pwm)
return 0; return 0;
} }
static void rcar_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm) static void rcar_pwm_disable(struct rcar_pwm_chip *rp)
{ {
struct rcar_pwm_chip *rp = to_rcar_pwm_chip(chip);
rcar_pwm_update(rp, RCAR_PWMCR_EN0, 0, RCAR_PWMCR); rcar_pwm_update(rp, RCAR_PWMCR_EN0, 0, RCAR_PWMCR);
} }
@ -205,7 +172,7 @@ static int rcar_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,
return -ENOTSUPP; return -ENOTSUPP;
if (!state->enabled) { if (!state->enabled) {
rcar_pwm_disable(chip, pwm); rcar_pwm_disable(rp);
return 0; return 0;
} }
@ -223,7 +190,7 @@ static int rcar_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,
rcar_pwm_update(rp, RCAR_PWMCR_SYNC, 0, RCAR_PWMCR); rcar_pwm_update(rp, RCAR_PWMCR_SYNC, 0, RCAR_PWMCR);
if (!ret && state->enabled) if (!ret && state->enabled)
ret = rcar_pwm_enable(chip, pwm); ret = rcar_pwm_enable(rp);
return ret; return ret;
} }
@ -231,9 +198,6 @@ static int rcar_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,
static const struct pwm_ops rcar_pwm_ops = { static const struct pwm_ops rcar_pwm_ops = {
.request = rcar_pwm_request, .request = rcar_pwm_request,
.free = rcar_pwm_free, .free = rcar_pwm_free,
.config = rcar_pwm_config,
.enable = rcar_pwm_enable,
.disable = rcar_pwm_disable,
.apply = rcar_pwm_apply, .apply = rcar_pwm_apply,
.owner = THIS_MODULE, .owner = THIS_MODULE,
}; };