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

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

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

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

Pull pwm updates from Thierry Reding:
 "This series contains a number of improvements to existing drivers,
  such as LPSS. Some drivers, such as renesas-tpu and rcar get support
  for more SoC generations. To round things off this fixes an issue with
  the sysfs interface"

* tag 'pwm/for-4.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm:
  pwm: lpss: Only set update bit if we are actually changing the settings
  pwm: lpss: Force runtime-resume on suspend on Cherry Trail
  pwm: Enable TI ECAP driver for ARCH_K3
  dt-bindings: pwm: tiecap: Add TI AM654 SoC specific compatible
  dt-bindings: pwm: rcar: Add r8a774a1 support
  pwm: Send a uevent on the pwmchip device upon channel sysfs (un)export
  Revert "pwm: Set class for exported channels in sysfs"
  dt-bindings: pwm: renesas-tpu: Document r8a7744 support
  dt-bindings: pwm: rcar: Add r8a7744 support
  dt-bindings: pwm: renesas: tpu: Document R8A779{7|8}0 bindings
  dt-bindings: pwm: renesas: pwm-rcar: Document R8A779{7|8}0 bindings
  dt-bindings: pwm: renesas: tpu: Fix "compatible" prop description
  pwm: Use SPDX identifier for Renesas drivers
  pwm: lpss: Add get_state callback
  pwm: lpss: Release runtime-pm reference from the driver's remove callback
  pwm: lpss: Check PWM powerstate after resume on Cherry Trail devices
  pwm: lpss: Move struct pwm_lpss_chip definition to the header file
  pwm: lpss: Add ACPI HID for second PWM controller on Cherry Trail devices
  ACPI / PM: Export acpi_device_get_power() for use by modular build drivers
  pwm: tegra: Remove gratuituous blank line
parents 0b21f21a 2153bbc1

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

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ Required properties: 
  for da850  - compatible = "ti,da850-ecap", "ti,am3352-ecap", "ti,am33xx-ecap";

  for dra746 - compatible = "ti,dra746-ecap", "ti,am3352-ecap";

  for 66ak2g - compatible = "ti,k2g-ecap", "ti,am3352-ecap";

  for am654  - compatible = "ti,am654-ecap", "ti,am3352-ecap";

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

  the cells format. The PWM channel index ranges from 0 to 4. The only third

  cell flag supported by this binding is PWM_POLARITY_INVERTED.

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

+4 −0
Original line number Diff line number Diff line
@@ -3,7 +3,9 @@ 
Required Properties:

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

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

 - "renesas,pwm-r8a7744": for RZ/G1N

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

 - "renesas,pwm-r8a774a1": for RZ/G2M

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

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

 - "renesas,pwm-r8a7790": for R-Car H2
@@ -12,6 +14,8 @@ Required Properties: 
 - "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-r8a77970": for R-Car V3M

 - "renesas,pwm-r8a77980": for R-Car V3H

 - "renesas,pwm-r8a77990": for R-Car E3

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

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

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

+8 −2
Original line number Diff line number Diff line
@@ -2,13 +2,19 @@ 


Required Properties:



  - compatible: should be one of the following.

  - compatible: must contain one or more of the following:

    - "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-r8a7744": for R8A7744 (RZ/G1N) 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 and RZ/G1 TPU PWM controller.

    - "renesas,tpu-r8a77970": for R8A77970 (R-Car V3M) compatible PWM

			      controller.

    - "renesas,tpu-r8a77980": for R8A77980 (R-Car V3H) compatible PWM

			      controller.

    - "renesas,tpu": for the generic TPU PWM controller; this is a fallback for

		     the entries listed above.



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

    controller hardware module.

drivers/acpi/device_pm.c

+1 −0
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ int acpi_device_get_power(struct acpi_device *device, int *state) 


	return 0;

}

EXPORT_SYMBOL(acpi_device_get_power);



static int acpi_dev_pm_explicit_set(struct acpi_device *adev, int state)

{

drivers/pwm/Kconfig

+2 −3
Original line number Diff line number Diff line
@@ -447,10 +447,9 @@ config PWM_TEGRA 


config  PWM_TIECAP

	tristate "ECAP PWM support"

	depends on ARCH_OMAP2PLUS || ARCH_DAVINCI_DA8XX || ARCH_KEYSTONE

	depends on ARCH_OMAP2PLUS || ARCH_DAVINCI_DA8XX || ARCH_KEYSTONE || ARCH_K3

	help

	  PWM driver support for the ECAP APWM controller found on AM33XX

	  TI SOC

	  PWM driver support for the ECAP APWM controller found on TI SOCs



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

	  will be called pwm-tiecap.