| From ltsi-dev-bounces@lists.linuxfoundation.org Wed Oct 29 09:53:55 2014 |
| From: Chang Rebecca Swee Fun <rebecca.swee.fun.chang@intel.com> |
| Date: Wed, 29 Oct 2014 08:52:56 +0800 |
| Subject: [LTSI-dev] [PATCH 6/8] pwm: lpss: Properly split driver to parts |
| To: LTSI Mailing List <ltsi-dev@lists.linuxfoundation.org> |
| Cc: Chang Rebecca Swee Fun <rebecca.swee.fun.chang@intel.com> |
| Message-ID: <1414543978-24145-7-git-send-email-rebecca.swee.fun.chang@intel.com> |
| |
| |
| From: Andy Shevchenko <andriy.shevchenko@linux.intel.com> |
| |
| The driver consists of core, PCI, and platform parts. It would be better |
| to split them into separate files. |
| |
| The platform driver is now called pwm-lpss-platform. Thus, previously |
| set CONFIG_PWM_LPSS=m is not enough to build it. But we are on the safe |
| side since it seems no one from outside Intel is using it for now. |
| |
| While here, move to use macros module_pci_driver() and |
| module_platform_driver(). |
| |
| Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> |
| Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com> |
| Acked-by: Alan Cox <alan@linux.intel.com> |
| [thierry.reding: change select to depends on PWM_LPSS, cleanup] |
| Signed-off-by: Thierry Reding <thierry.reding@gmail.com> |
| (cherry picked from commit c558e39e14c2372394f49e07fbe94e9708b615cb) |
| |
| Signed-off-by: Chang Rebecca Swee Fun <rebecca.swee.fun.chang@intel.com> |
| --- |
| drivers/pwm/Kconfig | 19 +++++ |
| drivers/pwm/Makefile | 2 |
| drivers/pwm/pwm-lpss-pci.c | 65 +++++++++++++++++++ |
| drivers/pwm/pwm-lpss-platform.c | 68 ++++++++++++++++++++ |
| drivers/pwm/pwm-lpss.c | 136 ++-------------------------------------- |
| drivers/pwm/pwm-lpss.h | 32 +++++++++ |
| 6 files changed, 195 insertions(+), 127 deletions(-) |
| create mode 100644 drivers/pwm/pwm-lpss-pci.c |
| create mode 100644 drivers/pwm/pwm-lpss-platform.c |
| create mode 100644 drivers/pwm/pwm-lpss.h |
| |
| --- a/drivers/pwm/Kconfig |
| +++ b/drivers/pwm/Kconfig |
| @@ -121,7 +121,6 @@ config PWM_LPC32XX |
| |
| config PWM_LPSS |
| tristate "Intel LPSS PWM support" |
| - depends on ACPI |
| help |
| Generic PWM framework driver for Intel Low Power Subsystem PWM |
| controller. |
| @@ -129,6 +128,24 @@ config PWM_LPSS |
| To compile this driver as a module, choose M here: the module |
| will be called pwm-lpss. |
| |
| +config PWM_LPSS_PCI |
| + tristate "Intel LPSS PWM PCI driver" |
| + depends on PWM_LPSS && PCI |
| + help |
| + The PCI driver for Intel Low Power Subsystem PWM controller. |
| + |
| + To compile this driver as a module, choose M here: the module |
| + will be called pwm-lpss-pci. |
| + |
| +config PWM_LPSS_PLATFORM |
| + tristate "Intel LPSS PWM platform driver" |
| + depends on PWM_LPSS && ACPI |
| + help |
| + The platform driver for Intel Low Power Subsystem PWM controller. |
| + |
| + To compile this driver as a module, choose M here: the module |
| + will be called pwm-lpss-platform. |
| + |
| config PWM_MXS |
| tristate "Freescale MXS PWM support" |
| depends on ARCH_MXS && OF |
| --- a/drivers/pwm/Makefile |
| +++ b/drivers/pwm/Makefile |
| @@ -10,6 +10,8 @@ obj-$(CONFIG_PWM_JZ4740) += pwm-jz4740.o |
| obj-$(CONFIG_PWM_LP3943) += pwm-lp3943.o |
| obj-$(CONFIG_PWM_LPC32XX) += pwm-lpc32xx.o |
| obj-$(CONFIG_PWM_LPSS) += pwm-lpss.o |
| +obj-$(CONFIG_PWM_LPSS_PCI) += pwm-lpss-pci.o |
| +obj-$(CONFIG_PWM_LPSS_PLATFORM) += pwm-lpss-platform.o |
| obj-$(CONFIG_PWM_MXS) += pwm-mxs.o |
| obj-$(CONFIG_PWM_PCA9685) += pwm-pca9685.o |
| obj-$(CONFIG_PWM_PUV3) += pwm-puv3.o |
| --- /dev/null |
| +++ b/drivers/pwm/pwm-lpss-pci.c |
| @@ -0,0 +1,65 @@ |
| +/* |
| + * Intel Low Power Subsystem PWM controller PCI driver |
| + * |
| + * Copyright (C) 2014, Intel Corporation |
| + * |
| + * Derived from the original pwm-lpss.c |
| + * |
| + * 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/kernel.h> |
| +#include <linux/module.h> |
| +#include <linux/pci.h> |
| + |
| +#include "pwm-lpss.h" |
| + |
| +static int pwm_lpss_probe_pci(struct pci_dev *pdev, |
| + const struct pci_device_id *id) |
| +{ |
| + const struct pwm_lpss_boardinfo *info; |
| + struct pwm_lpss_chip *lpwm; |
| + int err; |
| + |
| + err = pci_enable_device(pdev); |
| + if (err < 0) |
| + return err; |
| + |
| + info = (struct pwm_lpss_boardinfo *)id->driver_data; |
| + lpwm = pwm_lpss_probe(&pdev->dev, &pdev->resource[0], info); |
| + if (IS_ERR(lpwm)) |
| + return PTR_ERR(lpwm); |
| + |
| + pci_set_drvdata(pdev, lpwm); |
| + return 0; |
| +} |
| + |
| +static void pwm_lpss_remove_pci(struct pci_dev *pdev) |
| +{ |
| + struct pwm_lpss_chip *lpwm = pci_get_drvdata(pdev); |
| + |
| + pwm_lpss_remove(lpwm); |
| + pci_disable_device(pdev); |
| +} |
| + |
| +static const struct pci_device_id pwm_lpss_pci_ids[] = { |
| + { PCI_VDEVICE(INTEL, 0x0f08), (unsigned long)&pwm_lpss_byt_info}, |
| + { PCI_VDEVICE(INTEL, 0x0f09), (unsigned long)&pwm_lpss_byt_info}, |
| + { PCI_VDEVICE(INTEL, 0x2288), (unsigned long)&pwm_lpss_bsw_info}, |
| + { PCI_VDEVICE(INTEL, 0x2289), (unsigned long)&pwm_lpss_bsw_info}, |
| + { }, |
| +}; |
| +MODULE_DEVICE_TABLE(pci, pwm_lpss_pci_ids); |
| + |
| +static struct pci_driver pwm_lpss_driver_pci = { |
| + .name = "pwm-lpss", |
| + .id_table = pwm_lpss_pci_ids, |
| + .probe = pwm_lpss_probe_pci, |
| + .remove = pwm_lpss_remove_pci, |
| +}; |
| +module_pci_driver(pwm_lpss_driver_pci); |
| + |
| +MODULE_DESCRIPTION("PWM PCI driver for Intel LPSS"); |
| +MODULE_LICENSE("GPL v2"); |
| --- /dev/null |
| +++ b/drivers/pwm/pwm-lpss-platform.c |
| @@ -0,0 +1,68 @@ |
| +/* |
| + * Intel Low Power Subsystem PWM controller driver |
| + * |
| + * Copyright (C) 2014, Intel Corporation |
| + * |
| + * Derived from the original pwm-lpss.c |
| + * |
| + * 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/kernel.h> |
| +#include <linux/module.h> |
| +#include <linux/platform_device.h> |
| + |
| +#include "pwm-lpss.h" |
| + |
| +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; |
| + |
| + info = (const struct pwm_lpss_boardinfo *)id->driver_data; |
| + r = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
| + |
| + lpwm = pwm_lpss_probe(&pdev->dev, r, info); |
| + if (IS_ERR(lpwm)) |
| + return PTR_ERR(lpwm); |
| + |
| + platform_set_drvdata(pdev, lpwm); |
| + return 0; |
| +} |
| + |
| +static int pwm_lpss_remove_platform(struct platform_device *pdev) |
| +{ |
| + struct pwm_lpss_chip *lpwm = platform_get_drvdata(pdev); |
| + |
| + return pwm_lpss_remove(lpwm); |
| +} |
| + |
| +static const struct acpi_device_id pwm_lpss_acpi_match[] = { |
| + { "80860F09", (unsigned long)&pwm_lpss_byt_info }, |
| + { "80862288", (unsigned long)&pwm_lpss_bsw_info }, |
| + { }, |
| +}; |
| +MODULE_DEVICE_TABLE(acpi, pwm_lpss_acpi_match); |
| + |
| +static struct platform_driver pwm_lpss_driver_platform = { |
| + .driver = { |
| + .name = "pwm-lpss", |
| + .acpi_match_table = pwm_lpss_acpi_match, |
| + }, |
| + .probe = pwm_lpss_probe_platform, |
| + .remove = pwm_lpss_remove_platform, |
| +}; |
| +module_platform_driver(pwm_lpss_driver_platform); |
| + |
| +MODULE_DESCRIPTION("PWM platform driver for Intel LPSS"); |
| +MODULE_LICENSE("GPL v2"); |
| +MODULE_ALIAS("platform:pwm-lpss"); |
| --- a/drivers/pwm/pwm-lpss.c |
| +++ b/drivers/pwm/pwm-lpss.c |
| @@ -13,15 +13,10 @@ |
| * published by the Free Software Foundation. |
| */ |
| |
| -#include <linux/acpi.h> |
| -#include <linux/device.h> |
| #include <linux/kernel.h> |
| #include <linux/module.h> |
| -#include <linux/pwm.h> |
| -#include <linux/platform_device.h> |
| -#include <linux/pci.h> |
| |
| -static int pci_drv, plat_drv; /* So we know which drivers registered */ |
| +#include "pwm-lpss.h" |
| |
| #define PWM 0x00000000 |
| #define PWM_ENABLE BIT(31) |
| @@ -39,19 +34,17 @@ struct pwm_lpss_chip { |
| unsigned long clk_rate; |
| }; |
| |
| -struct pwm_lpss_boardinfo { |
| - unsigned long clk_rate; |
| -}; |
| - |
| /* BayTrail */ |
| -static const struct pwm_lpss_boardinfo byt_info = { |
| +const struct pwm_lpss_boardinfo pwm_lpss_byt_info = { |
| 25000000 |
| }; |
| +EXPORT_SYMBOL_GPL(pwm_lpss_byt_info); |
| |
| /* Braswell */ |
| -static const struct pwm_lpss_boardinfo bsw_info = { |
| +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) |
| { |
| @@ -123,9 +116,8 @@ static const struct pwm_ops pwm_lpss_ops |
| .owner = THIS_MODULE, |
| }; |
| |
| -static struct pwm_lpss_chip *pwm_lpss_probe(struct device *dev, |
| - struct resource *r, |
| - const struct pwm_lpss_boardinfo *info) |
| +struct pwm_lpss_chip *pwm_lpss_probe(struct device *dev, struct resource *r, |
| + const struct pwm_lpss_boardinfo *info) |
| { |
| struct pwm_lpss_chip *lpwm; |
| int ret; |
| @@ -152,8 +144,9 @@ static struct pwm_lpss_chip *pwm_lpss_pr |
| |
| return lpwm; |
| } |
| +EXPORT_SYMBOL_GPL(pwm_lpss_probe); |
| |
| -static int pwm_lpss_remove(struct pwm_lpss_chip *lpwm) |
| +int pwm_lpss_remove(struct pwm_lpss_chip *lpwm) |
| { |
| u32 ctrl; |
| |
| @@ -162,117 +155,8 @@ static int pwm_lpss_remove(struct pwm_lp |
| |
| return pwmchip_remove(&lpwm->chip); |
| } |
| - |
| -static int pwm_lpss_probe_pci(struct pci_dev *pdev, |
| - const struct pci_device_id *id) |
| -{ |
| - const struct pwm_lpss_boardinfo *info; |
| - struct pwm_lpss_chip *lpwm; |
| - int err; |
| - |
| - err = pci_enable_device(pdev); |
| - if (err < 0) |
| - return err; |
| - |
| - info = (struct pwm_lpss_boardinfo *)id->driver_data; |
| - lpwm = pwm_lpss_probe(&pdev->dev, &pdev->resource[0], info); |
| - if (IS_ERR(lpwm)) |
| - return PTR_ERR(lpwm); |
| - |
| - pci_set_drvdata(pdev, lpwm); |
| - return 0; |
| -} |
| - |
| -static void pwm_lpss_remove_pci(struct pci_dev *pdev) |
| -{ |
| - struct pwm_lpss_chip *lpwm = pci_get_drvdata(pdev); |
| - |
| - pwm_lpss_remove(lpwm); |
| - pci_disable_device(pdev); |
| -} |
| - |
| -static struct pci_device_id pwm_lpss_pci_ids[] = { |
| - { PCI_VDEVICE(INTEL, 0x0f08), (unsigned long)&byt_info}, |
| - { PCI_VDEVICE(INTEL, 0x0f09), (unsigned long)&byt_info}, |
| - { PCI_VDEVICE(INTEL, 0x2288), (unsigned long)&bsw_info}, |
| - { PCI_VDEVICE(INTEL, 0x2289), (unsigned long)&bsw_info}, |
| - { }, |
| -}; |
| -MODULE_DEVICE_TABLE(pci, pwm_lpss_pci_ids); |
| - |
| -static struct pci_driver pwm_lpss_driver_pci = { |
| - .name = "pwm-lpss", |
| - .id_table = pwm_lpss_pci_ids, |
| - .probe = pwm_lpss_probe_pci, |
| - .remove = pwm_lpss_remove_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); |
| - |
| - info = (struct pwm_lpss_boardinfo *)id->driver_data; |
| - lpwm = pwm_lpss_probe(&pdev->dev, r, info); |
| - if (IS_ERR(lpwm)) |
| - return PTR_ERR(lpwm); |
| - |
| - platform_set_drvdata(pdev, lpwm); |
| - return 0; |
| -} |
| - |
| -static int pwm_lpss_remove_platform(struct platform_device *pdev) |
| -{ |
| - struct pwm_lpss_chip *lpwm = platform_get_drvdata(pdev); |
| - |
| - return pwm_lpss_remove(lpwm); |
| -} |
| - |
| -static const struct acpi_device_id pwm_lpss_acpi_match[] = { |
| - { "80860F09", (unsigned long)&byt_info }, |
| - { "80862288", (unsigned long)&bsw_info }, |
| - { }, |
| -}; |
| -MODULE_DEVICE_TABLE(acpi, pwm_lpss_acpi_match); |
| - |
| -static struct platform_driver pwm_lpss_driver_platform = { |
| - .driver = { |
| - .name = "pwm-lpss", |
| - .acpi_match_table = pwm_lpss_acpi_match, |
| - }, |
| - .probe = pwm_lpss_probe_platform, |
| - .remove = pwm_lpss_remove_platform, |
| -}; |
| - |
| -static int __init pwm_init(void) |
| -{ |
| - pci_drv = pci_register_driver(&pwm_lpss_driver_pci); |
| - plat_drv = platform_driver_register(&pwm_lpss_driver_platform); |
| - if (pci_drv && plat_drv) |
| - return pci_drv; |
| - |
| - return 0; |
| -} |
| -module_init(pwm_init); |
| - |
| -static void __exit pwm_exit(void) |
| -{ |
| - if (!pci_drv) |
| - pci_unregister_driver(&pwm_lpss_driver_pci); |
| - if (!plat_drv) |
| - platform_driver_unregister(&pwm_lpss_driver_platform); |
| -} |
| -module_exit(pwm_exit); |
| +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"); |
| --- /dev/null |
| +++ b/drivers/pwm/pwm-lpss.h |
| @@ -0,0 +1,32 @@ |
| +/* |
| + * Intel Low Power Subsystem PWM controller driver |
| + * |
| + * Copyright (C) 2014, Intel Corporation |
| + * |
| + * Derived from the original pwm-lpss.c |
| + * |
| + * 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. |
| + */ |
| + |
| +#ifndef __PWM_LPSS_H |
| +#define __PWM_LPSS_H |
| + |
| +#include <linux/device.h> |
| +#include <linux/pwm.h> |
| + |
| +struct pwm_lpss_chip; |
| + |
| +struct pwm_lpss_boardinfo { |
| + unsigned long clk_rate; |
| +}; |
| + |
| +extern const struct pwm_lpss_boardinfo pwm_lpss_byt_info; |
| +extern const struct pwm_lpss_boardinfo pwm_lpss_bsw_info; |
| + |
| +struct pwm_lpss_chip *pwm_lpss_probe(struct device *dev, struct resource *r, |
| + const struct pwm_lpss_boardinfo *info); |
| +int pwm_lpss_remove(struct pwm_lpss_chip *lpwm); |
| + |
| +#endif /* __PWM_LPSS_H */ |
