linux/arch/arm/mach-tegra
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-soc: driver specific updates 2012-05-26 12:22:27 -07:00
apbio.c ARM: tegra: apbio: use dmaengine based dma driver 2012-07-06 11:49:13 -06:00
apbio.h ARM: tegra: apbio access using dma for tegra20 only 2012-07-06 11:48:56 -06:00
board-dt-tegra20.c Merge branch 'for-3.6' of git://gitorious.org/linux-pwm/linux-pwm 2012-07-30 09:22:37 -07:00
board-dt-tegra30.c Merge branch 'for-3.6' of git://gitorious.org/linux-pwm/linux-pwm 2012-07-30 09:22:37 -07:00
board-harmony-pcie.c ARM: tegra: harmony: init regulators, PCIe when booting from DT 2012-06-20 12:37:42 -06:00
board-harmony-pinmux.c ARM: tegra: Switch to new pinctrl driver 2012-04-18 10:26:39 -06:00
board-harmony-power.c ARM: tegra: harmony: add regulator supply name and its input supply 2012-07-24 21:22:33 +02:00
board-harmony.c arm-soc: sweeping late_initcall cleanup 2012-05-26 13:14:01 -07:00
board-harmony.h ARM: 7101/1: arm/tegra: Replace <mach/gpio.h> with <mach/gpio-tegra.h> 2011-09-27 00:20:53 +01:00
board-paz00-pinmux.c ARM: tegra: Switch to new pinctrl driver 2012-04-18 10:26:39 -06:00
board-paz00.c ARM: tegra: paz00: enable WiFi rfkill when booting from device tree 2012-06-20 12:37:42 -06:00
board-paz00.h ARM: tegra: paz00: fix wrong SD1 power gpio 2012-02-06 18:32:50 -08:00
board-pinmux.c ARM: dt: tegra20: add pinmux to device tree 2012-04-18 10:26:39 -06:00
board-pinmux.h pinctrl: tegra: refactor probe handling 2012-04-18 10:26:40 -06:00
board-trimslice-pinmux.c ARM: tegra: Switch to new pinctrl driver 2012-04-18 10:26:39 -06:00
board-trimslice.c arm-soc: sweeping late_initcall cleanup 2012-05-26 13:14:01 -07:00
board-trimslice.h ARM: 7101/1: arm/tegra: Replace <mach/gpio.h> with <mach/gpio-tegra.h> 2011-09-27 00:20:53 +01:00
board.h ARM: tegra: paz00: enable WiFi rfkill when booting from device tree 2012-06-20 12:37:42 -06:00
clock.c ARM: tegra: use machine specific hook for late init 2012-05-08 20:36:36 +08:00
clock.h ARM: tegra: enable tegra30 clock framework 2012-02-06 09:16:15 -08:00
common.c ARM: tegra: apbio access using dma for tegra20 only 2012-07-06 11:48:56 -06:00
cpu-tegra.c ARM: tegra: add clk_prepare/clk_unprepare 2012-06-11 11:53:29 -06:00
cpuidle.c ARM: tegra: Remove flow controller programming 2012-06-11 11:48:43 -06:00
devices.c arm-soc: driver specific updates 2012-05-26 12:22:27 -07:00
devices.h arm-soc: driver specific updates 2012-05-26 12:22:27 -07:00
dma.c ARM: tegra: dma: rename driver name for clock to "tegra-apbdma" 2012-06-26 13:04:58 -06:00
flowctrl.c ARM: tegra: Fix flow controller accesses 2012-05-14 10:22:01 -06:00
flowctrl.h ARM: tegra: functions to access the flowcontroller 2012-02-26 14:44:42 -08:00
fuse.c ARM: More SoC support updates 2012-03-28 12:24:40 -07:00
fuse.h ARM: tegra: export Tegra chipid 2012-02-26 14:44:19 -08:00
gpio-names.h [ARM] tegra: add GPIO support 2010-08-05 14:57:02 -07:00
headsmp.S ARM: tegra: support for secondary cores on Tegra30 2012-02-26 14:44:46 -08:00
hotplug.c ARM: move CP15 definitions to separate header file 2012-03-28 18:30:01 +01:00
io.c ARM: tegra: clean-up mach/io.h 2012-03-06 21:34:41 -06:00
irq.c ARM: tegra: add support for tegra30 interrupts 2012-02-06 09:16:14 -08:00
Kconfig ARM: tegra: remove Seaboard board files 2012-06-20 12:37:41 -06:00
Makefile arm-soc: board specific updates 2012-07-23 17:34:48 -07:00
Makefile.boot arm-soc: board specific updates 2012-07-23 17:34:48 -07:00
pcie.c ARM: tegra: add clk_prepare/clk_unprepare 2012-06-11 11:53:29 -06:00
platsmp.c ARM: tegra: support for secondary cores on Tegra30 2012-02-26 14:44:46 -08:00
pmc.c ARM: tegra: Add a simple PMC driver 2012-02-06 18:25:01 -08:00
pmc.h ARM: tegra: Add a simple PMC driver 2012-02-06 18:25:01 -08:00
powergate.c ARM: tegra: add clk_prepare/clk_unprepare 2012-06-11 11:53:29 -06:00
reset.c ARM: tegra: make tegra_cpu_reset_handler_enable() __init 2012-06-18 16:42:57 -07:00
reset.h ARM: tegra: rework Tegra secondary CPU core bringup 2012-02-26 14:44:44 -08:00
sleep.S ARM: tegra: Remove flow controller programming 2012-06-11 11:48:43 -06:00
tegra2_clocks.c ARM: tegra: Provide clock for only one PWM controller 2012-07-02 15:01:34 -06:00
tegra2_emc.c ARM: tegra: Fix EMC pdata initialization from registers 2012-02-06 18:25:01 -08:00
tegra2_emc.h ARM: tegra: emc: convert tegra2_emc to a platform driver 2012-02-06 18:24:59 -08:00
tegra30_clocks.c ARM: tegra: Provide clock for only one PWM controller 2012-07-02 15:01:34 -06:00
timer.c ARM: tegra: add clk_prepare/clk_unprepare 2012-06-11 11:53:29 -06:00
usb_phy.c ARM: tegra: add clk_prepare/clk_unprepare 2012-06-11 11:53:29 -06:00