Merge tag 'stable/for-linus-3.17-b-rc4-arm-tag' of git://git.kernel.org/pub/scm/linux...

[firefly-linux-kernel-4.4.55.git] / drivers / pwm / pwm-lpss.c

diff --git a/drivers/pwm/pwm-lpss.c b/drivers/pwm/pwm-lpss.c
index 44ce6c6103ae4088abbb9382f6f69ac5ae4ff412..4df994f72d9604071f936e72b1f3e52dce5633d6 100644 (file)
--- a/drivers/pwm/pwm-lpss.c
+++ b/drivers/pwm/pwm-lpss.c
@@ -14,7 +14,6 @@
  */
 
 #include <linux/acpi.h>
-#include <linux/clk.h>
 #include <linux/device.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
@@ -37,7 +36,6 @@ static int pci_drv, plat_drv; /* So we know which drivers registered */
 struct pwm_lpss_chip {
        struct pwm_chip chip;
        void __iomem *regs;
-       struct clk *clk;
        unsigned long clk_rate;
 };
 
@@ -97,11 +95,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);
@@ -116,8 +109,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 = {
@@ -142,17 +133,7 @@ static struct pwm_lpss_chip *pwm_lpss_probe(struct device *dev,
        if (IS_ERR(lpwm->regs))
                return ERR_CAST(lpwm->regs);
 
-       if (info) {
-               lpwm->clk_rate = info->clk_rate;
-       } else {
-               lpwm->clk = devm_clk_get(dev, NULL);
-               if (IS_ERR(lpwm->clk)) {
-                       dev_err(dev, "failed to get PWM clock\n");
-                       return ERR_CAST(lpwm->clk);
-               }
-               lpwm->clk_rate = clk_get_rate(lpwm->clk);
-       }
-
+       lpwm->clk_rate = info->clk_rate;
        lpwm->chip.dev = dev;
        lpwm->chip.ops = &pwm_lpss_ops;
        lpwm->chip.base = -1;
@@ -221,12 +202,19 @@ static struct pci_driver pwm_lpss_driver_pci = {
 
 static int pwm_lpss_probe_platform(struct platform_device *pdev)
 {
+       const struct pwm_lpss_boardinfo *info;
+       const struct acpi_device_id *id;
        struct pwm_lpss_chip *lpwm;
        struct resource *r;
 
+       id = acpi_match_device(pdev->dev.driver->acpi_match_table, &pdev->dev);
+       if (!id)
+               return -ENODEV;
+
        r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 
-       lpwm = pwm_lpss_probe(&pdev->dev, r, NULL);
+       info = (struct pwm_lpss_boardinfo *)id->driver_data;
+       lpwm = pwm_lpss_probe(&pdev->dev, r, info);
        if (IS_ERR(lpwm))
                return PTR_ERR(lpwm);
 
@@ -242,7 +230,7 @@ static int pwm_lpss_remove_platform(struct platform_device *pdev)
 }
 
 static const struct acpi_device_id pwm_lpss_acpi_match[] = {
-       { "80860F09", 0 },
+       { "80860F09", (unsigned long)&byt_info },
        { },
 };
 MODULE_DEVICE_TABLE(acpi, pwm_lpss_acpi_match);