ARM vt8500: Move vt8500 pwm driver to pwm framework
Move the driver to drivers/pwm/ and convert it to use the framework. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Cc: Alexey Charkov <alchark@gmail.com> Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
This commit is contained in:
parent
215c29d3d0
commit
a245ccebb4
|
@ -962,7 +962,6 @@ config ARCH_VT8500
|
||||||
select ARCH_HAS_CPUFREQ
|
select ARCH_HAS_CPUFREQ
|
||||||
select GENERIC_CLOCKEVENTS
|
select GENERIC_CLOCKEVENTS
|
||||||
select ARCH_REQUIRE_GPIOLIB
|
select ARCH_REQUIRE_GPIOLIB
|
||||||
select HAVE_PWM
|
|
||||||
help
|
help
|
||||||
Support for VIA/WonderMedia VT8500/WM85xx System-on-Chip.
|
Support for VIA/WonderMedia VT8500/WM85xx System-on-Chip.
|
||||||
|
|
||||||
|
|
|
@ -5,5 +5,3 @@ obj-$(CONFIG_VTWM_VERSION_WM8505) += devices-wm8505.o
|
||||||
|
|
||||||
obj-$(CONFIG_MACH_BV07) += bv07.o
|
obj-$(CONFIG_MACH_BV07) += bv07.o
|
||||||
obj-$(CONFIG_MACH_WM8505_7IN_NETBOOK) += wm8505_7in.o
|
obj-$(CONFIG_MACH_WM8505_7IN_NETBOOK) += wm8505_7in.o
|
||||||
|
|
||||||
obj-$(CONFIG_HAVE_PWM) += pwm.o
|
|
||||||
|
|
|
@ -55,4 +55,13 @@ config PWM_TEGRA
|
||||||
To compile this driver as a module, choose M here: the module
|
To compile this driver as a module, choose M here: the module
|
||||||
will be called pwm-tegra.
|
will be called pwm-tegra.
|
||||||
|
|
||||||
|
config PWM_VT8500
|
||||||
|
tristate "vt8500 pwm support"
|
||||||
|
depends on ARCH_VT8500
|
||||||
|
help
|
||||||
|
Generic PWM framework driver for vt8500.
|
||||||
|
|
||||||
|
To compile this driver as a module, choose M here: the module
|
||||||
|
will be called pwm-vt8500.
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -4,3 +4,4 @@ obj-$(CONFIG_PWM_IMX) += pwm-imx.o
|
||||||
obj-$(CONFIG_PWM_PXA) += pwm-pxa.o
|
obj-$(CONFIG_PWM_PXA) += pwm-pxa.o
|
||||||
obj-$(CONFIG_PWM_SAMSUNG) += pwm-samsung.o
|
obj-$(CONFIG_PWM_SAMSUNG) += pwm-samsung.o
|
||||||
obj-$(CONFIG_PWM_TEGRA) += pwm-tegra.o
|
obj-$(CONFIG_PWM_TEGRA) += pwm-tegra.o
|
||||||
|
obj-$(CONFIG_PWM_VT8500) += pwm-vt8500.o
|
||||||
|
|
|
@ -26,21 +26,13 @@
|
||||||
|
|
||||||
#define VT8500_NR_PWMS 4
|
#define VT8500_NR_PWMS 4
|
||||||
|
|
||||||
static DEFINE_MUTEX(pwm_lock);
|
struct vt8500_chip {
|
||||||
static LIST_HEAD(pwm_list);
|
struct pwm_chip chip;
|
||||||
|
void __iomem *base;
|
||||||
struct pwm_device {
|
|
||||||
struct list_head node;
|
|
||||||
struct platform_device *pdev;
|
|
||||||
|
|
||||||
const char *label;
|
|
||||||
|
|
||||||
void __iomem *regbase;
|
|
||||||
|
|
||||||
unsigned int use_count;
|
|
||||||
unsigned int pwm_id;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#define to_vt8500_chip(chip) container_of(chip, struct vt8500_chip, chip)
|
||||||
|
|
||||||
#define msecs_to_loops(t) (loops_per_jiffy / 1000 * HZ * t)
|
#define msecs_to_loops(t) (loops_per_jiffy / 1000 * HZ * t)
|
||||||
static inline void pwm_busy_wait(void __iomem *reg, u8 bitmask)
|
static inline void pwm_busy_wait(void __iomem *reg, u8 bitmask)
|
||||||
{
|
{
|
||||||
|
@ -53,14 +45,13 @@ static inline void pwm_busy_wait(void __iomem *reg, u8 bitmask)
|
||||||
bitmask);
|
bitmask);
|
||||||
}
|
}
|
||||||
|
|
||||||
int pwm_config(struct pwm_device *pwm, int duty_ns, int period_ns)
|
static int vt8500_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm,
|
||||||
|
int duty_ns, int period_ns)
|
||||||
{
|
{
|
||||||
|
struct vt8500_chip *vt8500 = to_vt8500_chip(chip);
|
||||||
unsigned long long c;
|
unsigned long long c;
|
||||||
unsigned long period_cycles, prescale, pv, dc;
|
unsigned long period_cycles, prescale, pv, dc;
|
||||||
|
|
||||||
if (pwm == NULL || period_ns == 0 || duty_ns > period_ns)
|
|
||||||
return -EINVAL;
|
|
||||||
|
|
||||||
c = 25000000/2; /* wild guess --- need to implement clocks */
|
c = 25000000/2; /* wild guess --- need to implement clocks */
|
||||||
c = c * period_ns;
|
c = c * period_ns;
|
||||||
do_div(c, 1000000000);
|
do_div(c, 1000000000);
|
||||||
|
@ -80,104 +71,58 @@ int pwm_config(struct pwm_device *pwm, int duty_ns, int period_ns)
|
||||||
do_div(c, period_ns);
|
do_div(c, period_ns);
|
||||||
dc = c;
|
dc = c;
|
||||||
|
|
||||||
pwm_busy_wait(pwm->regbase + 0x40 + pwm->pwm_id, (1 << 1));
|
pwm_busy_wait(vt8500->base + 0x40 + pwm->hwpwm, (1 << 1));
|
||||||
writel(prescale, pwm->regbase + 0x4 + (pwm->pwm_id << 4));
|
writel(prescale, vt8500->base + 0x4 + (pwm->hwpwm << 4));
|
||||||
|
|
||||||
pwm_busy_wait(pwm->regbase + 0x40 + pwm->pwm_id, (1 << 2));
|
pwm_busy_wait(vt8500->base + 0x40 + pwm->hwpwm, (1 << 2));
|
||||||
writel(pv, pwm->regbase + 0x8 + (pwm->pwm_id << 4));
|
writel(pv, vt8500->base + 0x8 + (pwm->hwpwm << 4));
|
||||||
|
|
||||||
pwm_busy_wait(pwm->regbase + 0x40 + pwm->pwm_id, (1 << 3));
|
pwm_busy_wait(vt8500->base + 0x40 + pwm->hwpwm, (1 << 3));
|
||||||
writel(dc, pwm->regbase + 0xc + (pwm->pwm_id << 4));
|
writel(dc, vt8500->base + 0xc + (pwm->hwpwm << 4));
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(pwm_config);
|
|
||||||
|
|
||||||
int pwm_enable(struct pwm_device *pwm)
|
static int vt8500_pwm_enable(struct pwm_chip *chip, struct pwm_device *pwm)
|
||||||
{
|
{
|
||||||
pwm_busy_wait(pwm->regbase + 0x40 + pwm->pwm_id, (1 << 0));
|
struct vt8500_chip *vt8500 = to_vt8500_chip(chip);
|
||||||
writel(5, pwm->regbase + (pwm->pwm_id << 4));
|
|
||||||
|
pwm_busy_wait(vt8500->base + 0x40 + pwm->hwpwm, (1 << 0));
|
||||||
|
writel(5, vt8500->base + (pwm->hwpwm << 4));
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(pwm_enable);
|
|
||||||
|
|
||||||
void pwm_disable(struct pwm_device *pwm)
|
static void vt8500_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm)
|
||||||
{
|
{
|
||||||
pwm_busy_wait(pwm->regbase + 0x40 + pwm->pwm_id, (1 << 0));
|
struct vt8500_chip *vt8500 = to_vt8500_chip(chip);
|
||||||
writel(0, pwm->regbase + (pwm->pwm_id << 4));
|
|
||||||
|
pwm_busy_wait(vt8500->base + 0x40 + pwm->hwpwm, (1 << 0));
|
||||||
|
writel(0, vt8500->base + (pwm->hwpwm << 4));
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(pwm_disable);
|
|
||||||
|
|
||||||
struct pwm_device *pwm_request(int pwm_id, const char *label)
|
static struct pwm_ops vt8500_pwm_ops = {
|
||||||
{
|
.enable = vt8500_pwm_enable,
|
||||||
struct pwm_device *pwm;
|
.disable = vt8500_pwm_disable,
|
||||||
int found = 0;
|
.config = vt8500_pwm_config,
|
||||||
|
.owner = THIS_MODULE,
|
||||||
mutex_lock(&pwm_lock);
|
};
|
||||||
|
|
||||||
list_for_each_entry(pwm, &pwm_list, node) {
|
|
||||||
if (pwm->pwm_id == pwm_id) {
|
|
||||||
found = 1;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (found) {
|
|
||||||
if (pwm->use_count == 0) {
|
|
||||||
pwm->use_count++;
|
|
||||||
pwm->label = label;
|
|
||||||
} else {
|
|
||||||
pwm = ERR_PTR(-EBUSY);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
pwm = ERR_PTR(-ENOENT);
|
|
||||||
}
|
|
||||||
|
|
||||||
mutex_unlock(&pwm_lock);
|
|
||||||
return pwm;
|
|
||||||
}
|
|
||||||
EXPORT_SYMBOL(pwm_request);
|
|
||||||
|
|
||||||
void pwm_free(struct pwm_device *pwm)
|
|
||||||
{
|
|
||||||
mutex_lock(&pwm_lock);
|
|
||||||
|
|
||||||
if (pwm->use_count) {
|
|
||||||
pwm->use_count--;
|
|
||||||
pwm->label = NULL;
|
|
||||||
} else {
|
|
||||||
pr_warning("PWM device already freed\n");
|
|
||||||
}
|
|
||||||
|
|
||||||
mutex_unlock(&pwm_lock);
|
|
||||||
}
|
|
||||||
EXPORT_SYMBOL(pwm_free);
|
|
||||||
|
|
||||||
static inline void __add_pwm(struct pwm_device *pwm)
|
|
||||||
{
|
|
||||||
mutex_lock(&pwm_lock);
|
|
||||||
list_add_tail(&pwm->node, &pwm_list);
|
|
||||||
mutex_unlock(&pwm_lock);
|
|
||||||
}
|
|
||||||
|
|
||||||
static int __devinit pwm_probe(struct platform_device *pdev)
|
static int __devinit pwm_probe(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
struct pwm_device *pwms;
|
struct vt8500_chip *chip;
|
||||||
struct resource *r;
|
struct resource *r;
|
||||||
int ret = 0;
|
int ret;
|
||||||
int i;
|
|
||||||
|
|
||||||
pwms = kzalloc(sizeof(struct pwm_device) * VT8500_NR_PWMS, GFP_KERNEL);
|
chip = kzalloc(sizeof(*chip), GFP_KERNEL);
|
||||||
if (pwms == NULL) {
|
if (chip == NULL) {
|
||||||
dev_err(&pdev->dev, "failed to allocate memory\n");
|
dev_err(&pdev->dev, "failed to allocate memory\n");
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
}
|
}
|
||||||
|
|
||||||
for (i = 0; i < VT8500_NR_PWMS; i++) {
|
chip->chip.dev = &pdev->dev;
|
||||||
pwms[i].use_count = 0;
|
chip->chip.ops = &vt8500_pwm_ops;
|
||||||
pwms[i].pwm_id = i;
|
chip->chip.base = -1;
|
||||||
pwms[i].pdev = pdev;
|
chip->chip.npwm = VT8500_NR_PWMS;
|
||||||
}
|
|
||||||
|
|
||||||
r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||||
if (r == NULL) {
|
if (r == NULL) {
|
||||||
|
@ -193,51 +138,49 @@ static int __devinit pwm_probe(struct platform_device *pdev)
|
||||||
goto err_free;
|
goto err_free;
|
||||||
}
|
}
|
||||||
|
|
||||||
pwms[0].regbase = ioremap(r->start, resource_size(r));
|
chip->base = ioremap(r->start, resource_size(r));
|
||||||
if (pwms[0].regbase == NULL) {
|
if (chip->base == NULL) {
|
||||||
dev_err(&pdev->dev, "failed to ioremap() registers\n");
|
dev_err(&pdev->dev, "failed to ioremap() registers\n");
|
||||||
ret = -ENODEV;
|
ret = -ENODEV;
|
||||||
goto err_free_mem;
|
goto err_free_mem;
|
||||||
}
|
}
|
||||||
|
|
||||||
for (i = 1; i < VT8500_NR_PWMS; i++)
|
ret = pwmchip_add(&chip->chip);
|
||||||
pwms[i].regbase = pwms[0].regbase;
|
if (ret < 0)
|
||||||
|
goto err_unmap;
|
||||||
|
|
||||||
for (i = 0; i < VT8500_NR_PWMS; i++)
|
platform_set_drvdata(pdev, chip);
|
||||||
__add_pwm(&pwms[i]);
|
return ret;
|
||||||
|
|
||||||
platform_set_drvdata(pdev, pwms);
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
|
err_unmap:
|
||||||
|
iounmap(chip->base);
|
||||||
err_free_mem:
|
err_free_mem:
|
||||||
release_mem_region(r->start, resource_size(r));
|
release_mem_region(r->start, resource_size(r));
|
||||||
err_free:
|
err_free:
|
||||||
kfree(pwms);
|
kfree(chip);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int __devexit pwm_remove(struct platform_device *pdev)
|
static int __devexit pwm_remove(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
struct pwm_device *pwms;
|
struct vt8500_chip *chip;
|
||||||
struct resource *r;
|
struct resource *r;
|
||||||
int i;
|
int err;
|
||||||
|
|
||||||
pwms = platform_get_drvdata(pdev);
|
chip = platform_get_drvdata(pdev);
|
||||||
if (pwms == NULL)
|
if (chip == NULL)
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
|
|
||||||
mutex_lock(&pwm_lock);
|
err = pwmchip_remove(&chip->chip);
|
||||||
|
if (err < 0)
|
||||||
|
return err;
|
||||||
|
|
||||||
for (i = 0; i < VT8500_NR_PWMS; i++)
|
iounmap(chip->base);
|
||||||
list_del(&pwms[i].node);
|
|
||||||
mutex_unlock(&pwm_lock);
|
|
||||||
|
|
||||||
iounmap(pwms[0].regbase);
|
|
||||||
|
|
||||||
r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||||
release_mem_region(r->start, resource_size(r));
|
release_mem_region(r->start, resource_size(r));
|
||||||
|
|
||||||
kfree(pwms);
|
kfree(chip);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
Reference in New Issue