lkml.org 
[lkml]   [2024]   [Feb]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 3/5] pwm: dwc: Add 16 channel support for Intel Elkhart Lake
    Date
    Intel Elkhart Lake PSE includes two instances of PWM as a single PCI
    function with 8 channels each. Add support for the remaining channels.

    Signed-off-by: Raag Jadav <raag.jadav@intel.com>
    Tested-by: Lakshmi Sowjanya D <lakshmi.sowjanya.d@intel.com>
    Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
    ---
    drivers/pwm/pwm-dwc.c | 33 +++++++++++++++++++++++++--------
    drivers/pwm/pwm-dwc.h | 5 +++++
    2 files changed, 30 insertions(+), 8 deletions(-)

    diff --git a/drivers/pwm/pwm-dwc.c b/drivers/pwm/pwm-dwc.c
    index b9e18dbf7493..6d922afcb20a 100644
    --- a/drivers/pwm/pwm-dwc.c
    +++ b/drivers/pwm/pwm-dwc.c
    @@ -25,16 +25,31 @@

    #include "pwm-dwc.h"

    -static int dwc_pwm_probe(struct pci_dev *pci, const struct pci_device_id *id)
    +/* Elkhart Lake */
    +static const struct dwc_pwm_info ehl_pwm_info = {
    + .nr = 2,
    + .size = 0x1000,
    +};
    +
    +static int dwc_pwm_init_one(struct device *dev, void __iomem *base, unsigned int offset)
    {
    - struct device *dev = &pci->dev;
    struct dwc_pwm *dwc;
    - int ret;

    dwc = dwc_pwm_alloc(dev);
    if (!dwc)
    return -ENOMEM;

    + dwc->base = base + offset;
    +
    + return devm_pwmchip_add(dev, &dwc->chip);
    +}
    +
    +static int dwc_pwm_probe(struct pci_dev *pci, const struct pci_device_id *id)
    +{
    + const struct dwc_pwm_info *info;
    + struct device *dev = &pci->dev;
    + int i, ret;
    +
    ret = pcim_enable_device(pci);
    if (ret) {
    dev_err(dev, "Failed to enable device (%pe)\n", ERR_PTR(ret));
    @@ -49,11 +64,13 @@ static int dwc_pwm_probe(struct pci_dev *pci, const struct pci_device_id *id)
    return ret;
    }

    - dwc->base = pcim_iomap_table(pci)[0];
    + info = (const struct dwc_pwm_info *)id->driver_data;

    - ret = devm_pwmchip_add(dev, &dwc->chip);
    - if (ret)
    - return ret;
    + for (i = 0; i < info->nr; i++) {
    + ret = dwc_pwm_init_one(dev, pcim_iomap_table(pci)[0], i * info->size);
    + if (ret)
    + return ret;
    + }

    pm_runtime_put(dev);
    pm_runtime_allow(dev);
    @@ -105,7 +122,7 @@ static int dwc_pwm_resume(struct device *dev)
    static DEFINE_SIMPLE_DEV_PM_OPS(dwc_pwm_pm_ops, dwc_pwm_suspend, dwc_pwm_resume);

    static const struct pci_device_id dwc_pwm_id_table[] = {
    - { PCI_VDEVICE(INTEL, 0x4bb7) }, /* Elkhart Lake */
    + { PCI_VDEVICE(INTEL, 0x4bb7), (kernel_ulong_t)&ehl_pwm_info },
    { } /* Terminating Entry */
    };
    MODULE_DEVICE_TABLE(pci, dwc_pwm_id_table);
    diff --git a/drivers/pwm/pwm-dwc.h b/drivers/pwm/pwm-dwc.h
    index 64795247c54c..c9bbfc77b568 100644
    --- a/drivers/pwm/pwm-dwc.h
    +++ b/drivers/pwm/pwm-dwc.h
    @@ -33,6 +33,11 @@ MODULE_IMPORT_NS(dwc_pwm);
    #define DWC_TIM_CTRL_INT_MASK BIT(2)
    #define DWC_TIM_CTRL_PWM BIT(3)

    +struct dwc_pwm_info {
    + unsigned int nr;
    + unsigned int size;
    +};
    +
    struct dwc_pwm_ctx {
    u32 cnt;
    u32 cnt2;
    --
    2.35.3

    \
     
     \ /
      Last update: 2024-05-27 14:58    [W:2.269 / U:1.832 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site