From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 1 Mar 2017 17:46:02 +0000 (-0800)
Subject: Merge tag 'pwm/for-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=545b2820c4a48245412d97030134cc1d38918726;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge tag 'pwm/for-4.11-rc1' of git://git./linux/kernel/git/thierry.reding/linux-pwm

Pull pwm updates from Thierry Reding:
 "This set contains mostly fixes to existing drivers as well as cleanup
  of code that's not been in active use for a while"

* tag 'pwm/for-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm: (27 commits)
  acpi: lpss: call pwm_add_table() for BSW PWM device
  pwm: Try to load modules during pwm_get()
  pwm: Don't hold pwm_lookup_lock longer than necessary
  pwm: Make the PWM_POLARITY flag in DTB optional
  pwm: Print error messages with pr_err() instead of pr_debug()
  pwm: imx: Add polarity inversion support to i.MX's PWMv2
  pwm: imx: doc: Update imx-pwm.txt documentation entry
  pwm: imx: Remove redundant i.MX PWMv2 code
  pwm: imx: Provide atomic PWM support for i.MX PWMv2
  pwm: imx: Move PWMv2 wait for fifo slot code to a separate function
  pwm: imx: Move PWMv2 software reset code to a separate function
  pwm: imx: Rewrite v1 code to facilitate switch to atomic PWM
  pwm: imx: Add separate set of PWM ops for v1 and v2
  pwm: imx: Remove ipg clock and enable per clock when required
  pwm: lpss: Add Intel Gemini Lake PCI ID
  pwm: lpss: Do not export board infos for different PWM types
  pwm: lpss: Avoid reconfiguring while UPDATE bit is still enabled
  pwm: lpss: Switch to new atomic API
  pwm: lpss: Allow duty cycle to be 0
  pwm: lpss: Avoid potential overflow of base_unit
  ...
---

545b2820c4a48245412d97030134cc1d38918726
diff --cc drivers/acpi/acpi_lpss.c
index 90d112a3063a,cd5d2b6c9ed1..5edfd9c49044
--- a/drivers/acpi/acpi_lpss.c
+++ b/drivers/acpi/acpi_lpss.c
@@@ -18,9 -18,9 +18,10 @@@
  #include <linux/mutex.h>
  #include <linux/platform_device.h>
  #include <linux/platform_data/clk-lpss.h>
 +#include <linux/platform_data/x86/pmc_atom.h>
  #include <linux/pm_domain.h>
  #include <linux/pm_runtime.h>
+ #include <linux/pwm.h>
  #include <linux/delay.h>
  
  #include "internal.h"