Merge tag 'pwm/for-5.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry...

Pull pwm updates from Thierry Reding:
 "This set of changes contains a new driver for SiFive SoCs as well as
  enhancements to the core (device links are used to track dependencies
  between PWM providers and consumers, support for PWM controllers via
  ACPI, sysfs will now suspend/resume PWMs that it has claimed) and
  various existing drivers"

* tag 'pwm/for-5.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm: (37 commits)
  pwm: fsl-ftm: Make sure to unlock mutex on failure
  pwm: fsl-ftm: Use write protection for prescaler & polarity
  pwm: fsl-ftm: More relaxed permissions for updating period
  pwm: atmel-hlcdc: Add compatible for SAM9X60 HLCDC's PWM
  pwm: bcm2835: Improve precision of PWM
  leds: pwm: Support ACPI via firmware-node framework
  pwm: Add support referencing PWMs from ACPI
  pwm: rcar: Remove suspend/resume support
  pwm: sysfs: Add suspend/resume support
  pwm: Add power management descriptions
  pwm: meson: Add documentation to the driver
  pwm: meson: Add support PWM_POLARITY_INVERSED when disabling
  pwm: meson: Don't cache struct pwm_state internally
  pwm: meson: Read the full hardware state in meson_pwm_get_state()
  pwm: meson: Simplify the calculation of the pre-divider and count
  pwm: meson: Move pwm_set_chip_data() to meson_pwm_request()
  pwm: meson: Add the per-channel register offsets and bits in a struct
  pwm: meson: Add the meson_pwm_channel data to struct meson_pwm
  pwm: meson: Pass struct pwm_device to meson_pwm_calc()
  pwm: meson: Don't duplicate the polarity internally
  ...

diff --cc drivers/leds/leds-pwm.c
Simple merge

diff --cc drivers/pwm/Kconfig
Simple merge

diff --cc drivers/pwm/core.c
index 275b5f399a1addbf2966de351eae74f17ec9372e,c1dbb5f6ebd27825641408a908b2925ec3b48e35..c3ab07ab31a96df3072b94240fc241558a0da925
--- 1/drivers/pwm/core.c
--- 2/drivers/pwm/core.c
+++ b/drivers/pwm/core.c
@@@ -4,8 -3,23 +4,9 @@@
   *
   * Copyright (C) 2011 Sascha Hauer <s.hauer@pengutronix.de>
   * Copyright (C) 2011-2012 Avionic Design GmbH
 - *
 - *  This program is free software; you can redistribute it and/or modify
 - *  it under the terms of the GNU General Public License as published by
 - *  the Free Software Foundation; either version 2, or (at your option)
 - *  any later version.
 - *
 - *  This program is distributed in the hope that it will be useful,
 - *  but WITHOUT ANY WARRANTY; without even the implied warranty of
 - *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 - *  GNU General Public License for more details.
 - *
 - *  You should have received a copy of the GNU General Public License
 - *  along with this program; see the file COPYING.  If not, write to
 - *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
   */
  
+ #include <linux/acpi.h>
  #include <linux/module.h>
  #include <linux/pwm.h>
  #include <linux/radix-tree.h>

diff --cc drivers/pwm/pwm-atmel-hlcdc.c
Simple merge

diff --cc drivers/pwm/pwm-fsl-ftm.c
Simple merge

diff --cc drivers/pwm/pwm-jz4740.c
Simple merge

diff --cc drivers/pwm/sysfs.c
Simple merge