diff options
Diffstat (limited to 'drivers/misc/ep93xx_pwm.c')
| -rw-r--r-- | drivers/misc/ep93xx_pwm.c | 188 | 
1 files changed, 50 insertions, 138 deletions
diff --git a/drivers/misc/ep93xx_pwm.c b/drivers/misc/ep93xx_pwm.c index 96787ec15cad..cdb67a9c1959 100644 --- a/drivers/misc/ep93xx_pwm.c +++ b/drivers/misc/ep93xx_pwm.c @@ -39,63 +39,6 @@ struct ep93xx_pwm {  	u32		duty_percent;  }; -static inline void ep93xx_pwm_writel(struct ep93xx_pwm *pwm, -		unsigned int val, unsigned int off) -{ -	__raw_writel(val, pwm->mmio_base + off); -} - -static inline unsigned int ep93xx_pwm_readl(struct ep93xx_pwm *pwm, -		unsigned int off) -{ -	return __raw_readl(pwm->mmio_base + off); -} - -static inline void ep93xx_pwm_write_tc(struct ep93xx_pwm *pwm, u16 value) -{ -	ep93xx_pwm_writel(pwm, value, EP93XX_PWMx_TERM_COUNT); -} - -static inline u16 ep93xx_pwm_read_tc(struct ep93xx_pwm *pwm) -{ -	return ep93xx_pwm_readl(pwm, EP93XX_PWMx_TERM_COUNT); -} - -static inline void ep93xx_pwm_write_dc(struct ep93xx_pwm *pwm, u16 value) -{ -	ep93xx_pwm_writel(pwm, value, EP93XX_PWMx_DUTY_CYCLE); -} - -static inline void ep93xx_pwm_enable(struct ep93xx_pwm *pwm) -{ -	ep93xx_pwm_writel(pwm, 0x1, EP93XX_PWMx_ENABLE); -} - -static inline void ep93xx_pwm_disable(struct ep93xx_pwm *pwm) -{ -	ep93xx_pwm_writel(pwm, 0x0, EP93XX_PWMx_ENABLE); -} - -static inline int ep93xx_pwm_is_enabled(struct ep93xx_pwm *pwm) -{ -	return ep93xx_pwm_readl(pwm, EP93XX_PWMx_ENABLE) & 0x1; -} - -static inline void ep93xx_pwm_invert(struct ep93xx_pwm *pwm) -{ -	ep93xx_pwm_writel(pwm, 0x1, EP93XX_PWMx_INVERT); -} - -static inline void ep93xx_pwm_normal(struct ep93xx_pwm *pwm) -{ -	ep93xx_pwm_writel(pwm, 0x0, EP93XX_PWMx_INVERT); -} - -static inline int ep93xx_pwm_is_inverted(struct ep93xx_pwm *pwm) -{ -	return ep93xx_pwm_readl(pwm, EP93XX_PWMx_INVERT) & 0x1; -} -  /*   * /sys/devices/platform/ep93xx-pwm.N   *   /min_freq      read-only   minimum pwm output frequency @@ -131,9 +74,9 @@ static ssize_t ep93xx_pwm_get_freq(struct device *dev,  	struct platform_device *pdev = to_platform_device(dev);  	struct ep93xx_pwm *pwm = platform_get_drvdata(pdev); -	if (ep93xx_pwm_is_enabled(pwm)) { +	if (readl(pwm->mmio_base + EP93XX_PWMx_ENABLE) & 0x1) {  		unsigned long rate = clk_get_rate(pwm->clk); -		u16 term = ep93xx_pwm_read_tc(pwm); +		u16 term = readl(pwm->mmio_base + EP93XX_PWMx_TERM_COUNT);  		return sprintf(buf, "%ld\n", rate / (term + 1));  	} else { @@ -149,12 +92,12 @@ static ssize_t ep93xx_pwm_set_freq(struct device *dev,  	long val;  	int err; -	err = strict_strtol(buf, 10, &val); +	err = kstrtol(buf, 10, &val);  	if (err)  		return -EINVAL;  	if (val == 0) { -		ep93xx_pwm_disable(pwm); +		writel(0x0, pwm->mmio_base + EP93XX_PWMx_ENABLE);  	} else if (val <= (clk_get_rate(pwm->clk) / 2)) {  		u32 term, duty; @@ -164,20 +107,20 @@ static ssize_t ep93xx_pwm_set_freq(struct device *dev,  		if (val < 1)  			val = 1; -		term = ep93xx_pwm_read_tc(pwm); +		term = readl(pwm->mmio_base + EP93XX_PWMx_TERM_COUNT);  		duty = ((val + 1) * pwm->duty_percent / 100) - 1;  		/* If pwm is running, order is important */  		if (val > term) { -			ep93xx_pwm_write_tc(pwm, val); -			ep93xx_pwm_write_dc(pwm, duty); +			writel(val, pwm->mmio_base + EP93XX_PWMx_TERM_COUNT); +			writel(duty, pwm->mmio_base + EP93XX_PWMx_DUTY_CYCLE);  		} else { -			ep93xx_pwm_write_dc(pwm, duty); -			ep93xx_pwm_write_tc(pwm, val); +			writel(duty, pwm->mmio_base + EP93XX_PWMx_DUTY_CYCLE); +			writel(val, pwm->mmio_base + EP93XX_PWMx_TERM_COUNT);  		} -		if (!ep93xx_pwm_is_enabled(pwm)) -			ep93xx_pwm_enable(pwm); +		if (!readl(pwm->mmio_base + EP93XX_PWMx_ENABLE) & 0x1) +			writel(0x1, pwm->mmio_base + EP93XX_PWMx_ENABLE);  	} else {  		return -EINVAL;  	} @@ -202,13 +145,15 @@ static ssize_t ep93xx_pwm_set_duty_percent(struct device *dev,  	long val;  	int err; -	err = strict_strtol(buf, 10, &val); +	err = kstrtol(buf, 10, &val);  	if (err)  		return -EINVAL;  	if (val > 0 && val < 100) { -		u32 term = ep93xx_pwm_read_tc(pwm); -		ep93xx_pwm_write_dc(pwm, ((term + 1) * val / 100) - 1); +		u32 term = readl(pwm->mmio_base + EP93XX_PWMx_TERM_COUNT); +		u32 duty = ((term + 1) * val / 100) - 1; + +		writel(duty, pwm->mmio_base + EP93XX_PWMx_DUTY_CYCLE);  		pwm->duty_percent = val;  		return count;  	} @@ -221,8 +166,9 @@ static ssize_t ep93xx_pwm_get_invert(struct device *dev,  {  	struct platform_device *pdev = to_platform_device(dev);  	struct ep93xx_pwm *pwm = platform_get_drvdata(pdev); +	int inverted = readl(pwm->mmio_base + EP93XX_PWMx_INVERT) & 0x1; -	return sprintf(buf, "%d\n", ep93xx_pwm_is_inverted(pwm)); +	return sprintf(buf, "%d\n", inverted);  }  static ssize_t ep93xx_pwm_set_invert(struct device *dev, @@ -233,14 +179,14 @@ static ssize_t ep93xx_pwm_set_invert(struct device *dev,  	long val;  	int err; -	err = strict_strtol(buf, 10, &val); +	err = kstrtol(buf, 10, &val);  	if (err)  		return -EINVAL;  	if (val == 0) -		ep93xx_pwm_normal(pwm); +		writel(0x0, pwm->mmio_base + EP93XX_PWMx_INVERT);  	else if (val == 1) -		ep93xx_pwm_invert(pwm); +		writel(0x1, pwm->mmio_base + EP93XX_PWMx_INVERT);  	else  		return -EINVAL; @@ -269,89 +215,55 @@ static const struct attribute_group ep93xx_pwm_sysfs_files = {  	.attrs	= ep93xx_pwm_attrs,  }; -static int __init ep93xx_pwm_probe(struct platform_device *pdev) +static int ep93xx_pwm_probe(struct platform_device *pdev)  {  	struct ep93xx_pwm *pwm;  	struct resource *res; -	int err; +	int ret; -	err = ep93xx_pwm_acquire_gpio(pdev); -	if (err) -		return err; +	pwm = devm_kzalloc(&pdev->dev, sizeof(*pwm), GFP_KERNEL); +	if (!pwm) +		return -ENOMEM; -	pwm = kzalloc(sizeof(struct ep93xx_pwm), GFP_KERNEL); -	if (!pwm) { -		err = -ENOMEM; -		goto fail_no_mem; -	} +	pwm->clk = devm_clk_get(&pdev->dev, "pwm_clk"); +	if (IS_ERR(pwm->clk)) +		return PTR_ERR(pwm->clk);  	res = platform_get_resource(pdev, IORESOURCE_MEM, 0); -	if (res == NULL) { -		err = -ENXIO; -		goto fail_no_mem_resource; -	} - -	res = request_mem_region(res->start, resource_size(res), pdev->name); -	if (res == NULL) { -		err = -EBUSY; -		goto fail_no_mem_resource; -	} - -	pwm->mmio_base = ioremap(res->start, resource_size(res)); -	if (pwm->mmio_base == NULL) { -		err = -ENXIO; -		goto fail_no_ioremap; -	} - -	err = sysfs_create_group(&pdev->dev.kobj, &ep93xx_pwm_sysfs_files); -	if (err) -		goto fail_no_sysfs; - -	pwm->clk = clk_get(&pdev->dev, "pwm_clk"); -	if (IS_ERR(pwm->clk)) { -		err = PTR_ERR(pwm->clk); -		goto fail_no_clk; +	pwm->mmio_base = devm_ioremap_resource(&pdev->dev, res); +	if (IS_ERR(pwm->mmio_base)) +		return PTR_ERR(pwm->mmio_base); + +	ret = ep93xx_pwm_acquire_gpio(pdev); +	if (ret) +		return ret; + +	ret = sysfs_create_group(&pdev->dev.kobj, &ep93xx_pwm_sysfs_files); +	if (ret) { +		ep93xx_pwm_release_gpio(pdev); +		return ret;  	}  	pwm->duty_percent = 50; -	platform_set_drvdata(pdev, pwm); -  	/* disable pwm at startup. Avoids zero value. */ -	ep93xx_pwm_disable(pwm); -	ep93xx_pwm_write_tc(pwm, EP93XX_PWM_MAX_COUNT); -	ep93xx_pwm_write_dc(pwm, EP93XX_PWM_MAX_COUNT / 2); +	writel(0x0, pwm->mmio_base + EP93XX_PWMx_ENABLE); +	writel(EP93XX_PWM_MAX_COUNT, pwm->mmio_base + EP93XX_PWMx_TERM_COUNT); +	writel(EP93XX_PWM_MAX_COUNT/2, pwm->mmio_base + EP93XX_PWMx_DUTY_CYCLE);  	clk_enable(pwm->clk); +	platform_set_drvdata(pdev, pwm);  	return 0; - -fail_no_clk: -	sysfs_remove_group(&pdev->dev.kobj, &ep93xx_pwm_sysfs_files); -fail_no_sysfs: -	iounmap(pwm->mmio_base); -fail_no_ioremap: -	release_mem_region(res->start, resource_size(res)); -fail_no_mem_resource: -	kfree(pwm); -fail_no_mem: -	ep93xx_pwm_release_gpio(pdev); -	return err;  } -static int __exit ep93xx_pwm_remove(struct platform_device *pdev) +static int ep93xx_pwm_remove(struct platform_device *pdev)  {  	struct ep93xx_pwm *pwm = platform_get_drvdata(pdev); -	struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0); -	ep93xx_pwm_disable(pwm); +	writel(0x0, pwm->mmio_base + EP93XX_PWMx_ENABLE);  	clk_disable(pwm->clk); -	clk_put(pwm->clk); -	platform_set_drvdata(pdev, NULL);  	sysfs_remove_group(&pdev->dev.kobj, &ep93xx_pwm_sysfs_files); -	iounmap(pwm->mmio_base); -	release_mem_region(res->start, resource_size(res)); -	kfree(pwm);  	ep93xx_pwm_release_gpio(pdev);  	return 0; @@ -362,10 +274,10 @@ static struct platform_driver ep93xx_pwm_driver = {  		.name	= "ep93xx-pwm",  		.owner	= THIS_MODULE,  	}, -	.remove		= __exit_p(ep93xx_pwm_remove), +	.probe		= ep93xx_pwm_probe, +	.remove		= ep93xx_pwm_remove,  }; - -module_platform_driver_probe(ep93xx_pwm_driver, ep93xx_pwm_probe); +module_platform_driver(ep93xx_pwm_driver);  MODULE_AUTHOR("Matthieu Crapet <mcrapet@gmail.com>, "  	      "H Hartley Sweeten <hsweeten@visionengravers.com>");  | 
