Merge branch 'for-3.6' of git://gitorious.org/linux-pwm/linux-pwm

Pull PWM subsystem from Thierry Reding:
 "The new PWM subsystem aims at collecting all implementations of the
  legacy PWM API and to eventually replace it completely.

  The subsystem has been in development for over half a year now and
  many drivers have already been converted.  It has been in linux-next
  for a couple of weeks and there have been no major issues so I think
  it is ready for inclusion in your tree."

Arnd Bergmann <arnd@arndb.de>:
 "Very much Ack on the new subsystem.  It uses the interface
  declarations as the previously separate pwm drivers, so nothing
  changes for now in the drivers using it, although it enables us to
  change those more easily in the future if we want to.

  This work is also one of the missing pieces that are required to
  eventually build ARM kernels for multiple platforms, which is
  currently prohibited (amongs other things) by the fact that you cannot
  have more than one driver exporting the pwm functions."

Tested-and-acked-by: Alexandre Courbot <acourbot@nvidia.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Philip, Avinash <avinashphilip@ti.com> # TI's AM33xx platforms
Acked-By: Alexandre Pereira da Silva <aletes.xgr@gmail.com> # LPC32XX
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Sachin Kamat <sachin.kamat@linaro.org>

Fix up trivial conflicts with other cleanups and DT updates.

* 'for-3.6' of git://gitorious.org/linux-pwm/linux-pwm: (36 commits)
  pwm: pwm-tiehrpwm: PWM driver support for EHRPWM
  pwm: pwm-tiecap: PWM driver support for ECAP APWM
  pwm: fix used-uninitialized warning in pwm_get()
  pwm: add lpc32xx PWM support
  pwm_backlight: pass correct brightness to callback
  pwm: Use pr_* functions in pwm-samsung.c file
  pwm: Convert pwm-samsung to use devm_* APIs
  pwm: Convert pwm-tegra to use devm_clk_get()
  pwm: pwm-mxs: Return proper error if pwmchip_remove() fails
  pwm: pwm-bfin: Return proper error if pwmchip_remove() fails
  pwm: pxa: Propagate pwmchip_remove() error
  pwm: Convert pwm-pxa to use devm_* APIs
  pwm: Convert pwm-vt8500 to use devm_* APIs
  pwm: Convert pwm-imx to use devm_* APIs
  pwm: Conflict with legacy PWM API
  pwm: pwm-mxs: add pinctrl support
  pwm: pwm-mxs: use devm_* managed functions
  pwm: pwm-mxs: use global reset function stmp_reset_block
  pwm: pwm-mxs: encode soc name in compatible string
  pwm: Take over maintainership of the PWM subsystem
  ...

2 files changed, 0 insertions, 267 deletions

diff --git a/arch/arm/mach-vt8500/Makefile b/arch/arm/mach-vt8500/Makefile
index 54e69973f39b..7ce51767c99c 100644
--- a/arch/arm/mach-vt8500/Makefile
+++ b/arch/arm/mach-vt8500/Makefile
@@ -5,5 +5,3 @@ obj-$(CONFIG_VTWM_VERSION_WM8505) += devices-wm8505.o
 
 obj-$(CONFIG_MACH_BV07) += bv07.o
 obj-$(CONFIG_MACH_WM8505_7IN_NETBOOK) += wm8505_7in.o
-
-obj-$(CONFIG_HAVE_PWM) += pwm.o
diff --git a/arch/arm/mach-vt8500/pwm.c b/arch/arm/mach-vt8500/pwm.c
deleted file mode 100644
index 8ad825e93592..000000000000
--- a/arch/arm/mach-vt8500/pwm.c
+++ /dev/null
@@ -1,265 +0,0 @@
-/*
- * arch/arm/mach-vt8500/pwm.c
- *
- *  Copyright (C) 2010 Alexey Charkov <alchark@gmail.com>
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/platform_device.h>
-#include <linux/slab.h>
-#include <linux/err.h>
-#include <linux/io.h>
-#include <linux/pwm.h>
-#include <linux/delay.h>
-
-#include <asm/div64.h>
-
-#define VT8500_NR_PWMS 4
-
-static DEFINE_MUTEX(pwm_lock);
-static LIST_HEAD(pwm_list);
-
-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 msecs_to_loops(t) (loops_per_jiffy / 1000 * HZ * t)
-static inline void pwm_busy_wait(void __iomem *reg, u8 bitmask)
-{
-        int loops = msecs_to_loops(10);
-        while ((readb(reg) & bitmask) && --loops)
-                cpu_relax();
-
-        if (unlikely(!loops))
-                pr_warning("Waiting for status bits 0x%x to clear timed out\n",
-                           bitmask);
-}
-
-int pwm_config(struct pwm_device *pwm, int duty_ns, int period_ns)
-{
-        unsigned long long c;
-        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 = c * period_ns;
-        do_div(c, 1000000000);
-        period_cycles = c;
-
-        if (period_cycles < 1)
-                period_cycles = 1;
-        prescale = (period_cycles - 1) / 4096;
-        pv = period_cycles / (prescale + 1) - 1;
-        if (pv > 4095)
-                pv = 4095;
-
-        if (prescale > 1023)
-                return -EINVAL;
-
-        c = (unsigned long long)pv * duty_ns;
-        do_div(c, period_ns);
-        dc = c;
-
-        pwm_busy_wait(pwm->regbase + 0x40 + pwm->pwm_id, (1 << 1));
-        writel(prescale, pwm->regbase + 0x4 + (pwm->pwm_id << 4));
-
-        pwm_busy_wait(pwm->regbase + 0x40 + pwm->pwm_id, (1 << 2));
-        writel(pv, pwm->regbase + 0x8 + (pwm->pwm_id << 4));
-
-        pwm_busy_wait(pwm->regbase + 0x40 + pwm->pwm_id, (1 << 3));
-        writel(dc, pwm->regbase + 0xc + (pwm->pwm_id << 4));
-
-        return 0;
-}
-EXPORT_SYMBOL(pwm_config);
-
-int pwm_enable(struct pwm_device *pwm)
-{
-        pwm_busy_wait(pwm->regbase + 0x40 + pwm->pwm_id, (1 << 0));
-        writel(5, pwm->regbase + (pwm->pwm_id << 4));
-        return 0;
-}
-EXPORT_SYMBOL(pwm_enable);
-
-void pwm_disable(struct pwm_device *pwm)
-{
-        pwm_busy_wait(pwm->regbase + 0x40 + pwm->pwm_id, (1 << 0));
-        writel(0, pwm->regbase + (pwm->pwm_id << 4));
-}
-EXPORT_SYMBOL(pwm_disable);
-
-struct pwm_device *pwm_request(int pwm_id, const char *label)
-{
-        struct pwm_device *pwm;
-        int found = 0;
-
-        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)
-{
-        struct pwm_device *pwms;
-        struct resource *r;
-        int ret = 0;
-        int i;
-
-        pwms = kzalloc(sizeof(struct pwm_device) * VT8500_NR_PWMS, GFP_KERNEL);
-        if (pwms == NULL) {
-                dev_err(&pdev->dev, "failed to allocate memory\n");
-                return -ENOMEM;
-        }
-
-        for (i = 0; i < VT8500_NR_PWMS; i++) {
-                pwms[i].use_count = 0;
-                pwms[i].pwm_id = i;
-                pwms[i].pdev = pdev;
-        }
-
-        r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (r == NULL) {
-                dev_err(&pdev->dev, "no memory resource defined\n");
-                ret = -ENODEV;
-                goto err_free;
-        }
-
-        r = request_mem_region(r->start, resource_size(r), pdev->name);
-        if (r == NULL) {
-                dev_err(&pdev->dev, "failed to request memory resource\n");
-                ret = -EBUSY;
-                goto err_free;
-        }
-
-        pwms[0].regbase = ioremap(r->start, resource_size(r));
-        if (pwms[0].regbase == NULL) {
-                dev_err(&pdev->dev, "failed to ioremap() registers\n");
-                ret = -ENODEV;
-                goto err_free_mem;
-        }
-
-        for (i = 1; i < VT8500_NR_PWMS; i++)
-                pwms[i].regbase = pwms[0].regbase;
-
-        for (i = 0; i < VT8500_NR_PWMS; i++)
-                __add_pwm(&pwms[i]);
-
-        platform_set_drvdata(pdev, pwms);
-        return 0;
-
-err_free_mem:
-        release_mem_region(r->start, resource_size(r));
-err_free:
-        kfree(pwms);
-        return ret;
-}
-
-static int __devexit pwm_remove(struct platform_device *pdev)
-{
-        struct pwm_device *pwms;
-        struct resource *r;
-        int i;
-
-        pwms = platform_get_drvdata(pdev);
-        if (pwms == NULL)
-                return -ENODEV;
-
-        mutex_lock(&pwm_lock);
-
-        for (i = 0; i < VT8500_NR_PWMS; i++)
-                list_del(&pwms[i].node);
-        mutex_unlock(&pwm_lock);
-
-        iounmap(pwms[0].regbase);
-
-        r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        release_mem_region(r->start, resource_size(r));
-
-        kfree(pwms);
-        return 0;
-}
-
-static struct platform_driver pwm_driver = {
-        .driver         = {
-                .name   = "vt8500-pwm",
-                .owner  = THIS_MODULE,
-        },
-        .probe          = pwm_probe,
-        .remove         = __devexit_p(pwm_remove),
-};
-
-static int __init pwm_init(void)
-{
-        return platform_driver_register(&pwm_driver);
-}
-arch_initcall(pwm_init);
-
-static void __exit pwm_exit(void)
-{
-        platform_driver_unregister(&pwm_driver);
-}
-module_exit(pwm_exit);
-
-MODULE_LICENSE("GPL");