From: Linus Walleij <linus.walleij@linaro.org>
Date: Mon, 28 Nov 2022 20:23:20 +0000 (+0100)
Subject: Merge tag 'intel-pinctrl-v6.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e7d0040b4359815095a63e0297b8aa0ae8695b08;p=linux.git

Merge tag 'intel-pinctrl-v6.2-2' of git://git./linux/kernel/git/pinctrl/intel into devel

intel-pinctrl for v6.2-2

* Enable PWM feature on Intel pin control IPs

The following is an automated git shortlog grouped by driver:

intel:
 -  Enumerate PWM device when community has a capability

pwm:
 -  lpss: Rename pwm_lpss_probe() --> devm_pwm_lpss_probe()
 -  lpss: Allow other drivers to enable PWM LPSS
 -  lpss: Include headers we are the direct user of
 -  lpss: Rename MAX_PWMS --> LPSS_MAX_PWMS
 -  Add a stub for devm_pwmchip_add()
---

e7d0040b4359815095a63e0297b8aa0ae8695b08
diff --cc drivers/pinctrl/intel/pinctrl-intel.c
index 6e630e87fed63,d74c8b650aa78..921382fc5fdff
--- a/drivers/pinctrl/intel/pinctrl-intel.c
+++ b/drivers/pinctrl/intel/pinctrl-intel.c
@@@ -14,16 -14,15 +14,18 @@@
  #include <linux/module.h>
  #include <linux/platform_device.h>
  #include <linux/property.h>
 +#include <linux/seq_file.h>
 +#include <linux/string_helpers.h>
  #include <linux/time.h>
  
 -#include <linux/pinctrl/pinctrl.h>
 -#include <linux/pinctrl/pinmux.h>
 +#include <linux/pinctrl/consumer.h>
  #include <linux/pinctrl/pinconf.h>
  #include <linux/pinctrl/pinconf-generic.h>
 +#include <linux/pinctrl/pinctrl.h>
 +#include <linux/pinctrl/pinmux.h>
  
+ #include <linux/platform_data/x86/pwm-lpss.h>
+ 
  #include "../core.h"
  #include "pinctrl-intel.h"