From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 5 Dec 2019 19:28:14 +0000 (-0800)
Subject: Merge tag 'pwm/for-5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry... 
X-Git-Tag: v5.10.7~3706
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d9e48dc2a71a836f17d1febbedb31470f957edb4;p=platform%2Fkernel%2Flinux-rpi.git

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

Pull pwm updates from Thierry Reding:
 "Various changes and minor fixes across a couple of drivers"

* tag 'pwm/for-5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm:
  pwm: stm32: Pass breakinput instead of its values
  pwm: stm32: Remove clutter from ternary operator
  pwm: stm32: Validate breakinput data from DT
  pwm: Update comment on struct pwm_ops::apply
  pwm: sun4i: Fix incorrect calculation of duty_cycle/period
  pwm: stm32: Add power management support
  pwm: stm32: Split breakinput apply routine to ease PM support
  dt-bindings: pwm-stm32: Document pinctrl sleep state
  pwm: sun4i: Drop redundant assignment to variable pval
  dt-bindings: pwm: mediatek: Remove gratuitous compatible string for MT7629
---

d9e48dc2a71a836f17d1febbedb31470f957edb4
diff --cc Documentation/devicetree/bindings/pwm/pwm-mediatek.txt
index 69cae11,053e9b5..95536d83
--- a/Documentation/devicetree/bindings/pwm/pwm-mediatek.txt
+++ b/Documentation/devicetree/bindings/pwm/pwm-mediatek.txt
@@@ -6,10 -6,10 +6,10 @@@ Required properties
     - "mediatek,mt7622-pwm": found on mt7622 SoC.
     - "mediatek,mt7623-pwm": found on mt7623 SoC.
     - "mediatek,mt7628-pwm": found on mt7628 SoC.
-    - "mediatek,mt7629-pwm", "mediatek,mt7622-pwm": found on mt7629 SoC.
+    - "mediatek,mt7629-pwm": found on mt7629 SoC.
     - "mediatek,mt8516-pwm": found on mt8516 SoC.
   - reg: physical base address and length of the controller's registers.
 - - #pwm-cells: must be 2. See pwm.txt in this directory for a description of
 + - #pwm-cells: must be 2. See pwm.yaml in this directory for a description of
     the cell format.
   - clocks: phandle and clock specifier of the PWM reference clock.
   - clock-names: must contain the following, except for MT7628 which