| Message ID | 1331802277-12477-2-git-send-email-s.hauer@pengutronix.de |
|---|---|
| State | New |
| Headers | show |
On Thu, Mar 15, 2012 at 10:04:35AM +0100, Sascha Hauer wrote: > Move the driver to drivers/pwm/ and convert it to use the framework. > > Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> > --- > arch/arm/plat-mxc/Kconfig | 6 - > arch/arm/plat-mxc/Makefile | 1 - > drivers/pwm/Kconfig | 9 ++ > drivers/pwm/Makefile | 1 + > arch/arm/plat-mxc/pwm.c => drivers/pwm/pwm-imx.c | 155 ++++++++------------- > 5 files changed, 69 insertions(+), 103 deletions(-) > rename arch/arm/plat-mxc/pwm.c => drivers/pwm/pwm-imx.c (66%) > > diff --git a/arch/arm/plat-mxc/Kconfig b/arch/arm/plat-mxc/Kconfig > index dcebb12..ee09395 100644 > --- a/arch/arm/plat-mxc/Kconfig > +++ b/arch/arm/plat-mxc/Kconfig > @@ -47,12 +47,6 @@ config MXC_TZIC > config MXC_AVIC > bool > > -config MXC_PWM > - tristate "Enable PWM driver" > - select HAVE_PWM > - help > - Enable support for the i.MX PWM controller(s). > - > config MXC_DEBUG_BOARD > bool "Enable MXC debug board(for 3-stack)" > help > diff --git a/arch/arm/plat-mxc/Makefile b/arch/arm/plat-mxc/Makefile > index 076db84f..d75ab5a 100644 > --- a/arch/arm/plat-mxc/Makefile > +++ b/arch/arm/plat-mxc/Makefile > @@ -11,7 +11,6 @@ obj-$(CONFIG_MXC_AVIC) += avic.o > obj-$(CONFIG_IMX_HAVE_IOMUX_V1) += iomux-v1.o > obj-$(CONFIG_ARCH_MXC_IOMUX_V3) += iomux-v3.o > obj-$(CONFIG_IRAM_ALLOC) += iram_alloc.o > -obj-$(CONFIG_MXC_PWM) += pwm.o > obj-$(CONFIG_MXC_ULPI) += ulpi.o > obj-$(CONFIG_MXC_USE_EPIT) += epit.o > obj-$(CONFIG_ARCH_MXC_AUDMUX_V1) += audmux-v1.o > diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig > index 0ef4f30..a9a9715 100644 > --- a/drivers/pwm/Kconfig > +++ b/drivers/pwm/Kconfig > @@ -18,6 +18,15 @@ config PWM_BFIN > To compile this driver as a module, choose M here: the module > will be called pwm-bfin. > > +config PWM_IMX > + tristate "i.MX pwm support" > + depends on ARCH_MXC > + help > + Generic PWM framework driver for i.MX. > + > + To compile this driver as a module, choose M here: the module > + will be called pwm-imx. > + > config PWM_PXA > tristate "PXA PWM support" > depends on ARCH_PXA > diff --git a/drivers/pwm/Makefile b/drivers/pwm/Makefile > index e859c51..fc7571e 100644 > --- a/drivers/pwm/Makefile > +++ b/drivers/pwm/Makefile > @@ -1,4 +1,5 @@ > obj-$(CONFIG_PWM) += core.o > obj-$(CONFIG_PWM_BFIN) += pwm-bfin.o > +obj-$(CONFIG_PWM_IMX) += imx-pwm.o s/imx-pwm.o/pwm-imx.o > obj-$(CONFIG_PWM_PXA) += pwm-pxa.o > obj-$(CONFIG_PWM_TEGRA) += pwm-tegra.o > diff --git a/arch/arm/plat-mxc/pwm.c b/drivers/pwm/pwm-imx.c > similarity index 66% > rename from arch/arm/plat-mxc/pwm.c > rename to drivers/pwm/pwm-imx.c > index e032717..cdb02b0 100644 > --- a/arch/arm/plat-mxc/pwm.c > +++ b/drivers/pwm/pwm-imx.c > @@ -39,24 +39,24 @@ > #define MX3_PWMCR_CLKSRC_IPG (1 << 16) > #define MX3_PWMCR_EN (1 << 0) > > - > - > -struct pwm_device { > +struct imx_pwm_device { > struct list_head node; > - struct platform_device *pdev; > > - const char *label; > struct clk *clk; > > int clk_enabled; > void __iomem *mmio_base; > > - unsigned int use_count; > - unsigned int pwm_id; > + struct pwm_chip chip; > }; > > -int pwm_config(struct pwm_device *pwm, int duty_ns, int period_ns) > +#define to_imx_pwm_device(chip) container_of(chip, struct imx_pwm_device, chip) > + > +static int imx_pwm_config(struct pwm_chip *chip, > + struct pwm_device *pwm, int duty_ns, int period_ns) > { > + struct imx_pwm_device *imxpwm = to_imx_pwm_device(chip); > + > if (pwm == NULL || period_ns == 0 || duty_ns > period_ns) > return -EINVAL; > > @@ -65,7 +65,7 @@ int pwm_config(struct pwm_device *pwm, int duty_ns, int period_ns) > unsigned long period_cycles, duty_cycles, prescale; > u32 cr; > > - c = clk_get_rate(pwm->clk); > + c = clk_get_rate(imxpwm->clk); > c = c * period_ns; > do_div(c, 1000000000); > period_cycles = c; > @@ -86,8 +86,8 @@ int pwm_config(struct pwm_device *pwm, int duty_ns, int period_ns) > else > period_cycles = 0; > > - writel(duty_cycles, pwm->mmio_base + MX3_PWMSAR); > - writel(period_cycles, pwm->mmio_base + MX3_PWMPR); > + writel(duty_cycles, imxpwm->mmio_base + MX3_PWMSAR); > + writel(period_cycles, imxpwm->mmio_base + MX3_PWMPR); > > cr = MX3_PWMCR_PRESCALER(prescale) | > MX3_PWMCR_DOZEEN | MX3_PWMCR_WAITEN | > @@ -98,7 +98,7 @@ int pwm_config(struct pwm_device *pwm, int duty_ns, int period_ns) > else > cr |= MX3_PWMCR_CLKSRC_IPG_HIGH; > > - writel(cr, pwm->mmio_base + MX3_PWMCR); > + writel(cr, imxpwm->mmio_base + MX3_PWMCR); > } else if (cpu_is_mx1() || cpu_is_mx21()) { Since we are here, can we move one step further to get rid of these cpu_is_xxx()? Then, we can remove <mach/hardware.h> inclusion from the driver. > /* The PWM subsystem allows for exact frequencies. However, > * I cannot connect a scope on my device to the PWM line and > @@ -116,110 +116,70 @@ int pwm_config(struct pwm_device *pwm, int duty_ns, int period_ns) > * both the prescaler (/1 .. /128) and then by CLKSEL > * (/2 .. /16). > */ > - u32 max = readl(pwm->mmio_base + MX1_PWMP); > + u32 max = readl(imxpwm->mmio_base + MX1_PWMP); > u32 p = max * duty_ns / period_ns; > - writel(max - p, pwm->mmio_base + MX1_PWMS); > + writel(max - p, imxpwm->mmio_base + MX1_PWMS); > } else { > BUG(); > } > > return 0; > } > -EXPORT_SYMBOL(pwm_config); > > -int pwm_enable(struct pwm_device *pwm) > +static int imx_pwm_enable(struct pwm_chip *chip, struct pwm_device *pwm) > { > + struct imx_pwm_device *imxpwm = to_imx_pwm_device(chip); > int rc = 0; > > - if (!pwm->clk_enabled) { > - rc = clk_enable(pwm->clk); > + if (!imxpwm->clk_enabled) { > + rc = clk_enable(imxpwm->clk); > if (!rc) > - pwm->clk_enabled = 1; > + imxpwm->clk_enabled = 1; > } > return rc; > } > -EXPORT_SYMBOL(pwm_enable); > - > -void pwm_disable(struct pwm_device *pwm) > -{ > - writel(0, pwm->mmio_base + MX3_PWMCR); > - > - if (pwm->clk_enabled) { > - clk_disable(pwm->clk); > - pwm->clk_enabled = 0; > - } > -} > -EXPORT_SYMBOL(pwm_disable); > - > -static DEFINE_MUTEX(pwm_lock); > -static LIST_HEAD(pwm_list); > > -struct pwm_device *pwm_request(int pwm_id, const char *label) > +static void imx_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm) > { > - struct pwm_device *pwm; > - int found = 0; > + struct imx_pwm_device *imxpwm = to_imx_pwm_device(chip); > > - mutex_lock(&pwm_lock); > + writel(0, imxpwm->mmio_base + MX3_PWMCR); > > - list_for_each_entry(pwm, &pwm_list, node) { > - if (pwm->pwm_id == pwm_id) { > - found = 1; > - break; > - } > + if (imxpwm->clk_enabled) { > + clk_disable(imxpwm->clk); > + imxpwm->clk_enabled = 0; > } > - > - 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 struct pwm_ops imx_pwm_ops = { > + .enable = imx_pwm_enable, > + .disable = imx_pwm_disable, > + .config = imx_pwm_config, > + .owner = THIS_MODULE, > +}; > > static int __devinit mxc_pwm_probe(struct platform_device *pdev) Should we take this opportunity to rename the driver from mxc_pwm to imx_pwm? Also, does mxc_pwm_init need necessarily to be an arch_initcall? Otherwise, we can have the following change. -static int __init mxc_pwm_init(void) -{ - return platform_driver_register(&mxc_pwm_driver); -} -arch_initcall(mxc_pwm_init); - -static void __exit mxc_pwm_exit(void) -{ - platform_driver_unregister(&mxc_pwm_driver); -} -module_exit(mxc_pwm_exit); +module_platform_driver(imx_pwm_driver); Regards, Shawn > { > - struct pwm_device *pwm; > + struct imx_pwm_device *imxpwm; > struct resource *r; > int ret = 0; > > - pwm = kzalloc(sizeof(struct pwm_device), GFP_KERNEL); > - if (pwm == NULL) { > + imxpwm = kzalloc(sizeof(*imxpwm), GFP_KERNEL); > + if (imxpwm == NULL) { > dev_err(&pdev->dev, "failed to allocate memory\n"); > return -ENOMEM; > } > > - pwm->clk = clk_get(&pdev->dev, "pwm"); > + imxpwm->clk = clk_get(&pdev->dev, "pwm"); > > - if (IS_ERR(pwm->clk)) { > - ret = PTR_ERR(pwm->clk); > + if (IS_ERR(imxpwm->clk)) { > + ret = PTR_ERR(imxpwm->clk); > goto err_free; > } > > - pwm->clk_enabled = 0; > + imxpwm->chip.ops = &imx_pwm_ops; > > - pwm->use_count = 0; > - pwm->pwm_id = pdev->id; > - pwm->pdev = pdev; > + imxpwm->clk_enabled = 0; > > r = platform_get_resource(pdev, IORESOURCE_MEM, 0); > if (r == NULL) { > @@ -235,50 +195,53 @@ static int __devinit mxc_pwm_probe(struct platform_device *pdev) > goto err_free_clk; > } > > - pwm->mmio_base = ioremap(r->start, resource_size(r)); > - if (pwm->mmio_base == NULL) { > + imxpwm->mmio_base = ioremap(r->start, resource_size(r)); > + if (imxpwm->mmio_base == NULL) { > dev_err(&pdev->dev, "failed to ioremap() registers\n"); > ret = -ENODEV; > goto err_free_mem; > } > > - mutex_lock(&pwm_lock); > - list_add_tail(&pwm->node, &pwm_list); > - mutex_unlock(&pwm_lock); > + ret = pwmchip_add(&imxpwm->chip); > + if (ret) > + goto err_iounmap; > > - platform_set_drvdata(pdev, pwm); > + platform_set_drvdata(pdev, imxpwm); > return 0; > > +err_iounmap: > + iounmap(imxpwm->mmio_base); > err_free_mem: > release_mem_region(r->start, resource_size(r)); > err_free_clk: > - clk_put(pwm->clk); > + clk_put(imxpwm->clk); > err_free: > - kfree(pwm); > + kfree(imxpwm); > return ret; > } > > static int __devexit mxc_pwm_remove(struct platform_device *pdev) > { > - struct pwm_device *pwm; > + struct imx_pwm_device *imxpwm; > struct resource *r; > + int ret; > > - pwm = platform_get_drvdata(pdev); > - if (pwm == NULL) > + imxpwm = platform_get_drvdata(pdev); > + if (imxpwm == NULL) > return -ENODEV; > > - mutex_lock(&pwm_lock); > - list_del(&pwm->node); > - mutex_unlock(&pwm_lock); > + ret = pwmchip_remove(&imxpwm->chip); > + if (ret) > + return ret; > > - iounmap(pwm->mmio_base); > + iounmap(imxpwm->mmio_base); > > r = platform_get_resource(pdev, IORESOURCE_MEM, 0); > release_mem_region(r->start, resource_size(r)); > > - clk_put(pwm->clk); > + clk_put(imxpwm->clk); > > - kfree(pwm); > + kfree(imxpwm); > return 0; > } > > -- > 1.7.9.1 >
* Shawn Guo wrote: > On Thu, Mar 15, 2012 at 10:04:35AM +0100, Sascha Hauer wrote: > > diff --git a/drivers/pwm/Makefile b/drivers/pwm/Makefile > > index e859c51..fc7571e 100644 > > --- a/drivers/pwm/Makefile > > +++ b/drivers/pwm/Makefile > > @@ -1,4 +1,5 @@ > > obj-$(CONFIG_PWM) += core.o > > obj-$(CONFIG_PWM_BFIN) += pwm-bfin.o > > +obj-$(CONFIG_PWM_IMX) += imx-pwm.o > > s/imx-pwm.o/pwm-imx.o Yes, I'll make that change when I integrate the patch in my series. > > @@ -98,7 +98,7 @@ int pwm_config(struct pwm_device *pwm, int duty_ns, int period_ns) > > else > > cr |= MX3_PWMCR_CLKSRC_IPG_HIGH; > > > > - writel(cr, pwm->mmio_base + MX3_PWMCR); > > + writel(cr, imxpwm->mmio_base + MX3_PWMCR); > > } else if (cpu_is_mx1() || cpu_is_mx21()) { > > Since we are here, can we move one step further to get rid of these > cpu_is_xxx()? Then, we can remove <mach/hardware.h> inclusion from > the driver. I guess this could be handled by using several names for the driver and handling the differences using a table of platform_device_id:s. Perhaps you had something different in mind? > > static int __devinit mxc_pwm_probe(struct platform_device *pdev) > > Should we take this opportunity to rename the driver from mxc_pwm to > imx_pwm? If we decide to rename maybe it should be done in two steps. First it can be renamed internally and in the second step the name could be changed along with all users. I just want to avoid too much churn in this series, which is already growing way larger than I had hoped. > Also, does mxc_pwm_init need necessarily to be an arch_initcall? > Otherwise, we can have the following change. > > -static int __init mxc_pwm_init(void) > -{ > - return platform_driver_register(&mxc_pwm_driver); > -} > -arch_initcall(mxc_pwm_init); > - > -static void __exit mxc_pwm_exit(void) > -{ > - platform_driver_unregister(&mxc_pwm_driver); > -} > -module_exit(mxc_pwm_exit); > +module_platform_driver(imx_pwm_driver); I assume that some platforms may require it to be initialized early because other drivers may depend on the PWMs being present. However this can probably be solved in a much better way by using deferred driver probing, which should be available in 3.4. Thierry
On Fri, Mar 16, 2012 at 09:08:32AM +0100, Thierry Reding wrote: > * Shawn Guo wrote: > > On Thu, Mar 15, 2012 at 10:04:35AM +0100, Sascha Hauer wrote: > > > diff --git a/drivers/pwm/Makefile b/drivers/pwm/Makefile > > > index e859c51..fc7571e 100644 > > > --- a/drivers/pwm/Makefile > > > +++ b/drivers/pwm/Makefile > > > @@ -1,4 +1,5 @@ > > > obj-$(CONFIG_PWM) += core.o > > > obj-$(CONFIG_PWM_BFIN) += pwm-bfin.o > > > +obj-$(CONFIG_PWM_IMX) += imx-pwm.o > > > > s/imx-pwm.o/pwm-imx.o > > Yes, I'll make that change when I integrate the patch in my series. > Thanks for taking this on. > > > @@ -98,7 +98,7 @@ int pwm_config(struct pwm_device *pwm, int duty_ns, int period_ns) > > > else > > > cr |= MX3_PWMCR_CLKSRC_IPG_HIGH; > > > > > > - writel(cr, pwm->mmio_base + MX3_PWMCR); > > > + writel(cr, imxpwm->mmio_base + MX3_PWMCR); > > > } else if (cpu_is_mx1() || cpu_is_mx21()) { > > > > Since we are here, can we move one step further to get rid of these > > cpu_is_xxx()? Then, we can remove <mach/hardware.h> inclusion from > > the driver. > > I guess this could be handled by using several names for the driver and > handling the differences using a table of platform_device_id:s. Perhaps > you had something different in mind? > Same thing on my mind. > > > static int __devinit mxc_pwm_probe(struct platform_device *pdev) > > > > Should we take this opportunity to rename the driver from mxc_pwm to > > imx_pwm? > > If we decide to rename maybe it should be done in two steps. First it can be > renamed internally and in the second step the name could be changed along > with all users. I just want to avoid too much churn in this series, which is > already growing way larger than I had hoped. > It seems I'm asking too much. Okay, we can do that after it gets moved. > > Also, does mxc_pwm_init need necessarily to be an arch_initcall? > > Otherwise, we can have the following change. > > > > -static int __init mxc_pwm_init(void) > > -{ > > - return platform_driver_register(&mxc_pwm_driver); > > -} > > -arch_initcall(mxc_pwm_init); > > - > > -static void __exit mxc_pwm_exit(void) > > -{ > > - platform_driver_unregister(&mxc_pwm_driver); > > -} > > -module_exit(mxc_pwm_exit); > > +module_platform_driver(imx_pwm_driver); > > I assume that some platforms may require it to be initialized early because > other drivers may depend on the PWMs being present. However this can probably > be solved in a much better way by using deferred driver probing, which should > be available in 3.4. > Ditto.
On Fri, Mar 16, 2012 at 04:17:51PM +0800, Shawn Guo wrote: > On Fri, Mar 16, 2012 at 09:08:32AM +0100, Thierry Reding wrote: > > * Shawn Guo wrote: > > > On Thu, Mar 15, 2012 at 10:04:35AM +0100, Sascha Hauer wrote: > > > > diff --git a/drivers/pwm/Makefile b/drivers/pwm/Makefile > > > > index e859c51..fc7571e 100644 > > > > --- a/drivers/pwm/Makefile > > > > +++ b/drivers/pwm/Makefile > > > > @@ -1,4 +1,5 @@ > > > > obj-$(CONFIG_PWM) += core.o > > > > obj-$(CONFIG_PWM_BFIN) += pwm-bfin.o > > > > +obj-$(CONFIG_PWM_IMX) += imx-pwm.o > > > > > > s/imx-pwm.o/pwm-imx.o > > > > Yes, I'll make that change when I integrate the patch in my series. > > > Thanks for taking this on. > > > > > @@ -98,7 +98,7 @@ int pwm_config(struct pwm_device *pwm, int duty_ns, int period_ns) > > > > else > > > > cr |= MX3_PWMCR_CLKSRC_IPG_HIGH; > > > > > > > > - writel(cr, pwm->mmio_base + MX3_PWMCR); > > > > + writel(cr, imxpwm->mmio_base + MX3_PWMCR); > > > > } else if (cpu_is_mx1() || cpu_is_mx21()) { > > > > > > Since we are here, can we move one step further to get rid of these > > > cpu_is_xxx()? Then, we can remove <mach/hardware.h> inclusion from > > > the driver. > > > > I guess this could be handled by using several names for the driver and > > handling the differences using a table of platform_device_id:s. Perhaps > > you had something different in mind? > > > Same thing on my mind. > > > > > static int __devinit mxc_pwm_probe(struct platform_device *pdev) > > > > > > Should we take this opportunity to rename the driver from mxc_pwm to > > > imx_pwm? > > > > If we decide to rename maybe it should be done in two steps. First it can be > > renamed internally and in the second step the name could be changed along > > with all users. I just want to avoid too much churn in this series, which is > > already growing way larger than I had hoped. > > > It seems I'm asking too much. Okay, we can do that after it gets moved. Indeed. The pwm driver became a horrible piece of code over time, it's time to refactor it. I just wanted to make the move first, then look for further cleanups. Sascha
diff --git a/arch/arm/plat-mxc/Kconfig b/arch/arm/plat-mxc/Kconfig index dcebb12..ee09395 100644 --- a/arch/arm/plat-mxc/Kconfig +++ b/arch/arm/plat-mxc/Kconfig @@ -47,12 +47,6 @@ config MXC_TZIC config MXC_AVIC bool -config MXC_PWM - tristate "Enable PWM driver" - select HAVE_PWM - help - Enable support for the i.MX PWM controller(s). - config MXC_DEBUG_BOARD bool "Enable MXC debug board(for 3-stack)" help diff --git a/arch/arm/plat-mxc/Makefile b/arch/arm/plat-mxc/Makefile index 076db84f..d75ab5a 100644 --- a/arch/arm/plat-mxc/Makefile +++ b/arch/arm/plat-mxc/Makefile @@ -11,7 +11,6 @@ obj-$(CONFIG_MXC_AVIC) += avic.o obj-$(CONFIG_IMX_HAVE_IOMUX_V1) += iomux-v1.o obj-$(CONFIG_ARCH_MXC_IOMUX_V3) += iomux-v3.o obj-$(CONFIG_IRAM_ALLOC) += iram_alloc.o -obj-$(CONFIG_MXC_PWM) += pwm.o obj-$(CONFIG_MXC_ULPI) += ulpi.o obj-$(CONFIG_MXC_USE_EPIT) += epit.o obj-$(CONFIG_ARCH_MXC_AUDMUX_V1) += audmux-v1.o diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig index 0ef4f30..a9a9715 100644 --- a/drivers/pwm/Kconfig +++ b/drivers/pwm/Kconfig @@ -18,6 +18,15 @@ config PWM_BFIN To compile this driver as a module, choose M here: the module will be called pwm-bfin. +config PWM_IMX + tristate "i.MX pwm support" + depends on ARCH_MXC + help + Generic PWM framework driver for i.MX. + + To compile this driver as a module, choose M here: the module + will be called pwm-imx. + config PWM_PXA tristate "PXA PWM support" depends on ARCH_PXA diff --git a/drivers/pwm/Makefile b/drivers/pwm/Makefile index e859c51..fc7571e 100644 --- a/drivers/pwm/Makefile +++ b/drivers/pwm/Makefile @@ -1,4 +1,5 @@ obj-$(CONFIG_PWM) += core.o obj-$(CONFIG_PWM_BFIN) += pwm-bfin.o +obj-$(CONFIG_PWM_IMX) += imx-pwm.o obj-$(CONFIG_PWM_PXA) += pwm-pxa.o obj-$(CONFIG_PWM_TEGRA) += pwm-tegra.o diff --git a/arch/arm/plat-mxc/pwm.c b/drivers/pwm/pwm-imx.c similarity index 66% rename from arch/arm/plat-mxc/pwm.c rename to drivers/pwm/pwm-imx.c index e032717..cdb02b0 100644 --- a/arch/arm/plat-mxc/pwm.c +++ b/drivers/pwm/pwm-imx.c @@ -39,24 +39,24 @@ #define MX3_PWMCR_CLKSRC_IPG (1 << 16) #define MX3_PWMCR_EN (1 << 0) - - -struct pwm_device { +struct imx_pwm_device { struct list_head node; - struct platform_device *pdev; - const char *label; struct clk *clk; int clk_enabled; void __iomem *mmio_base; - unsigned int use_count; - unsigned int pwm_id; + struct pwm_chip chip; }; -int pwm_config(struct pwm_device *pwm, int duty_ns, int period_ns) +#define to_imx_pwm_device(chip) container_of(chip, struct imx_pwm_device, chip) + +static int imx_pwm_config(struct pwm_chip *chip, + struct pwm_device *pwm, int duty_ns, int period_ns) { + struct imx_pwm_device *imxpwm = to_imx_pwm_device(chip); + if (pwm == NULL || period_ns == 0 || duty_ns > period_ns) return -EINVAL; @@ -65,7 +65,7 @@ int pwm_config(struct pwm_device *pwm, int duty_ns, int period_ns) unsigned long period_cycles, duty_cycles, prescale; u32 cr; - c = clk_get_rate(pwm->clk); + c = clk_get_rate(imxpwm->clk); c = c * period_ns; do_div(c, 1000000000); period_cycles = c; @@ -86,8 +86,8 @@ int pwm_config(struct pwm_device *pwm, int duty_ns, int period_ns) else period_cycles = 0; - writel(duty_cycles, pwm->mmio_base + MX3_PWMSAR); - writel(period_cycles, pwm->mmio_base + MX3_PWMPR); + writel(duty_cycles, imxpwm->mmio_base + MX3_PWMSAR); + writel(period_cycles, imxpwm->mmio_base + MX3_PWMPR); cr = MX3_PWMCR_PRESCALER(prescale) | MX3_PWMCR_DOZEEN | MX3_PWMCR_WAITEN | @@ -98,7 +98,7 @@ int pwm_config(struct pwm_device *pwm, int duty_ns, int period_ns) else cr |= MX3_PWMCR_CLKSRC_IPG_HIGH; - writel(cr, pwm->mmio_base + MX3_PWMCR); + writel(cr, imxpwm->mmio_base + MX3_PWMCR); } else if (cpu_is_mx1() || cpu_is_mx21()) { /* The PWM subsystem allows for exact frequencies. However, * I cannot connect a scope on my device to the PWM line and @@ -116,110 +116,70 @@ int pwm_config(struct pwm_device *pwm, int duty_ns, int period_ns) * both the prescaler (/1 .. /128) and then by CLKSEL * (/2 .. /16). */ - u32 max = readl(pwm->mmio_base + MX1_PWMP); + u32 max = readl(imxpwm->mmio_base + MX1_PWMP); u32 p = max * duty_ns / period_ns; - writel(max - p, pwm->mmio_base + MX1_PWMS); + writel(max - p, imxpwm->mmio_base + MX1_PWMS); } else { BUG(); } return 0; } -EXPORT_SYMBOL(pwm_config); -int pwm_enable(struct pwm_device *pwm) +static int imx_pwm_enable(struct pwm_chip *chip, struct pwm_device *pwm) { + struct imx_pwm_device *imxpwm = to_imx_pwm_device(chip); int rc = 0; - if (!pwm->clk_enabled) { - rc = clk_enable(pwm->clk); + if (!imxpwm->clk_enabled) { + rc = clk_enable(imxpwm->clk); if (!rc) - pwm->clk_enabled = 1; + imxpwm->clk_enabled = 1; } return rc; } -EXPORT_SYMBOL(pwm_enable); - -void pwm_disable(struct pwm_device *pwm) -{ - writel(0, pwm->mmio_base + MX3_PWMCR); - - if (pwm->clk_enabled) { - clk_disable(pwm->clk); - pwm->clk_enabled = 0; - } -} -EXPORT_SYMBOL(pwm_disable); - -static DEFINE_MUTEX(pwm_lock); -static LIST_HEAD(pwm_list); -struct pwm_device *pwm_request(int pwm_id, const char *label) +static void imx_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm) { - struct pwm_device *pwm; - int found = 0; + struct imx_pwm_device *imxpwm = to_imx_pwm_device(chip); - mutex_lock(&pwm_lock); + writel(0, imxpwm->mmio_base + MX3_PWMCR); - list_for_each_entry(pwm, &pwm_list, node) { - if (pwm->pwm_id == pwm_id) { - found = 1; - break; - } + if (imxpwm->clk_enabled) { + clk_disable(imxpwm->clk); + imxpwm->clk_enabled = 0; } - - 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 struct pwm_ops imx_pwm_ops = { + .enable = imx_pwm_enable, + .disable = imx_pwm_disable, + .config = imx_pwm_config, + .owner = THIS_MODULE, +}; static int __devinit mxc_pwm_probe(struct platform_device *pdev) { - struct pwm_device *pwm; + struct imx_pwm_device *imxpwm; struct resource *r; int ret = 0; - pwm = kzalloc(sizeof(struct pwm_device), GFP_KERNEL); - if (pwm == NULL) { + imxpwm = kzalloc(sizeof(*imxpwm), GFP_KERNEL); + if (imxpwm == NULL) { dev_err(&pdev->dev, "failed to allocate memory\n"); return -ENOMEM; } - pwm->clk = clk_get(&pdev->dev, "pwm"); + imxpwm->clk = clk_get(&pdev->dev, "pwm"); - if (IS_ERR(pwm->clk)) { - ret = PTR_ERR(pwm->clk); + if (IS_ERR(imxpwm->clk)) { + ret = PTR_ERR(imxpwm->clk); goto err_free; } - pwm->clk_enabled = 0; + imxpwm->chip.ops = &imx_pwm_ops; - pwm->use_count = 0; - pwm->pwm_id = pdev->id; - pwm->pdev = pdev; + imxpwm->clk_enabled = 0; r = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (r == NULL) { @@ -235,50 +195,53 @@ static int __devinit mxc_pwm_probe(struct platform_device *pdev) goto err_free_clk; } - pwm->mmio_base = ioremap(r->start, resource_size(r)); - if (pwm->mmio_base == NULL) { + imxpwm->mmio_base = ioremap(r->start, resource_size(r)); + if (imxpwm->mmio_base == NULL) { dev_err(&pdev->dev, "failed to ioremap() registers\n"); ret = -ENODEV; goto err_free_mem; } - mutex_lock(&pwm_lock); - list_add_tail(&pwm->node, &pwm_list); - mutex_unlock(&pwm_lock); + ret = pwmchip_add(&imxpwm->chip); + if (ret) + goto err_iounmap; - platform_set_drvdata(pdev, pwm); + platform_set_drvdata(pdev, imxpwm); return 0; +err_iounmap: + iounmap(imxpwm->mmio_base); err_free_mem: release_mem_region(r->start, resource_size(r)); err_free_clk: - clk_put(pwm->clk); + clk_put(imxpwm->clk); err_free: - kfree(pwm); + kfree(imxpwm); return ret; } static int __devexit mxc_pwm_remove(struct platform_device *pdev) { - struct pwm_device *pwm; + struct imx_pwm_device *imxpwm; struct resource *r; + int ret; - pwm = platform_get_drvdata(pdev); - if (pwm == NULL) + imxpwm = platform_get_drvdata(pdev); + if (imxpwm == NULL) return -ENODEV; - mutex_lock(&pwm_lock); - list_del(&pwm->node); - mutex_unlock(&pwm_lock); + ret = pwmchip_remove(&imxpwm->chip); + if (ret) + return ret; - iounmap(pwm->mmio_base); + iounmap(imxpwm->mmio_base); r = platform_get_resource(pdev, IORESOURCE_MEM, 0); release_mem_region(r->start, resource_size(r)); - clk_put(pwm->clk); + clk_put(imxpwm->clk); - kfree(pwm); + kfree(imxpwm); return 0; }
Move the driver to drivers/pwm/ and convert it to use the framework. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> --- arch/arm/plat-mxc/Kconfig | 6 - arch/arm/plat-mxc/Makefile | 1 - drivers/pwm/Kconfig | 9 ++ drivers/pwm/Makefile | 1 + arch/arm/plat-mxc/pwm.c => drivers/pwm/pwm-imx.c | 155 ++++++++------------- 5 files changed, 69 insertions(+), 103 deletions(-) rename arch/arm/plat-mxc/pwm.c => drivers/pwm/pwm-imx.c (66%)