Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 72f2ebbd authored by Thierry Reding's avatar Thierry Reding
Browse files

Merge branch 'for-4.13/dt' into for-next

parents d007a00b 8517bb1f

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

+3 −1
Original line number Diff line number Diff line
@@ -2,7 +2,9 @@ Amlogic Meson PWM Controller 
============================



Required properties:

- compatible: Shall contain "amlogic,meson8b-pwm" or "amlogic,meson-gxbb-pwm".

- compatible: Shall contain "amlogic,meson8b-pwm"

                         or "amlogic,meson-gxbb-pwm"

                         or "amlogic,meson-gxbb-ao-pwm"

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

  the cells format.

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

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ Example: 
		compatible = "st,stm32-timers";

		reg = <0x40010000 0x400>;

		clocks = <&rcc 0 160>;

		clock-names = "clk_int";

		clock-names = "int";



		pwm {

			compatible = "st,stm32-pwm";

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

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ Required Properties: 
 - "renesas,pwm-r8a7791": for R-Car M2-W

 - "renesas,pwm-r8a7794": for R-Car E2

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

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

- 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

  the cells format.