2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-19 02:34:01 +08:00
linux-next/drivers/video/backlight
Linus Torvalds 9ec97169e7 Merge branch 'for-3.6' of git://gitorious.org/linux-pwm/linux-pwm
Pull PWM subsystem from Thierry Reding:
 "The new PWM subsystem aims at collecting all implementations of the
  legacy PWM API and to eventually replace it completely.

  The subsystem has been in development for over half a year now and
  many drivers have already been converted.  It has been in linux-next
  for a couple of weeks and there have been no major issues so I think
  it is ready for inclusion in your tree."

Arnd Bergmann <arnd@arndb.de>:
 "Very much Ack on the new subsystem.  It uses the interface
  declarations as the previously separate pwm drivers, so nothing
  changes for now in the drivers using it, although it enables us to
  change those more easily in the future if we want to.

  This work is also one of the missing pieces that are required to
  eventually build ARM kernels for multiple platforms, which is
  currently prohibited (amongs other things) by the fact that you cannot
  have more than one driver exporting the pwm functions."

Tested-and-acked-by: Alexandre Courbot <acourbot@nvidia.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Philip, Avinash <avinashphilip@ti.com> # TI's AM33xx platforms
Acked-By: Alexandre Pereira da Silva <aletes.xgr@gmail.com> # LPC32XX
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Sachin Kamat <sachin.kamat@linaro.org>

Fix up trivial conflicts with other cleanups and DT updates.

* 'for-3.6' of git://gitorious.org/linux-pwm/linux-pwm: (36 commits)
  pwm: pwm-tiehrpwm: PWM driver support for EHRPWM
  pwm: pwm-tiecap: PWM driver support for ECAP APWM
  pwm: fix used-uninitialized warning in pwm_get()
  pwm: add lpc32xx PWM support
  pwm_backlight: pass correct brightness to callback
  pwm: Use pr_* functions in pwm-samsung.c file
  pwm: Convert pwm-samsung to use devm_* APIs
  pwm: Convert pwm-tegra to use devm_clk_get()
  pwm: pwm-mxs: Return proper error if pwmchip_remove() fails
  pwm: pwm-bfin: Return proper error if pwmchip_remove() fails
  pwm: pxa: Propagate pwmchip_remove() error
  pwm: Convert pwm-pxa to use devm_* APIs
  pwm: Convert pwm-vt8500 to use devm_* APIs
  pwm: Convert pwm-imx to use devm_* APIs
  pwm: Conflict with legacy PWM API
  pwm: pwm-mxs: add pinctrl support
  pwm: pwm-mxs: use devm_* managed functions
  pwm: pwm-mxs: use global reset function stmp_reset_block
  pwm: pwm-mxs: encode soc name in compatible string
  pwm: Take over maintainership of the PWM subsystem
  ...
2012-07-30 09:22:37 -07:00
..
88pm860x_bl.c backlight: fix memory leak on obscure error path 2012-07-09 16:20:11 +02:00
aat2870_bl.c drivers/video/backlight: use devm_ functions 2012-03-23 16:58:33 -07:00
adp5520_bl.c drivers/video/backlight/adp5520_bl.c: use kstrtoul() 2012-05-29 16:22:29 -07:00
adp8860_bl.c backlight: adp8860: use devm_ functions 2012-05-29 16:22:30 -07:00
adp8870_bl.c backlight: adp8870: use devm_ functions 2012-05-29 16:22:30 -07:00
ams369fg06.c backlight: ams369fg06: use devm_ functions 2012-05-29 16:22:30 -07:00
apple_bl.c backlight: apple_bl: use pr_debug()/pr_err() instead of printk() 2012-05-29 16:22:29 -07:00
atmel-pwm-bl.c backlight: add backlight type 2011-03-22 17:43:59 -07:00
backlight.c backlight: use pr_warn() and pr_debug() instead of printk() 2012-05-29 16:22:29 -07:00
corgi_lcd.c backlight: corgi_lcd: use devm_ functions 2012-05-29 16:22:30 -07:00
cr_bllcd.c backlight: cr_bllcd: use pr_err()/pr_info() instead of printk() 2012-05-29 16:22:29 -07:00
da903x_bl.c backlight: initialize struct backlight_properties properly 2012-05-29 16:22:30 -07:00
da9052_bl.c backlight: add driver for DA9052/53 PMIC v1 2012-04-05 15:25:51 -07:00
ep93xx_bl.c ep93xx: Use ioremap for backlight driver 2012-03-14 11:41:10 +11:00
generic_bl.c backlight: generic_bl: use pr_info() instead of printk() 2012-05-29 16:22:29 -07:00
hp680_bl.c backlight: add backlight type 2011-03-22 17:43:59 -07:00
ili9320.c fbdev fixes for 3.5 2012-06-16 16:59:05 -07:00
ili9320.h fb: add support for the ILI9320 video display controller 2008-07-24 10:47:40 -07:00
jornada720_bl.c backlight: jornada720: use pr_err()/pr_info() instead of printk() 2012-05-29 16:22:29 -07:00
jornada720_lcd.c backlight: jornada720: use pr_err()/pr_info() instead of printk() 2012-05-29 16:22:29 -07:00
kb3886_bl.c backlight: add backlight type 2011-03-22 17:43:59 -07:00
Kconfig Merge branch 'for-3.6' of git://gitorious.org/linux-pwm/linux-pwm 2012-07-30 09:22:37 -07:00
l4f00242t03.c backlight: l4f00242t03: use devm_ functions 2012-05-29 16:22:30 -07:00
lcd.c backlight: use pr_warn() and pr_debug() instead of printk() 2012-05-29 16:22:29 -07:00
ld9040_gamma.h drivers/vidfeo/backlight: ld9040 amoled driver support 2011-03-22 17:43:59 -07:00
ld9040.c backlight: ld9040: use devm_ functions 2012-05-29 16:22:30 -07:00
lm3533_bl.c backlight: add LM3533 backlight driver 2012-05-29 16:22:29 -07:00
lms283gf05.c backlight: lms283gf05: use devm_ functions 2012-05-29 16:22:30 -07:00
locomolcd.c ARM: fix lcd power build failure in collie_defconfig 2012-04-02 22:03:44 -07:00
lp855x_bl.c backlight: new backlight driver for LP855x devices 2012-03-23 16:58:33 -07:00
ltv350qv.c backlight: ltv350qv: use devm_ functions 2012-05-29 16:22:31 -07:00
ltv350qv.h backlight: Add Samsung LTV350QV LCD driver 2007-10-11 22:24:12 +01:00
Makefile backlight: add LM3533 backlight driver 2012-05-29 16:22:29 -07:00
max8925_bl.c drivers/video/backlight: use devm_ functions 2012-03-23 16:58:33 -07:00
omap1_bl.c backlight: omap1: use pr_info() instead of printk() 2012-05-29 16:22:30 -07:00
ot200_bl.c backlight: add driver for Bachmann's ot200 2012-03-23 16:58:33 -07:00
pandora_bl.c backlight: add support for Pandora backlight 2012-03-23 16:58:33 -07:00
pcf50633-backlight.c backlight: initialize struct backlight_properties properly 2012-05-29 16:22:30 -07:00
platform_lcd.c backlight: convert platform_lcd to dev_pm_ops 2012-03-23 16:58:33 -07:00
progear_bl.c backlight: progear: use pr_err() instead of printk() 2012-05-29 16:22:30 -07:00
pwm_bl.c pwm_backlight: pass correct brightness to callback 2012-07-23 13:24:04 +02:00
s6e63m0_gamma.h backlight: add S6E63M0 AMOLED LCD Panel driver 2010-05-26 17:34:16 +01:00
s6e63m0.c backlight: s6e63m0: use devm_ functions 2012-05-29 16:22:31 -07:00
tdo24m.c backlight: tdo24m: use devm_ functions 2012-05-29 16:22:31 -07:00
tosa_bl.c backlight: tosa_bl: use devm_ functions 2012-05-29 16:22:31 -07:00
tosa_lcd.c backlight: tosa_lcd: use devm_ functions 2012-05-29 16:22:31 -07:00
vgg2432a4.c backlight: convert backlight spi drivers to module_spi_driver 2012-03-23 16:58:33 -07:00
wm831x_bl.c backlight: initialize struct backlight_properties properly 2012-05-29 16:22:30 -07:00