pwm: lpss: Properly split driver to parts

[platform/kernel/linux-stable.git] / drivers / pwm / pwm-lpss.c

diff --git a/drivers/pwm/pwm-lpss.c b/drivers/pwm/pwm-lpss.c
index 449e372..ce9bf14 100644 (file)
--- a/drivers/pwm/pwm-lpss.c
+++ b/drivers/pwm/pwm-lpss.c
@@ -6,19 +6,17 @@
  * Author: Chew Kean Ho <kean.ho.chew@intel.com>
  * Author: Chang Rebecca Swee Fun <rebecca.swee.fun.chang@intel.com>
  * Author: Chew Chiau Ee <chiau.ee.chew@intel.com>
+ * Author: Alan Cox <alan@linux.intel.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
 
-#include <linux/acpi.h>
-#include <linux/clk.h>
-#include <linux/device.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/pwm.h>
-#include <linux/platform_device.h>
+
+#include "pwm-lpss.h"
 
 #define PWM                            0x00000000
 #define PWM_ENABLE                     BIT(31)
@@ -33,8 +31,20 @@
 struct pwm_lpss_chip {
        struct pwm_chip chip;
        void __iomem *regs;
-       struct clk *clk;
+       unsigned long clk_rate;
+};
+
+/* BayTrail */
+const struct pwm_lpss_boardinfo pwm_lpss_byt_info = {
+       25000000
+};
+EXPORT_SYMBOL_GPL(pwm_lpss_byt_info);
+
+/* Braswell */
+const struct pwm_lpss_boardinfo pwm_lpss_bsw_info = {
+       19200000
 };
+EXPORT_SYMBOL_GPL(pwm_lpss_bsw_info);
 
 static inline struct pwm_lpss_chip *to_lpwm(struct pwm_chip *chip)
 {
@@ -55,7 +65,7 @@ static int pwm_lpss_config(struct pwm_chip *chip, struct pwm_device *pwm,
        /* The equation is: base_unit = ((freq / c) * 65536) + correction */
        base_unit = freq * 65536;
 
-       c = clk_get_rate(lpwm->clk);
+       c = lpwm->clk_rate;
        if (!c)
                return -EINVAL;
 
@@ -83,11 +93,6 @@ static int pwm_lpss_enable(struct pwm_chip *chip, struct pwm_device *pwm)
 {
        struct pwm_lpss_chip *lpwm = to_lpwm(chip);
        u32 ctrl;
-       int ret;
-
-       ret = clk_prepare_enable(lpwm->clk);
-       if (ret)
-               return ret;
 
        ctrl = readl(lpwm->regs + PWM);
        writel(ctrl | PWM_ENABLE, lpwm->regs + PWM);
@@ -102,8 +107,6 @@ static void pwm_lpss_disable(struct pwm_chip *chip, struct pwm_device *pwm)
 
        ctrl = readl(lpwm->regs + PWM);
        writel(ctrl & ~PWM_ENABLE, lpwm->regs + PWM);
-
-       clk_disable_unprepare(lpwm->clk);
 }
 
 static const struct pwm_ops pwm_lpss_ops = {
@@ -113,52 +116,38 @@ static const struct pwm_ops pwm_lpss_ops = {
        .owner = THIS_MODULE,
 };
 
-static const struct acpi_device_id pwm_lpss_acpi_match[] = {
-       { "80860F09", 0 },
-       { },
-};
-MODULE_DEVICE_TABLE(acpi, pwm_lpss_acpi_match);
-
-static int pwm_lpss_probe(struct platform_device *pdev)
+struct pwm_lpss_chip *pwm_lpss_probe(struct device *dev, struct resource *r,
+                                    const struct pwm_lpss_boardinfo *info)
 {
        struct pwm_lpss_chip *lpwm;
-       struct resource *r;
        int ret;
 
-       lpwm = devm_kzalloc(&pdev->dev, sizeof(*lpwm), GFP_KERNEL);
+       lpwm = devm_kzalloc(dev, sizeof(*lpwm), GFP_KERNEL);
        if (!lpwm)
-               return -ENOMEM;
+               return ERR_PTR(-ENOMEM);
 
-       r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-
-       lpwm->regs = devm_ioremap_resource(&pdev->dev, r);
+       lpwm->regs = devm_ioremap_resource(dev, r);
        if (IS_ERR(lpwm->regs))
-               return PTR_ERR(lpwm->regs);
-
-       lpwm->clk = devm_clk_get(&pdev->dev, NULL);
-       if (IS_ERR(lpwm->clk)) {
-               dev_err(&pdev->dev, "failed to get PWM clock\n");
-               return PTR_ERR(lpwm->clk);
-       }
+               return ERR_CAST(lpwm->regs);
 
-       lpwm->chip.dev = &pdev->dev;
+       lpwm->clk_rate = info->clk_rate;
+       lpwm->chip.dev = dev;
        lpwm->chip.ops = &pwm_lpss_ops;
        lpwm->chip.base = -1;
        lpwm->chip.npwm = 1;
 
        ret = pwmchip_add(&lpwm->chip);
        if (ret) {
-               dev_err(&pdev->dev, "failed to add PWM chip: %d\n", ret);
-               return ret;
+               dev_err(dev, "failed to add PWM chip: %d\n", ret);
+               return ERR_PTR(ret);
        }
 
-       platform_set_drvdata(pdev, lpwm);
-       return 0;
+       return lpwm;
 }
+EXPORT_SYMBOL_GPL(pwm_lpss_probe);
 
-static int pwm_lpss_remove(struct platform_device *pdev)
+int pwm_lpss_remove(struct pwm_lpss_chip *lpwm)
 {
-       struct pwm_lpss_chip *lpwm = platform_get_drvdata(pdev);
        u32 ctrl;
 
        ctrl = readl(lpwm->regs + PWM);
@@ -166,18 +155,8 @@ static int pwm_lpss_remove(struct platform_device *pdev)
 
        return pwmchip_remove(&lpwm->chip);
 }
-
-static struct platform_driver pwm_lpss_driver = {
-       .driver = {
-               .name = "pwm-lpss",
-               .acpi_match_table = pwm_lpss_acpi_match,
-       },
-       .probe = pwm_lpss_probe,
-       .remove = pwm_lpss_remove,
-};
-module_platform_driver(pwm_lpss_driver);
+EXPORT_SYMBOL_GPL(pwm_lpss_remove);
 
 MODULE_DESCRIPTION("PWM driver for Intel LPSS");
 MODULE_AUTHOR("Mika Westerberg <mika.westerberg@linux.intel.com>");
 MODULE_LICENSE("GPL v2");
-MODULE_ALIAS("platform:pwm-lpss");