Commit ace1ba1c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pwm/for-6.5-rc1' of... 

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

Pull pwm updates from Thierry Reding:
 "There's a little bit of everything in here: we've got various
  improvements and cleanups to drivers, some fixes across the board and
  a bit of new hardware support"

* tag 'pwm/for-6.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm: (22 commits)
  dt-bindings: pwm: convert pwm-bcm2835 bindings to YAML
  pwm: Add Renesas RZ/G2L MTU3a PWM driver
  pwm: mtk_disp: Fix the disable flow of disp_pwm
  dt-bindings: pwm: restrict node name suffixes
  pwm: pca9685: Switch i2c driver back to use .probe()
  pwm: ab8500: Fix error code in probe()
  MAINTAINERS: add pwm to PolarFire SoC entry
  pwm: add microchip soft ip corePWM driver
  pwm: sysfs: Do not apply state to already disabled PWMs
  pwm: imx-tpm: force 'real_period' to be zero in suspend
  pwm: meson: make full use of common clock framework
  pwm: meson: don't use hdmi/video clock as mux parent
  pwm: meson: switch to using struct clk_parent_data for mux parents
  pwm: meson: remove not needed check in meson_pwm_calc
  pwm: meson: fix handling of period/duty if greater than UINT_MAX
  pwm: meson: modify and simplify calculation in meson_pwm_get_state
  dt-bindings: pwm: Add R-Car V3U device tree bindings
  dt-bindings: pwm: imx: add i.MX8QXP compatible
  pwm: mediatek: Add support for MT7981
  dt-bindings: pwm: mediatek: Add mediatek,mt7981 compatible
  ...
parents b9861581 92554cdd

Documentation/devicetree/bindings/pwm/imx-pwm.yaml

+4 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ properties: 
              - fsl,imx8mn-pwm

              - fsl,imx8mp-pwm

              - fsl,imx8mq-pwm

              - fsl,imx8qxp-pwm

          - const: fsl,imx27-pwm



  reg:
@@ -61,6 +62,9 @@ properties: 
  interrupts:

    maxItems: 1



  power-domains:

    maxItems: 1



required:

  - compatible

  - reg

Documentation/devicetree/bindings/pwm/mediatek,mt2712-pwm.yaml

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ properties: 
          - mediatek,mt7623-pwm

          - mediatek,mt7628-pwm

          - mediatek,mt7629-pwm

          - mediatek,mt7981-pwm

          - mediatek,mt7986-pwm

          - mediatek,mt8183-pwm

          - mediatek,mt8365-pwm

Documentation/devicetree/bindings/pwm/pwm-bcm2835.txt

deleted100644 → 0
+0 −30
Original line number Diff line number Diff line 
BCM2835 PWM controller (Raspberry Pi controller)



Required properties:

- compatible: should be "brcm,bcm2835-pwm"

- reg: physical base address and length of the controller's registers

- clocks: This clock defines the base clock frequency of the PWM hardware

  system, the period and the duty_cycle of the PWM signal is a multiple of

  the base period.

- #pwm-cells: Should be 3. See pwm.yaml in this directory for a description of

  the cells format.



Examples:



pwm@2020c000 {

	compatible = "brcm,bcm2835-pwm";

	reg = <0x2020c000 0x28>;

	clocks = <&clk_pwm>;

	#pwm-cells = <3>;

};



clocks {

	....

		clk_pwm: pwm {

			compatible = "fixed-clock";

			reg = <3>;

			#clock-cells = <0>;

			clock-frequency = <9200000>;

		};

	....

};

Documentation/devicetree/bindings/pwm/pwm-bcm2835.yaml

0 → 100644
+43 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/pwm/pwm-bcm2835.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: BCM2835 PWM controller (Raspberry Pi controller)



maintainers:

  - Stefan Wahren <stefan.wahren@i2se.com>



allOf:

  - $ref: pwm.yaml#



properties:

  compatible:

    const: brcm,bcm2835-pwm



  reg:

    maxItems: 1



  clocks:

    maxItems: 1



  "#pwm-cells":

    const: 3



required:

  - compatible

  - reg

  - clocks

  - "#pwm-cells"



additionalProperties: false



examples:

  - |

    pwm@2020c000 {

      compatible = "brcm,bcm2835-pwm";

      reg = <0x2020c000 0x28>;

      clocks = <&clk_pwm>;

      #pwm-cells = <3>;

    };

Documentation/devicetree/bindings/pwm/pwm.yaml

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ select: false 


properties:

  $nodename:

    pattern: "^pwm(@.*|-[0-9a-f])*$"

    pattern: "^pwm(@.*|-([0-9]|[1-9][0-9]+))?$"



  "#pwm-cells":

    description: