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

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

Merge tag 'pwm/for-4.9-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 contains support for PWM signal capture in the STi
  driver as well as support for the PWM controller found on Meson SoCs.
  There's also support added for the MediaTek MT2701 and SunXi H3 to the
  existing drivers.

  Other than that there's a fair set of miscellaneous cleanups and fixes
  across the board"

* tag 'pwm/for-4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm: (24 commits)
  pwm: meson: Handle unknown ID values
  pwm: sti: Take the opportunity to conduct a little house keeping
  pwm: sti: It's now valid for number of PWM channels to be zero
  pwm: sti: Add PWM capture callback
  pwm: sti: Add support for PWM capture interrupts
  pwm: sti: Initialise PWM capture device data
  pwm: sti: Supply PWM Capture clock handling
  pwm: sti: Supply PWM capture register addresses and bit locations
  pwm: sti: Only request clock rate when needed
  pwm: sti: Reorganise register names in preparation for new functionality
  pwm: sti: Rename channel => device
  dt-bindings: pwm: sti: Update DT bindings for capture support
  pwm: lpc-18xx: use pwm_set_chip_data
  pwm: sunxi: Add H3 support
  pwm: Add support for Meson PWM Controller
  dt-bindings: pwm: Add bindings for Meson PWM Controller
  pwm: samsung: Fix to use lowest div for large enough modulation bits
  pwm: pwm-tipwmss: Remove all runtime PM gets/puts
  pwm: cros-ec: Add __packed to prevent padding
  pwm: Add MediaTek MT2701 display PWM driver support
  ...
parents 2d2474a1 dc8e6e1e

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

0 → 100644
+23 −0
Original line number Original line 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 Original line Diff line number Diff line
@@ -2,8 +2,9 @@ MediaTek display PWM controller 




Required properties:

Required properties:

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

 - 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,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.

 - 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.txt in this directory for a description of

   the cell format.

   the cell format.

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

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

- pinctrl-0: 		List of phandles pointing to pin configuration nodes

			for PWM module.

			for PWM module.

			For Pinctrl properties, please refer to [1].

			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.

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

			For Clk properties, please refer to [2].

			For Clk properties, please refer to [2].

- interrupts:		IRQ for the Capture device





Optional properties:

Optional properties:

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

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

			will consider single channel by default.

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





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

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

[2] Documentation/devicetree/bindings/clock/clock-bindings.txt

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

	clocks = <&clk_sysin>;

	clock-names = "pwm";

	clock-names = "pwm";

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

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

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

};
 
};

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

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

    - "allwinner,sun5i-a10s-pwm"

    - "allwinner,sun5i-a13-pwm"

    - "allwinner,sun5i-a13-pwm"

    - "allwinner,sun7i-a20-pwm"

    - "allwinner,sun7i-a20-pwm"

    - "allwinner,sun8i-h3-pwm"

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

  - 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

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

    the cells format.

    the cells format.

drivers/pwm/Kconfig

+9 −0
Original line number Original line 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

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

	  will be called pwm-lpss-platform.

	  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

config PWM_MTK_DISP

	tristate "MediaTek display PWM driver"

	tristate "MediaTek display PWM driver"

	depends on ARCH_MEDIATEK || COMPILE_TEST

	depends on ARCH_MEDIATEK || COMPILE_TEST

CRA Git | Maintained and supported by SUSTech CRA and CCSE