linux/arch/blackfin/kernel
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
..
cplb-mpu blackfin: cplb-mpu: fix page mask table overflow 2012-03-21 11:00:06 +08:00
cplb-nompu blackfin: cplb-nompu: fix ROM cplb size for bf609-ezkit 2012-07-24 13:39:53 +08:00
.gitignore Blackfin: ignore generated vmlinux.lds 2009-05-27 00:27:03 -04:00
asm-offsets.c Disintegrate asm/system.h for Blackfin [ver #2] 2012-03-21 11:00:08 +08:00
bfin_dma.c bfin-dma: only use MDMA3 on bf609 2012-07-24 13:39:48 +08:00
bfin_gpio.c bfin_gpio: fix bf548-ezkit kernel fail to boot 2012-05-21 14:54:41 +08:00
bfin_ksyms.c Blackfin: move internal irq prototypes out of global namespace 2011-05-25 08:13:43 -04:00
cplbinfo.c Blackfin: cplbinfo: drop d_path() hacks 2009-10-07 04:48:04 -04:00
debug-mmrs.c blackfin: add bf60x to current framework 2012-05-21 14:54:12 +08:00
dma-mapping.c blackfin: Call sg_for_each to pass through the whole sg list. 2012-07-24 13:39:48 +08:00
dumpstack.c Blackfin: make hardware trace output a little more useful 2010-05-21 09:40:19 -04:00
early_printk.c Blackfin: mass clean up of copyright/licensing info 2009-10-07 04:36:26 -04:00
entry.S Blackfin: delete fork func 2012-05-21 14:54:39 +08:00
exception.c Blackfin: split kernel/traps.c 2010-05-21 09:40:17 -04:00
fixed_code.S Blackfin: mass clean up of copyright/licensing info 2009-10-07 04:36:26 -04:00
flat.c Blackfin: mass clean up of copyright/licensing info 2009-10-07 04:36:26 -04:00
ftrace-entry.S Blackfin: add support for dynamic ftrace 2010-08-06 12:55:54 -04:00
ftrace.c atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
gptimers.c blackfin: bf60x: fix compiling warning 2012-05-21 14:54:26 +08:00
ipipe.c Disintegrate asm/system.h for Blackfin [ver #2] 2012-03-21 11:00:08 +08:00
irqchip.c Blackfin: move internal irq prototypes out of global namespace 2011-05-25 08:13:43 -04:00
kgdb_test.c Disintegrate asm/system.h for Blackfin [ver #2] 2012-03-21 11:00:08 +08:00
kgdb.c Fix common misspellings 2011-03-31 11:26:23 -03:00
Makefile pwm: Move Blackfin PWM driver to PWM framework 2012-07-02 21:38:59 +02:00
module.c modules: make arch's use default loader hooks 2011-07-24 22:06:04 +09:30
nmi.c atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
perf_event.c blackfin: Add export.h to files using EXPORT_SYMBOL/THIS_MODULE 2011-10-31 19:31:01 -04:00
process.c sched: Move nr_cpus_allowed out of 'struct sched_rt_entity' 2012-05-30 14:02:25 +02:00
pseudodbg.c Blackfin: show the whole accumulator in the pseudo DBG insn 2010-05-22 14:19:06 -04:00
ptrace.c Disintegrate asm/system.h for Blackfin [ver #2] 2012-03-21 11:00:08 +08:00
reboot.c blackfin: add bf60x to current framework 2012-05-21 14:54:12 +08:00
setup.c blackfin: fix build after add bf60x mach/pm.h 2012-05-21 14:55:07 +08:00
shadow_console.c blackfin: add bf60x to current framework 2012-05-21 14:54:12 +08:00
signal.c blackfin: check __get_user() return value 2012-06-01 13:01:27 -04:00
stacktrace.c Blackfin: add preliminary support for STACKTRACE 2009-06-13 07:20:14 -04:00
sys_bfin.c blackfin: Add export.h to files using EXPORT_SYMBOL/THIS_MODULE 2011-10-31 19:31:01 -04:00
time-ts.c blackfin: bf60x: enable gptimer clock source 2012-05-21 14:54:20 +08:00
time.c Blackfin: irq: remove IRQF_DISABLED 2011-10-26 04:22:26 -04:00
trace.c blackfin: fix possible deadlock in decode_address() 2012-05-31 17:49:30 -07:00
traps.c Disintegrate asm/system.h for Blackfin [ver #2] 2012-03-21 11:00:08 +08:00
vmlinux.lds.S Blackfin: make sure percpu section is aligned in XIP builds 2011-07-23 01:18:22 -04:00