2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-21 11:44:01 +08:00
linux-next/Documentation/devicetree/bindings
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
..
arm The common clk framework changes for 3.6 include a small number of core 2012-07-24 16:40:57 -07:00
ata ata: ahci_platform: Add synopsys ahci controller in DT's compatible list 2012-05-03 14:08:53 -04:00
c6x C6X: devicetree support 2011-10-06 19:47:33 -04:00
clock clk: add highbank clock support 2012-07-11 17:58:47 -07:00
crypto crypto: picoxcell - support for device tree matching 2011-08-10 19:00:26 +08:00
dma arm-soc: device tree conversions, part 2 2012-05-26 12:57:47 -07:00
fb video: mxsfb: add simple device tree probe 2012-07-03 13:22:37 +08:00
gpio Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux 2012-07-28 13:43:12 -07:00
hwmon hwmon: (ads1015) Make gain and datarate configurable 2011-03-21 17:59:37 +01:00
i2c I2C: MV64XYZ: Add Device Tree support 2012-07-23 22:04:11 +02:00
input Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 2012-07-26 12:59:53 -07:00
iommu iommu/tegra: smmu: Add device tree support for SMMU 2012-06-25 13:50:43 +02:00
mfd regulator: tps65910: set input_supply on desc unconditionally 2012-07-17 11:08:46 +01:00
misc misc: at25: Parse dt settings 2012-06-14 17:23:04 -07:00
mmc arm-soc: general cleanups 2012-07-23 16:04:15 -07:00
mtd Merge branch 'v3.5-rc7-fixes' of git://github.com/lunn/linux into fixes 2012-07-25 21:37:09 +02:00
net Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-07-19 11:17:30 -07:00
nvec dt: name all Tegra binding docs consistently 2012-06-11 11:48:42 -06:00
pci
pinctrl Pin control changes for v3.6: 2012-07-24 14:05:46 -07:00
power_supply max17042_battery: Make it possible to instantiate driver from DT 2012-03-26 20:40:51 +04:00
powerpc powerpc: document the FSL MPIC message register binding 2012-03-16 16:15:28 -05:00
pwm pwm: add lpc32xx PWM support 2012-07-23 13:24:05 +02:00
regulator regulator: tps6586x: add support for input supply 2012-07-13 15:21:18 +01:00
rtc arm-soc: timer updates 2012-07-23 16:21:23 -07:00
serial Document: devicetree: add OF documents for arch-mmp 2012-03-07 09:32:52 +08:00
serio
sound dt: name all Tegra binding docs consistently 2012-06-11 11:48:42 -06:00
spi spi: Updates for 3.6 2012-07-26 12:57:41 -07:00
staging/iio/adc iio: Add device tree support to LPC32xx ADC 2012-04-24 11:04:07 -07:00
thermal drivers/thermal/spear_thermal.c: add Device Tree probing capability 2012-06-02 01:49:38 -04:00
tty/serial TTY/Serial patches for 3.6-rc1 2012-07-27 12:52:03 -07:00
usb USB patches for 3.6-rc1 2012-07-26 10:23:47 -07:00
video/backlight pwm-backlight: Add rudimentary device tree support 2012-07-23 13:23:52 +02:00
virtio virtio: Add platform bus driver for memory mapped virtio device 2011-11-02 11:41:01 +10:30
watchdog arm/dts: add wdt node for omap3 and omap4 2012-07-09 01:54:51 -07:00
x86 x86: dt: Correct local apic documentation in device tree bindings 2011-02-28 09:58:06 +01:00
eeprom.txt
marvell.txt
open-pic.txt powerpc: Document the Open PIC device tree binding 2011-03-21 11:00:52 +11:00
resource-names.txt of/irq: Add interrupts-names property to name an irq resource 2012-01-04 00:33:15 -07:00
vendor-prefixes.txt of: Add Avionic Design vendor prefix 2012-06-13 13:34:39 -05:00
xilinx.txt