diff options
Diffstat (limited to 'drivers/pwm/pxa_pwm.c')
| -rw-r--r-- | drivers/pwm/pxa_pwm.c | 129 |
1 files changed, 66 insertions, 63 deletions
diff --git a/drivers/pwm/pxa_pwm.c b/drivers/pwm/pxa_pwm.c index c7130c225e..42ccb37b9a 100644 --- a/drivers/pwm/pxa_pwm.c +++ b/drivers/pwm/pxa_pwm.c @@ -1,10 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-only + /* * simple driver for PWM (Pulse Width Modulator) controller * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * * 2008-02-13 initial version eric miao <eric.miao@marvell.com> * 2012 Robert Jarzmik <robert.jarzmik@free.fr> */ @@ -15,11 +13,11 @@ #include <io.h> #include <pwm.h> -#include <mach/hardware.h> -#include <mach/clock.h> -#include <mach/pxa-regs.h> -#include <mach/regs-pwm.h> -#include <asm-generic/div64.h> +#include <mach/pxa/hardware.h> +#include <mach/pxa/clock.h> +#include <mach/pxa/pxa-regs.h> +#include <mach/pxa/regs-pwm.h> +#include <linux/math64.h> #include <linux/compiler.h> /* PWM registers and bits definitions */ @@ -34,8 +32,6 @@ struct pxa_pwm_chip { struct pwm_chip chip; void __iomem *iobase; int id; - int duty_ns; - int period_ns; }; static struct pxa_pwm_chip *to_pxa_pwm_chip(struct pwm_chip *chip) @@ -43,19 +39,62 @@ static struct pxa_pwm_chip *to_pxa_pwm_chip(struct pwm_chip *chip) return container_of(chip, struct pxa_pwm_chip, chip); } +static int pxa_pwm_enable(struct pxa_pwm_chip *pxa_pwm) +{ + switch (pxa_pwm->id) { + case 0: + case 2: + CKEN |= CKEN_PWM0; + break; + case 1: + case 3: + CKEN |= CKEN_PWM1; + break; + default: + return -EINVAL; + } + return 0; +} + +static void pxa_pwm_disable(struct pxa_pwm_chip *pxa_pwm) +{ + switch (pxa_pwm->id) { + case 0: + case 2: + CKEN &= ~CKEN_PWM0; + break; + case 1: + case 3: + CKEN &= ~CKEN_PWM1; + break; + default: + break; + } +} + /* * period_ns = 10^9 * (PRESCALE + 1) * (PV + 1) / PWM_CLK_RATE * duty_ns = 10^9 * (PRESCALE + 1) * DC / PWM_CLK_RATE * PWM_CLK_RATE = 13 MHz */ -static int pxa_pwm_config(struct pwm_chip *chip, int duty_ns, int period_ns) +static int pxa_pwm_apply(struct pwm_chip *chip, + struct pwm_device *pwm, + const struct pwm_state *state) { unsigned long long c; unsigned long period_cycles, prescale, pv, dc; struct pxa_pwm_chip *pxa_pwm = to_pxa_pwm_chip(chip); + bool enabled; + + enabled = chip->state.enabled; + + if (enabled && !state->enabled) { + pxa_pwm_disable(pxa_pwm); + return 0; + } c = pxa_get_pwmclk(); - c = c * period_ns; + c = c * state->period; do_div(c, 1000000000); period_cycles = c; @@ -67,68 +106,31 @@ static int pxa_pwm_config(struct pwm_chip *chip, int duty_ns, int period_ns) if (prescale > 63) return -EINVAL; - if (duty_ns == period_ns) + if (state->duty_cycle == state->period) dc = PWMDCR_FD; else - dc = (pv + 1) * duty_ns / period_ns; - - pxa_pwm->duty_ns = duty_ns; - pxa_pwm->period_ns = period_ns; + dc = (pv + 1) * state->duty_cycle / state->period; /* NOTE: the clock to PWM has to be enabled first * before writing to the registers */ - __raw_writel(prescale, pxa_pwm->iobase + PWMCR); - __raw_writel(dc, pxa_pwm->iobase + PWMDCR); - __raw_writel(pv, pxa_pwm->iobase + PWMPCR); + writel(prescale, pxa_pwm->iobase + PWMCR); + writel(dc, pxa_pwm->iobase + PWMDCR); + writel(pv, pxa_pwm->iobase + PWMPCR); - return 0; -} - -static int pxa_pwm_enable(struct pwm_chip *chip) -{ - struct pxa_pwm_chip *pxa_pwm = to_pxa_pwm_chip(chip); - - switch (pxa_pwm->id) { - case 0: - case 2: - CKEN |= CKEN_PWM0; - break; - case 1: - case 3: - CKEN |= CKEN_PWM1; - break; - default: - return -EINVAL; + if (!enabled && state->enabled) { + pxa_pwm_enable(pxa_pwm); + return 0; } - return 0; -} - -static void pxa_pwm_disable(struct pwm_chip *chip) -{ - struct pxa_pwm_chip *pxa_pwm = to_pxa_pwm_chip(chip); - switch (pxa_pwm->id) { - case 0: - case 2: - CKEN &= ~CKEN_PWM0; - break; - case 1: - case 3: - CKEN &= ~CKEN_PWM1; - break; - default: - break; - } + return 0; } static struct pwm_ops pxa_pwm_ops = { - .config = pxa_pwm_config, - .enable = pxa_pwm_enable, - .disable = pxa_pwm_disable, + .apply = pxa_pwm_apply, }; -static int pxa_pwm_probe(struct device_d *dev) +static int pxa_pwm_probe(struct device *dev) { struct resource *iores; struct pxa_pwm_chip *chip; @@ -141,12 +143,13 @@ static int pxa_pwm_probe(struct device_d *dev) return PTR_ERR(iores); chip->iobase = IOMEM(iores->start); chip->id = dev->id; + chip->chip.dev = dev; dev->priv = chip; - return pwmchip_add(&chip->chip, dev); + return pwmchip_add(&chip->chip); } -static struct driver_d pxa_pwm_driver = { +static struct driver pxa_pwm_driver = { .name = "pxa_pwm", .probe = pxa_pwm_probe, }; |