pwm: Move AB8500 PWM driver to PWM framework

This commit moves the driver to drivers/pwm and converts it to the new
PWM framework.

Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Arun Murthy <arun.murthy@stericsson.com>

diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 98a442da892a23ae21f19f1ef548b536bac9ede4..041b656c4ca49ecf6c14facabbbf704f3728e189 100644 (file)
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -60,16 +60,6 @@ config ATMEL_PWM
          purposes including software controlled power-efficient backlights
          on LCD displays, motor control, and waveform generation.
 
-config AB8500_PWM
-       bool "AB8500 PWM support"
-       depends on AB8500_CORE && ARCH_U8500
-       select HAVE_PWM
-       depends on !PWM
-       help
-         This driver exports functions to enable/disble/config/free Pulse
-         Width Modulation in the Analog Baseband Chip AB8500.
-         It is used by led and backlight driver to control the intensity.
-
 config ATMEL_TCLIB
        bool "Atmel AT32/AT91 Timer/Counter Library"
        depends on (AVR32 || ARCH_AT91)

diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index b88df7a350b8a4f984f46bc35f4cb404fc7e2110..2129377c0de6ee32862c99a68a41b222784d9939 100644 (file)
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -44,7 +44,6 @@ obj-$(CONFIG_VMWARE_BALLOON)  += vmw_balloon.o
 obj-$(CONFIG_ARM_CHARLCD)      += arm-charlcd.o
 obj-$(CONFIG_PCH_PHUB)         += pch_phub.o
 obj-y                          += ti-st/
-obj-$(CONFIG_AB8500_PWM)       += ab8500-pwm.o
 obj-y                          += lis3lv02d/
 obj-y                          += carma/
 obj-$(CONFIG_USB_SWITCH_FSA9480) += fsa9480.o

diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig
index 90c5c7357a5041041f518f564849fa98240f50f4..99a738182bf5c8718812dca57c9a7afa2f01cf22 100644 (file)
--- a/drivers/pwm/Kconfig
+++ b/drivers/pwm/Kconfig
@@ -29,6 +29,15 @@ menuconfig PWM
 
 if PWM
 
+config PWM_AB8500
+       tristate "AB8500 PWM support"
+       depends on AB8500_CORE && ARCH_U8500
+       help
+         Generic PWM framework driver for Analog Baseband AB8500.
+
+         To compile this driver as a module, choose M here: the module
+         will be called pwm-ab8500.
+
 config PWM_BFIN
        tristate "Blackfin PWM support"
        depends on BFIN_GPTIMERS

diff --git a/drivers/pwm/Makefile b/drivers/pwm/Makefile
index e4b2c898964d4b8d32232efd672a858ae3f74b08..bebc6ff904b96b3246442706acc28a4a26fae4aa 100644 (file)
--- a/drivers/pwm/Makefile
+++ b/drivers/pwm/Makefile
@@ -1,4 +1,5 @@
 obj-$(CONFIG_PWM)              += core.o
+obj-$(CONFIG_PWM_AB8500)       += pwm-ab8500.o
 obj-$(CONFIG_PWM_BFIN)         += pwm-bfin.o
 obj-$(CONFIG_PWM_IMX)          += pwm-imx.o
 obj-$(CONFIG_PWM_LPC32XX)      += pwm-lpc32xx.o

diff --git a/drivers/misc/ab8500-pwm.c b/drivers/pwm/pwm-ab8500.c
similarity index 52%
rename from drivers/misc/ab8500-pwm.c
rename to drivers/pwm/pwm-ab8500.c
index d7a9aa14e5d5aafd8c0efc907b127147a202d197..cfb72ca873d17ece9cbdc61ee359457a2b945e54 100644 (file)
--- a/drivers/misc/ab8500-pwm.c
+++ b/drivers/pwm/pwm-ab8500.c
@@ -24,16 +24,12 @@
 #define ENABLE_PWM                     1
 #define DISABLE_PWM                    0
 
-struct pwm_device {
-       struct device *dev;
-       struct list_head node;
-       const char *label;
-       unsigned int pwm_id;
+struct ab8500_pwm_chip {
+       struct pwm_chip chip;
 };
 
-static LIST_HEAD(pwm_list);
-
-int pwm_config(struct pwm_device *pwm, int duty_ns, int period_ns)
+static int ab8500_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm,
+                            int duty_ns, int period_ns)
 {
        int ret = 0;
        unsigned int higher_val, lower_val;
@@ -50,95 +46,94 @@ int pwm_config(struct pwm_device *pwm, int duty_ns, int period_ns)
         */
        higher_val = ((duty_ns & 0x0300) >> 8);
 
-       reg = AB8500_PWM_OUT_CTRL1_REG + ((pwm->pwm_id - 1) * 2);
+       reg = AB8500_PWM_OUT_CTRL1_REG + ((chip->base - 1) * 2);
 
-       ret = abx500_set_register_interruptible(pwm->dev, AB8500_MISC,
+       ret = abx500_set_register_interruptible(chip->dev, AB8500_MISC,
                        reg, (u8)lower_val);
        if (ret < 0)
                return ret;
-       ret = abx500_set_register_interruptible(pwm->dev, AB8500_MISC,
+       ret = abx500_set_register_interruptible(chip->dev, AB8500_MISC,
                        (reg + 1), (u8)higher_val);
 
        return ret;
 }
-EXPORT_SYMBOL(pwm_config);
 
-int pwm_enable(struct pwm_device *pwm)
+static int ab8500_pwm_enable(struct pwm_chip *chip, struct pwm_device *pwm)
 {
        int ret;
 
-       ret = abx500_mask_and_set_register_interruptible(pwm->dev,
+       ret = abx500_mask_and_set_register_interruptible(chip->dev,
                                AB8500_MISC, AB8500_PWM_OUT_CTRL7_REG,
-                               1 << (pwm->pwm_id-1), ENABLE_PWM);
+                               1 << (chip->base - 1), ENABLE_PWM);
        if (ret < 0)
-               dev_err(pwm->dev, "%s: Failed to disable PWM, Error %d\n",
+               dev_err(chip->dev, "%s: Failed to disable PWM, Error %d\n",
                                                        pwm->label, ret);
        return ret;
 }
-EXPORT_SYMBOL(pwm_enable);
 
-void pwm_disable(struct pwm_device *pwm)
+static void ab8500_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm)
 {
        int ret;
 
-       ret = abx500_mask_and_set_register_interruptible(pwm->dev,
+       ret = abx500_mask_and_set_register_interruptible(chip->dev,
                                AB8500_MISC, AB8500_PWM_OUT_CTRL7_REG,
-                               1 << (pwm->pwm_id-1), DISABLE_PWM);
+                               1 << (chip->base - 1), DISABLE_PWM);
        if (ret < 0)
-               dev_err(pwm->dev, "%s: Failed to disable PWM, Error %d\n",
+               dev_err(chip->dev, "%s: Failed to disable PWM, Error %d\n",
                                                        pwm->label, ret);
        return;
 }
-EXPORT_SYMBOL(pwm_disable);
-
-struct pwm_device *pwm_request(int pwm_id, const char *label)
-{
-       struct pwm_device *pwm;
-
-       list_for_each_entry(pwm, &pwm_list, node) {
-               if (pwm->pwm_id == pwm_id) {
-                       pwm->label = label;
-                       pwm->pwm_id = pwm_id;
-                       return pwm;
-               }
-       }
-
-       return ERR_PTR(-ENOENT);
-}
-EXPORT_SYMBOL(pwm_request);
 
-void pwm_free(struct pwm_device *pwm)
-{
-       pwm_disable(pwm);
-}
-EXPORT_SYMBOL(pwm_free);
+static const struct pwm_ops ab8500_pwm_ops = {
+       .config = ab8500_pwm_config,
+       .enable = ab8500_pwm_enable,
+       .disable = ab8500_pwm_disable,
+};
 
 static int __devinit ab8500_pwm_probe(struct platform_device *pdev)
 {
-       struct pwm_device *pwm;
+       struct ab8500_pwm_chip *ab8500;
+       int err;
+
        /*
         * Nothing to be done in probe, this is required to get the
         * device which is required for ab8500 read and write
         */
-       pwm = kzalloc(sizeof(struct pwm_device), GFP_KERNEL);
-       if (pwm == NULL) {
+       ab8500 = kzalloc(sizeof(*ab8500), GFP_KERNEL);
+       if (ab8500 == NULL) {
                dev_err(&pdev->dev, "failed to allocate memory\n");
                return -ENOMEM;
        }
-       pwm->dev = &pdev->dev;
-       pwm->pwm_id = pdev->id;
-       list_add_tail(&pwm->node, &pwm_list);
-       platform_set_drvdata(pdev, pwm);
-       dev_dbg(pwm->dev, "pwm probe successful\n");
+
+       ab8500->chip.dev = &pdev->dev;
+       ab8500->chip.ops = &ab8500_pwm_ops;
+       ab8500->chip.base = pdev->id;
+       ab8500->chip.npwm = 1;
+
+       err = pwmchip_add(&ab8500->chip);
+       if (err < 0) {
+               kfree(ab8500);
+               return err;
+       }
+
+       dev_dbg(&pdev->dev, "pwm probe successful\n");
+       platform_set_drvdata(pdev, ab8500);
+
        return 0;
 }
 
 static int __devexit ab8500_pwm_remove(struct platform_device *pdev)
 {
-       struct pwm_device *pwm = platform_get_drvdata(pdev);
-       list_del(&pwm->node);
+       struct ab8500_pwm_chip *ab8500 = platform_get_drvdata(pdev);
+       int err;
+
+       err = pwmchip_remove(&ab8500->chip);
+       if (err < 0)
+               return err;
+
        dev_dbg(&pdev->dev, "pwm driver removed\n");
-       kfree(pwm);
+       kfree(ab8500);
+
        return 0;
 }
 
@@ -150,19 +145,8 @@ static struct platform_driver ab8500_pwm_driver = {
        .probe = ab8500_pwm_probe,
        .remove = __devexit_p(ab8500_pwm_remove),
 };
+module_platform_driver(ab8500_pwm_driver);
 
-static int __init ab8500_pwm_init(void)
-{
-       return platform_driver_register(&ab8500_pwm_driver);
-}
-
-static void __exit ab8500_pwm_exit(void)
-{
-       platform_driver_unregister(&ab8500_pwm_driver);
-}
-
-subsys_initcall(ab8500_pwm_init);
-module_exit(ab8500_pwm_exit);
 MODULE_AUTHOR("Arun MURTHY <arun.murthy@stericsson.com>");
 MODULE_DESCRIPTION("AB8500 Pulse Width Modulation Driver");
 MODULE_ALIAS("platform:ab8500-pwm");