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

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

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

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

Pull pwm updates from Thierry Reding:
 "Besides one new driver being added for the PWM controller found in
  various Spreadtrum SoCs, this series of changes brings a slew of,
  mostly minor, fixes and cleanups for existing drivers, as well as some
  enhancements to the core code.

  Lastly, Uwe is added to the PWM subsystem entry of the MAINTAINERS
  file, making official his role as a reviewer"

* tag 'pwm/for-5.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm: (34 commits)
  MAINTAINERS: Add myself as reviewer for the PWM subsystem
  MAINTAINERS: Add patchwork link for PWM entry
  MAINTAINERS: Add a selection of PWM related keywords to the PWM entry
  pwm: mediatek: Add MT7629 compatible string
  dt-bindings: pwm: Update bindings for MT7629 SoC
  pwm: mediatek: Update license and switch to SPDX tag
  pwm: mediatek: Use pwm_mediatek as common prefix
  pwm: mediatek: Allocate the clks array dynamically
  pwm: mediatek: Remove the has_clks field
  pwm: mediatek: Drop the check for of_device_get_match_data()
  pwm: atmel: Consolidate driver data initialization
  pwm: atmel: Remove unneeded check for match data
  pwm: atmel: Remove platform_device_id and use only dt bindings
  pwm: stm32-lp: Add check in case requested period cannot be achieved
  pwm: Ensure pwm_apply_state() doesn't modify the state argument
  pwm: fsl-ftm: Don't update the state for the caller of pwm_apply_state()
  pwm: sun4i: Don't update the state for the caller of pwm_apply_state()
  pwm: rockchip: Don't update the state for the caller of pwm_apply_state()
  pwm: Let pwm_get_state() return the last implemented state
  pwm: Introduce local struct pwm_chip in pwm_apply_state()
  ...
parents 738f531d da635e7a

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

+2 −0
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ Required properties: 
   - "mediatek,mt7622-pwm": found on mt7622 SoC.

   - "mediatek,mt7623-pwm": found on mt7623 SoC.

   - "mediatek,mt7628-pwm": found on mt7628 SoC.

   - "mediatek,mt7629-pwm", "mediatek,mt7622-pwm": found on mt7629 SoC.

   - "mediatek,mt8516-pwm": found on mt8516 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-sprd.txt

0 → 100644
+40 −0
Original line number Diff line number Diff line 
Spreadtrum PWM controller



Spreadtrum SoCs PWM controller provides 4 PWM channels.



Required properties:

- compatible : Should be "sprd,ums512-pwm".

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

- clocks: The phandle and specifier referencing the controller's clocks.

- clock-names: Should contain following entries:

  "pwmn": used to derive the functional clock for PWM channel n (n range: 0 ~ 3).

  "enablen": for PWM channel n enable clock (n range: 0 ~ 3).

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

  the cells format.



Optional properties:

- assigned-clocks: Reference to the PWM clock entries.

- assigned-clock-parents: The phandle of the parent clock of PWM clock.



Example:

	pwms: pwm@32260000 {

		compatible = "sprd,ums512-pwm";

		reg = <0 0x32260000 0 0x10000>;

		clock-names = "pwm0", "enable0",

			"pwm1", "enable1",

			"pwm2", "enable2",

			"pwm3", "enable3";

		clocks = <&aon_clk CLK_PWM0>, <&aonapb_gate CLK_PWM0_EB>,

		       <&aon_clk CLK_PWM1>, <&aonapb_gate CLK_PWM1_EB>,

		       <&aon_clk CLK_PWM2>, <&aonapb_gate CLK_PWM2_EB>,

		       <&aon_clk CLK_PWM3>, <&aonapb_gate CLK_PWM3_EB>;

		assigned-clocks = <&aon_clk CLK_PWM0>,

			<&aon_clk CLK_PWM1>,

			<&aon_clk CLK_PWM2>,

			<&aon_clk CLK_PWM3>;

		assigned-clock-parents = <&ext_26m>,

			<&ext_26m>,

			<&ext_26m>,

			<&ext_26m>;

		#pwm-cells = <2>;

	};

MAINTAINERS

+3 −0
Original line number Diff line number Diff line
@@ -13246,9 +13246,11 @@ F: drivers/media/rc/pwm-ir-tx.c 














PWM SUBSYSTEM















M:	Thierry Reding <thierry.reding@gmail.com>













R:	Uwe Kleine-König <u.kleine-koenig@pengutronix.de>















L:	linux-pwm@vger.kernel.org















S:	Maintained















T:	git git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git













Q:	https://patchwork.ozlabs.org/project/linux-pwm/list/















F:	Documentation/driver-api/pwm.rst















F:	Documentation/devicetree/bindings/pwm/















F:	include/linux/pwm.h









@@ -13257,6 +13259,7 @@ F:	drivers/video/backlight/pwm_bl.c













F:	include/linux/pwm_backlight.h















F:	drivers/gpio/gpio-mvebu.c















F:	Documentation/devicetree/bindings/gpio/gpio-mvebu.txt













K:	pwm_(config|apply_state|ops)





























PXA GPIO DRIVER















M:	Robert Jarzmik <robert.jarzmik@free.fr>

































drivers/gpio/gpio-mvebu.c



+1
−1






























Original line number
Diff line number
Diff line








@@ -694,7 +694,7 @@ static void mvebu_pwm_get_state(struct pwm_chip *chip,













}































static int mvebu_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,













			   struct pwm_state *state)













			   const struct pwm_state *state)















{















	struct mvebu_pwm *mvpwm = to_mvebu_pwm(chip);















	struct mvebu_gpio_chip *mvchip = mvpwm->mvchip;

































drivers/pwm/Kconfig



+12
−1






























Original line number
Diff line number
Diff line








@@ -44,7 +44,7 @@ config PWM_AB8500





























config PWM_ATMEL















	tristate "Atmel PWM support"













	depends on ARCH_AT91













	depends on ARCH_AT91 && OF















	help















	  Generic PWM framework driver for Atmel SoC.


























@@ -423,6 +423,17 @@ config PWM_SPEAR













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















	  will be called pwm-spear.





























config PWM_SPRD













	tristate "Spreadtrum PWM support"













	depends on ARCH_SPRD || COMPILE_TEST













	depends on HAS_IOMEM













	help













	  Generic PWM framework driver for the PWM controller on













	  Spreadtrum SoCs.



























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













	  will be called pwm-sprd.





























config PWM_STI















	tristate "STiH4xx PWM support"















	depends on ARCH_STI