linux-sg2042/arch/arm/mach-vt8500
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
..
include/mach ARM:vt8500: Convert to use .restart and remove arch_reset() 2012-07-18 18:51:55 +02:00
Kconfig ARM: 6597/1: Add basic architecture support for VIA/WonderMedia 85xx SoC's 2011-01-25 15:07:01 +00:00
Makefile Merge branch 'for-3.6' of git://gitorious.org/linux-pwm/linux-pwm 2012-07-30 09:22:37 -07:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
bv07.c ARM:vt8500: Convert to use .restart and remove arch_reset() 2012-07-18 18:51:55 +02:00
devices-vt8500.c ARM: 6597/1: Add basic architecture support for VIA/WonderMedia 85xx SoC's 2011-01-25 15:07:01 +00:00
devices-wm8505.c ARM: 6597/1: Add basic architecture support for VIA/WonderMedia 85xx SoC's 2011-01-25 15:07:01 +00:00
devices.c ARM: 6597/1: Add basic architecture support for VIA/WonderMedia 85xx SoC's 2011-01-25 15:07:01 +00:00
devices.h ARM: 6597/1: Add basic architecture support for VIA/WonderMedia 85xx SoC's 2011-01-25 15:07:01 +00:00
gpio.c ARM: 6597/1: Add basic architecture support for VIA/WonderMedia 85xx SoC's 2011-01-25 15:07:01 +00:00
irq.c ARM: 6979/1: mach-vt8500: add forgotten irq_data conversion 2011-07-06 20:46:04 +01:00
restart.c ARM:vt8500: Convert to use .restart and remove arch_reset() 2012-07-18 18:51:55 +02:00
timer.c ARM: 6597/1: Add basic architecture support for VIA/WonderMedia 85xx SoC's 2011-01-25 15:07:01 +00:00
wm8505_7in.c ARM:vt8500: Convert to use .restart and remove arch_reset() 2012-07-18 18:51:55 +02:00