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

Commit 0bde7294 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

Pull pwm changes from Thierry Reding:
 "Mostly bug fixes and clean up.  There is a new driver, which is
  actually moving a custom PWM driver from drivers/misc.

  The majority of the patches are enhancements to the device tree
  support in the pwm-backlight driver.  Backlights can now additionally
  be powered using a regulator and enabled using a GPIO in addition to
  just the PWM input"

* tag 'pwm/for-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm: (30 commits)
  Documentation/pwm: Update supported SoC name for pwm-samsung
  pwm: samsung: Fix kernel warning while unexporting a channel
  MAINTAINERS: Move PWM subsystem tree to kernel.org
  Documentation/pwm: Fix trivial typos
  pwm-backlight: Remove unused variable
  pwm_backlight: avoid short blank screen while doing hibernation
  pwm-backlight: Fix brightness adjustment
  pwm: add ep93xx PWM support
  pwm-backlight: Allow for non-increasing brightness levels
  pwm-backlight: Add power supply support
  pwm-backlight: Use new enable_gpio field
  unicore32: Initialize PWM backlight enable_gpio field
  ARM: shmobile: Initialize PWM backlight enable_gpio field
  ARM: SAMSUNG: Initialize PWM backlight enable_gpio field
  ARM: pxa: Initialize PWM backlight enable_gpio field
  ARM: OMAP: Initialize PWM backlight enable_gpio field
  pwm-backlight: Add optional enable GPIO
  pwm-backlight: Track enable state
  pwm-backlight: Refactor backlight power on/off
  pwm-backlight: Improve readability
  ...
parents 449bf8d0 1b3f25ce

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

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ Required properties: 
    samsung,s5pc100-pwm - for 32-bit timers present on S5PC100, S5PV210,

			  Exynos4210 rev0 SoCs

    samsung,exynos4210-pwm - for 32-bit timers present on Exynos4210,

                          Exynos4x12 and Exynos5250 SoCs

                          Exynos4x12, Exynos5250 and Exynos5420 SoCs

- reg: base address and size of register area

- interrupts: list of timer interrupts (one interrupt per timer, starting at

  timer 0)

Documentation/devicetree/bindings/video/backlight/pwm-backlight.txt

+7 −0
Original line number Diff line number Diff line
@@ -10,12 +10,16 @@ Required properties: 
      last value in the array represents a 100% duty cycle (brightest).

  - default-brightness-level: the default brightness level (index into the

      array defined by the "brightness-levels" property)

  - power-supply: regulator for supply voltage



Optional properties:

  - pwm-names: a list of names for the PWM devices specified in the

               "pwms" property (see PWM binding[0])

  - enable-gpios: contains a single GPIO specifier for the GPIO which enables

                  and disables the backlight (see GPIO binding[1])



[0]: Documentation/devicetree/bindings/pwm/pwm.txt

[1]: Documentation/devicetree/bindings/gpio/gpio.txt



Example:
@@ -25,4 +29,7 @@ Example: 


		brightness-levels = <0 4 8 16 32 64 128 255>;

		default-brightness-level = <6>;



		power-supply = <&vdd_bl_reg>;

		enable-gpios = <&gpio 58 0>;

	};

Documentation/pwm.txt

+2 −2
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ New users should use the pwm_get() function and pass to it the consumer 
device or a consumer name. pwm_put() is used to free the PWM device. Managed

variants of these functions, devm_pwm_get() and devm_pwm_put(), also exist.



After being requested a PWM has to be configured using:

After being requested, a PWM has to be configured using:



int pwm_config(struct pwm_device *pwm, int duty_ns, int period_ns);
@@ -94,7 +94,7 @@ for new drivers to use the generic PWM framework. 
A new PWM controller/chip can be added using pwmchip_add() and removed

again with pwmchip_remove(). pwmchip_add() takes a filled in struct

pwm_chip as argument which provides a description of the PWM chip, the

number of PWM devices provider by the chip and the chip-specific

number of PWM devices provided by the chip and the chip-specific

implementation of the supported PWM operations to the framework.



Locking

MAINTAINERS

+1 −2
Original line number Diff line number Diff line
@@ -6785,8 +6785,7 @@ PWM SUBSYSTEM 
M:	Thierry Reding <thierry.reding@gmail.com>

L:	linux-pwm@vger.kernel.org

S:	Maintained

W:	http://gitorious.org/linux-pwm

T:	git git://gitorious.org/linux-pwm/linux-pwm.git

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

F:	Documentation/pwm.txt

F:	Documentation/devicetree/bindings/pwm/

F:	include/linux/pwm.h

arch/arm/mach-pxa/cm-x300.c

+1 −0
Original line number Diff line number Diff line
@@ -310,6 +310,7 @@ static struct platform_pwm_backlight_data cm_x300_backlight_data = { 
	.max_brightness	= 100,

	.dft_brightness	= 100,

	.pwm_period_ns	= 10000,

	.enable_gpio	= -1,

};



static struct platform_device cm_x300_backlight_device = {