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

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

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

Pull pwm updates from Thierry Reding:
 "This set of changes adds support for more generations of the RCar
  controller as well as runtime PM support. The JZ4740 driver gains
  support for device tree and can now be used on all Ingenic SoCs.

  Rounding things off is a random assortment of fixes and cleanups all
  across the board"

* tag 'pwm/for-4.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm: (29 commits)
  pwm: rcar: Add suspend/resume support
  pwm: rcar: Use PM Runtime to control module clock
  dt-bindings: pwm: rcar: Add bindings for R-Car M3N support
  pwm: rcar: Fix a condition to prevent mismatch value setting to duty
  pwm: sysfs: Use put_device() instead of kfree()
  dt-bindings: pwm: sunxi: Add new compatible strings
  pwm: sun4i: Simplify controller mapping
  pwm: sun4i: Drop unused .has_rdy member
  pwm: sun4i: Properly check current state
  pwm: Remove depends on AVR32
  pwm: stm32: LPTimer: Use 3 cells ->of_xlate()
  dt-bindings: pwm-stm32-lp: Add #pwm-cells
  pwm: stm32: Protect common prescaler for all channels
  pwm: stm32: Remove unused struct device
  pwm: mediatek: Improve precision in rate calculation
  pwm: mediatek: Remove redundant MODULE_ALIAS entries
  pwm: mediatek: Fix up PWM4 and PWM5 malfunction on MT7623
  pwm: jz4740: Enable for all Ingenic SoCs
  pwm: jz4740: Add support for devicetree
  pwm: jz4740: Implement ->set_polarity()
  ...
parents 41531f58 68738422

Documentation/devicetree/bindings/pwm/ingenic,jz47xx-pwm.txt

0 → 100644
+25 −0
Original line number Diff line number Diff line 
Ingenic JZ47xx PWM Controller

=============================



Required properties:

- compatible: One of:

  * "ingenic,jz4740-pwm"

  * "ingenic,jz4770-pwm"

  * "ingenic,jz4780-pwm"

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

  of the cells format.

- clocks : phandle to the external clock.

- clock-names : Should be "ext".





Example:



	pwm: pwm@10002000 {

		compatible = "ingenic,jz4740-pwm";

		reg = <0x10002000 0x1000>;



		#pwm-cells = <3>;



		clocks = <&ext>;

		clock-names = "ext";

	};

Documentation/devicetree/bindings/pwm/pwm-stm32-lp.txt

+3 −0
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ See ../mfd/stm32-lptimer.txt for details about the parent node. 


Required parameters:

- compatible:		Must be "st,stm32-pwm-lp".

- #pwm-cells:		Should be set to 3. This PWM chip uses the default 3 cells

			bindings defined in pwm.txt.



Optional properties:

- pinctrl-names: 	Set to "default".
@@ -18,6 +20,7 @@ Example: 
		...

		pwm {

			compatible = "st,stm32-pwm-lp";

			#pwm-cells = <3>;

			pinctrl-names = "default";

			pinctrl-0 = <&lppwm1_pins>;

		};

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

+2 −0
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ Required properties: 
    - "allwinner,sun5i-a13-pwm"

    - "allwinner,sun7i-a20-pwm"

    - "allwinner,sun8i-h3-pwm"

    - "allwinner,sun50i-a64-pwm", "allwinner,sun5i-a13-pwm"

    - "allwinner,sun50i-h5-pwm", "allwinner,sun5i-a13-pwm"

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

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

    the cells format.

Documentation/devicetree/bindings/pwm/renesas,pwm-rcar.txt

+8 −3
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ 


Required Properties:

- compatible: should be "renesas,pwm-rcar" and one of the following.

 - "renesas,pwm-r8a7743": for RZ/G1M

 - "renesas,pwm-r8a7745": for RZ/G1E

 - "renesas,pwm-r8a7778": for R-Car M1A

 - "renesas,pwm-r8a7779": for R-Car H1

 - "renesas,pwm-r8a7790": for R-Car H2
@@ -9,6 +11,7 @@ Required Properties: 
 - "renesas,pwm-r8a7794": for R-Car E2

 - "renesas,pwm-r8a7795": for R-Car H3

 - "renesas,pwm-r8a7796": for R-Car M3-W

 - "renesas,pwm-r8a77965": for R-Car M3-N

 - "renesas,pwm-r8a77995": for R-Car D3

- reg: base address and length of the registers block for the PWM.

- #pwm-cells: should be 2. See pwm.txt in this directory for a description of
@@ -17,13 +20,15 @@ Required Properties: 
- pinctrl-0: phandle, referring to a default pin configuration node.

- pinctrl-names: Set to "default".



Example: R8A7790 (R-Car H2) PWM Timer node

Example: R8A7743 (RZ/G1M) PWM Timer node



	pwm0: pwm@e6e30000 {

		compatible = "renesas,pwm-r8a7790", "renesas,pwm-rcar";

		compatible = "renesas,pwm-r8a7743", "renesas,pwm-rcar";

		reg = <0 0xe6e30000 0 0x8>;

		clocks = <&cpg CPG_MOD 523>;

		power-domains = <&sysc R8A7743_PD_ALWAYS_ON>;

		resets = <&cpg 523>;

		#pwm-cells = <2>;

		clocks = <&mstp5_clks R8A7790_CLK_PWM>;

		pinctrl-0 = <&pwm0_pins>;

		pinctrl-names = "default";

	};

Documentation/devicetree/bindings/pwm/renesas,tpu-pwm.txt

+6 −4
Original line number Diff line number Diff line
@@ -3,10 +3,12 @@ 
Required Properties:



  - compatible: should be one of the following.

    - "renesas,tpu-r8a73a4": for R8A77A4 (R-Mobile APE6) compatible PWM controller.

    - "renesas,tpu-r8a73a4": for R8A73A4 (R-Mobile APE6) compatible PWM controller.

    - "renesas,tpu-r8a7740": for R8A7740 (R-Mobile A1) compatible PWM controller.

    - "renesas,tpu-r8a7743": for R8A7743 (RZ/G1M) compatible PWM controller.

    - "renesas,tpu-r8a7745": for R8A7745 (RZ/G1E) compatible PWM controller.

    - "renesas,tpu-r8a7790": for R8A7790 (R-Car H2) compatible PWM controller.

    - "renesas,tpu": for generic R-Car TPU PWM controller.

    - "renesas,tpu": for generic R-Car and RZ/G1 TPU PWM controller.



  - reg: Base address and length of each memory resource used by the PWM

    controller hardware module.
@@ -18,10 +20,10 @@ Required Properties: 
Please refer to pwm.txt in this directory for details of the common PWM bindings

used by client devices.



Example: R8A7740 (R-Car A1) TPU controller node

Example: R8A7740 (R-Mobile A1) TPU controller node



	tpu: pwm@e6600000 {

		compatible = "renesas,tpu-r8a7740", "renesas,tpu";

		reg = <0xe6600000 0x100>;

		reg = <0xe6600000 0x148>;

		#pwm-cells = <3>;

	};

CRA Git | Maintained and supported by SUSTech CRA and CCSE