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

Commit dc8e6e1e authored by Thierry Reding's avatar Thierry Reding
Browse files

Merge branch 'for-4.9/drivers' into for-next

parents 51f01e4c 2fbc487d

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

0 → 100644
+23 −0
Original line number Diff line number Diff line 
Amlogic Meson PWM Controller

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



Required properties:

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

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

  the cells format.



Optional properties:

- clocks: Could contain one or two parents clocks phandle for each of the two

  PWM channels.

- clock-names: Could contain at least the "clkin0" and/or "clkin1" names.



Example:



	pwm_ab: pwm@8550 {

		compatible = "amlogic,meson-gxbb-pwm";

		reg = <0x0 0x08550 0x0 0x10>;

		#pwm-cells = <3>;

		status = "disabled";

		clocks = <&xtal>, <&xtal>;

		clock-names = "clkin0", "clkin1";

	}

Documentation/devicetree/bindings/pwm/pwm-mtk-disp.txt

+2 −1
Original line number Diff line number Diff line
@@ -2,8 +2,9 @@ MediaTek display PWM controller 


Required properties:

 - compatible: should be "mediatek,<name>-disp-pwm":

   - "mediatek,mt8173-disp-pwm": found on mt8173 SoC.

   - "mediatek,mt2701-disp-pwm": found on mt2701 SoC.

   - "mediatek,mt6595-disp-pwm": found on mt6595 SoC.

   - "mediatek,mt8173-disp-pwm": found on mt8173 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

   the cell format.

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

+5 −3
Original line number Diff line number Diff line
@@ -13,13 +13,14 @@ Required parameters: 
- pinctrl-0: 		List of phandles pointing to pin configuration nodes

			for PWM module.

			For Pinctrl properties, please refer to [1].

- clock-names: 		Set to "pwm".

- clock-names: 		Valid entries are "pwm" and/or "capture".

- clocks: 		phandle of the clock used by the PWM module.

			For Clk properties, please refer to [2].

- interrupts:		IRQ for the Capture device



Optional properties:

- st,pwm-num-chan:	Number of available channels. If not passed, the driver

			will consider single channel by default.

- st,pwm-num-chan:	Number of available PWM channels.  Default is 0.

- st,capture-num-chan:	Number of available Capture channels.  Default is 0.



[1] Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt

[2] Documentation/devicetree/bindings/clock/clock-bindings.txt
@@ -38,4 +39,5 @@ pwm1: pwm@fe510000 { 
	clocks = <&clk_sysin>;

	clock-names = "pwm";

	st,pwm-num-chan = <4>;

	st,capture-num-chan = <2>;

};

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

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ Required properties: 
    - "allwinner,sun5i-a10s-pwm"

    - "allwinner,sun5i-a13-pwm"

    - "allwinner,sun7i-a20-pwm"

    - "allwinner,sun8i-h3-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.

drivers/pwm/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -262,6 +262,15 @@ config PWM_LPSS_PLATFORM 
	  To compile this driver as a module, choose M here: the module

	  will be called pwm-lpss-platform.



config PWM_MESON

	tristate "Amlogic Meson PWM driver"

	depends on ARCH_MESON

	help

	  The platform driver for Amlogic Meson PWM controller.



	  To compile this driver as a module, choose M here: the module

	  will be called pwm-meson.



config PWM_MTK_DISP

	tristate "MediaTek display PWM driver"

	depends on ARCH_MEDIATEK || COMPILE_TEST