pinctrl: intel: Enable PWM optional feature
Subsystems (6)
Andy Shevchenko
reviewerv3 cover pinctrl: intel: Enable PWM optional feature
This is a continuation of the previously applied PWM LPSS cleanup series. Now, we would like to enable PWM optional feature that may be embedded into Intel pin control IPs (starting from Sky Lake platforms).
I would like to route this via Intel pin control tree with issuing an immutable branch for both PINCTRL and PWM subsystems, but I'm open for other suggestions.
Hans, I dared to leave your Rb tags, however the patches are slightly differ, because of the Uwe's suggestion on how to handle the missing headers. I hope you are okay with that. If not, please comment what must be amended then.
Changelog v3:
- added tags (Uwe, Linus, Thierry)
- fixed some spelling issues in the commit messages
- changed a paragraph in the commit message of the patch 3 (Uwe)
- replaced -ENODEV check with IS_REACHABLE() in the patch 6 (Uwe)
Changelog v2:
- added tag (Mika)
- added base-commit to the series, to make sure LKP can test it
Andy Shevchenko (6):
pwm: Add a stub for devm_pwmchip_add()
pwm: lpss: Rename MAX_PWMS --> LPSS_MAX_PWMS
pwm: lpss: Include headers we are the direct user of
pwm: lpss: Allow other drivers to enable PWM LPSS
pwm: lpss: Add pwm_lpss_probe() stub
pinctrl: intel: Enumerate PWM device when community has a capability
drivers/pinctrl/intel/pinctrl-intel.c | 32 +++++++++++++++
drivers/pwm/pwm-lpss.c | 2 +-
drivers/pwm/pwm-lpss.h | 34 ++++-----------
.../linux/platform_data/x86}/pwm-lpss.h | 41 ++++++++-----------
include/linux/pwm.h | 5 +++
5 files changed, 64 insertions(+), 50 deletions(-)
copy {drivers/pwm => include/linux/platform_data/x86}/pwm-lpss.h (51%)base-commit: 9abf2313adc1ca1b6180c508c25f22f9395cc780
Signature · 1 line
2.35.1
Andy Shevchenko
reviewerPATCH v3 1/6 pwm: Add a stub for devm_pwmchip_add()
The devm_pwmchip_add() can be called by a module that optionally instantiates PWM chip. In the case of CONFIG_PWM=n, the compilation can't be performed. Hence, add a necessary stub.
--- include/linux/pwm.h | 5 +++++ 1 file changed, 5 insertions(+)
include/linux/pwm.h +5 -0
@@ -478,6 +478,11 @@ static inline int pwmchip_remove(struct pwm_chip *chip)return -EINVAL ; } +static inline int devm_pwmchip_add (struct device *dev,struct pwm_chip *chip) +{ +return -EINVAL ; +} +static inline struct pwm_device *pwm_request_from_chip (struct pwm_chip *chip,unsigned int index,const char *label)
Signature · 1 line
2.35.1
Andy Shevchenko
reviewerPATCH v3 2/6 pwm: lpss: Rename MAX_PWMS --> LPSS_MAX_PWMS
In reply to Andy ShevchenkoThe MAX_PWMS definition is already being used by the PWM core. Using the same name in the certain driver confuses people and potentially can clash with it.
Hence, rename it by adding LPSS prefix.
--- drivers/pwm/pwm-lpss.c | 2 +- drivers/pwm/pwm-lpss.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/pwm/pwm-lpss.c +1 -1
@@ -252,7 +252,7 @@ struct pwm_lpss_chip *pwm_lpss_probe(struct device *dev, void __iomem *base,int i, ret;u32 ctrl; -if (WARN_ON (info->npwm >MAX_PWMS )) +if (WARN_ON (info->npwm >LPSS_MAX_PWMS ))return ERR_PTR (-ENODEV ); lpwm =devm_kzalloc (dev,sizeof (*lpwm),GFP_KERNEL );
drivers/pwm/pwm-lpss.h +1 -1
@@ -13,7 +13,7 @@#include <linux/device.h> #include <linux/pwm.h> -#define MAX_PWMS 4 +#define LPSS_MAX_PWMS 4struct pwm_lpss_chip {struct pwm_chip chip;
Signature · 1 line
2.35.1
Andy Shevchenko
reviewerPATCH v3 3/6 pwm: lpss: Include headers we are the direct user of
In reply to Andy ShevchenkoFor the sake of integrity, include headers we are the direct user of.
Replace the inclusion of device.h by a forward declaration of struct device plus a (cheaper) of types.h as device.h is an expensive include (measured in compiler effort).
While at it, move the struct pwm_lpss_chip to be after the struct pwm_lpss_boardinfo as the former uses pointer to the latter.
--- drivers/pwm/pwm-lpss.h | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
drivers/pwm/pwm-lpss.h +9 -7
@@ -10,16 +10,12 @@ #ifndef __PWM_LPSS_H #define __PWM_LPSS_H -#include <linux/device.h> #include <linux/pwm.h> +#include <linux/types.h> -#define LPSS_MAX_PWMS 4 +struct device; -struct pwm_lpss_chip { - struct pwm_chip chip; - void __iomem *regs; - const struct pwm_lpss_boardinfo *info; -}; +#define LPSS_MAX_PWMS 4 struct pwm_lpss_boardinfo { unsigned long clk_rate;
@@ -43,6 +39,12 @@ extern const struct pwm_lpss_boardinfo pwm_lpss_bsw_info;extern const struct pwm_lpss_boardinfo pwm_lpss_bxt_info;extern const struct pwm_lpss_boardinfo pwm_lpss_tng_info; +struct pwm_lpss_chip { +struct pwm_chip chip; +void __iomem *regs; +const struct pwm_lpss_boardinfo *info; +}; +struct pwm_lpss_chip *pwm_lpss_probe (struct device *dev,void __iomem *base,const struct pwm_lpss_boardinfo *info);
Signature · 1 line
2.35.1
Andy Shevchenko
reviewerPATCH v3 4/6 pwm: lpss: Allow other drivers to enable PWM LPSS
In reply to Andy ShevchenkoThe PWM LPSS device can be embedded in another device. In order to enable it, allow that drivers to probe a corresponding device.
---
drivers/pwm/pwm-lpss.h | 22 +--------------
.../linux/platform_data/x86}/pwm-lpss.h | 28 ++++---------------
2 files changed, 6 insertions(+), 44 deletions(-)
copy {drivers/pwm => include/linux/platform_data/x86}/pwm-lpss.h (53%)drivers/pwm/pwm-lpss.h +1 -21
@@ -13,27 +13,10 @@#include <linux/pwm.h> #include <linux/types.h> -struct device ; +#include <linux/platform_data/x86/pwm-lpss.h> #define LPSS_MAX_PWMS 4 -struct pwm_lpss_boardinfo { -unsigned long clk_rate; -unsigned int npwm; -unsigned long base_unit_bits; -/* -* Some versions of the IP may stuck in the state machine if enable -* bit is not set, and hence update bit will show busy status till -* the reset. For the rest it may be otherwise. -*/ -bool bypass; -/* -* On some devices the _PS0/_PS3 AML code of the GPU (GFX0) device -* messes with the PWM0 controllers state, -*/ -bool other_devices_aml_touches_pwm_regs; -}; -extern const struct pwm_lpss_boardinfo pwm_lpss_byt_info;extern const struct pwm_lpss_boardinfo pwm_lpss_bsw_info;extern const struct pwm_lpss_boardinfo pwm_lpss_bxt_info;
@@ -45,7 +28,4 @@ struct pwm_lpss_chip { const struct pwm_lpss_boardinfo *info; }; -struct pwm_lpss_chip *pwm_lpss_probe (struct device *dev,void __iomem *base, -const struct pwm_lpss_boardinfo *info); -#endif /* __PWM_LPSS_H */
include/linux/platform_data/x86/pwm-lpss.h renamed from drivers/pwm/pwm-lpss.h +5 -23
@@ -1,21 +1,14 @@/* SPDX-License-Identifier: GPL-2.0-only */ -/* -* Intel Low Power Subsystem PWM controller driver -* -* Copyright (C) 2014, Intel Corporation -* -* Derived from the original pwm-lpss.c -*/ +/* Intel Low Power Subsystem PWM controller driver */ -#ifndef __PWM_LPSS_H -#define __PWM_LPSS_H +#ifndef __PLATFORM_DATA_X86_PWM_LPSS_H +#define __PLATFORM_DATA_X86_PWM_LPSS_H -#include <linux/pwm.h> #include <linux/types.h> struct device; -#define LPSS_MAX_PWMS 4 +struct pwm_lpss_chip; struct pwm_lpss_boardinfo { unsigned long clk_rate;
@@ -34,18 +27,7 @@ struct pwm_lpss_boardinfo { bool other_devices_aml_touches_pwm_regs; }; -extern const struct pwm_lpss_boardinfo pwm_lpss_byt_info; -extern const struct pwm_lpss_boardinfo pwm_lpss_bsw_info; -extern const struct pwm_lpss_boardinfo pwm_lpss_bxt_info; -extern const struct pwm_lpss_boardinfo pwm_lpss_tng_info; - -struct pwm_lpss_chip { -struct pwm_chip chip; -void __iomem *regs; -const struct pwm_lpss_boardinfo *info; -}; -struct pwm_lpss_chip *pwm_lpss_probe (struct device *dev,void __iomem *base,const struct pwm_lpss_boardinfo *info); -#endif /* __PWM_LPSS_H */ +#endif /* __PLATFORM_DATA_X86_PWM_LPSS_H */
Signature · 1 line
2.35.1
Andy Shevchenko
reviewerPATCH v3 5/6 pwm: lpss: Add pwm_lpss_probe() stub
In reply to Andy ShevchenkoIn case the PWM LPSS module is not provided, allow users to be compiled with the help of the pwm_lpss_probe() stub.
--- include/linux/platform_data/x86/pwm-lpss.h | 11 +++++++++++ 1 file changed, 11 insertions(+)
include/linux/platform_data/x86/pwm-lpss.h +11 -0
@@ -4,6 +4,8 @@#ifndef __PLATFORM_DATA_X86_PWM_LPSS_H#define __PLATFORM_DATA_X86_PWM_LPSS_H +#include <linux/err.h> +#include <linux/kconfig.h> #include <linux/types.h> struct device ;
@@ -27,7 +29,16 @@ struct pwm_lpss_boardinfo { bool other_devices_aml_touches_pwm_regs; }; +#if IS_REACHABLE (CONFIG_PWM_LPSS )struct pwm_lpss_chip *pwm_lpss_probe (struct device *dev,void __iomem *base,const struct pwm_lpss_boardinfo *info); +#else +static inline +struct pwm_lpss_chip *pwm_lpss_probe (struct device *dev,void __iomem *base, +const struct pwm_lpss_boardinfo *info) +{ +return ERR_PTR (-ENODEV ); +} +#endif /* CONFIG_PWM_LPSS */ #endif /* __PLATFORM_DATA_X86_PWM_LPSS_H */
Signature · 1 line
2.35.1
Andy Shevchenko
reviewerPATCH v3 6/6 pinctrl: intel: Enumerate PWM device when community has a capability
In reply to Andy ShevchenkoSome of the Communities may have PWM capability. In such cases, enumerate the PWM device via respective driver. User is still responsible for setting correct pin muxing for the line that needs to output the signal.
--- drivers/pinctrl/intel/pinctrl-intel.c | 32 +++++++++++++++++++++++++++ 1 file changed, 32 insertions(+)
drivers/pinctrl/intel/pinctrl-intel.c +32 -0
@@ -21,6 +21,8 @@#include <linux/pinctrl/pinconf.h> #include <linux/pinctrl/pinconf-generic.h> +#include <linux/platform_data/x86/pwm-lpss.h> +#include "../core.h" #include "pinctrl-intel.h"
@@ -46,6 +48,8 @@#define PADOWN_MASK (p) (GENMASK(3, 0) << PADOWN_SHIFT(p))#define PADOWN_GPP (p) ((p) / 8) +#define PWMC 0x204 +/* Offset from pad_regs */ #define PADCFG0 0x000#define PADCFG0_RXEVCFG_SHIFT 25
@@ -1499,6 +1503,30 @@ static int intel_pinctrl_pm_init(struct intel_pinctrl *pctrl)return 0 ; } +static int intel_pinctrl_probe_pwm (struct intel_pinctrl *pctrl, +struct intel_community *community) +{ +static const struct pwm_lpss_boardinfo info = { + .clk_rate =19200000 , + .npwm =1 , + .base_unit_bits =22 , + .bypass = true, + }; +struct pwm_lpss_chip *pwm; + +if (!(community->features &PINCTRL_FEATURE_PWM )) +return 0 ; + +if (!IS_REACHABLE (CONFIG_PWM_LPSS )) +return 0 ; + + pwm =pwm_lpss_probe (pctrl->dev, community->regs +PWMC , &info); +if (IS_ERR (pwm)) +return PTR_ERR (pwm); + +return 0 ; +} +static int intel_pinctrl_probe (struct platform_device *pdev,const struct intel_pinctrl_soc_data *soc_data) {
@@ -1584,6 +1612,10 @@ static int intel_pinctrl_probe(struct platform_device *pdev, ret =intel_pinctrl_add_padgroups_by_size (pctrl, community);if (ret)return ret; + + ret =intel_pinctrl_probe_pwm (pctrl, community); +if (ret) +return ret; } irq =platform_get_irq (pdev,0 );
Signature · 1 line
2.35.1