renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-21 11:44:01 +08:00
Code
ca41cc96b2
linux-next/Documentation/devicetree/bindings
History
Linus Torvalds ca41cc96b2 Merge branch 'for-v3.7' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping 
Pull CMA and DMA-mapping updates from Marek Szyprowski:
 "This time the pull request is rather small, because the further
  redesign patches were not ready on time.

  This pull request consists of the patches which extend ARM DMA-mapping
  subsystem with support for CPU coherent (ACP) DMA busses.  The first
  client of the new version is HighBank SATA driver.  The second part of
  the pull request includes various cleanup for both CMA common code and
  ARM DMA-mapping subsystem."

Fix up trivial add-add conflict due to the "dma-coherent" DT property
being added next to the "calxeda,port-phys" property for the Calxeda
AHCI controller.

* 'for-v3.7' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
  ARM: dma-mapping: Remove unsed var at arm_coherent_iommu_unmap_page
  ARM: highbank: add coherent DMA setup
  ARM: kill off arch_is_coherent
  ARM: add coherent iommu dma ops
  ARM: add coherent dma ops
  ARM: dma-mapping: Refrain noisy console message
  ARM: dma-mapping: Small logical clean up
  drivers: dma-contiguous: refactor dma_alloc_from_contiguous()
2012-10-02 19:13:12 -07:00
..
arm Minor libata updates, nothing notable. 2012-10-02 18:23:35 -07:00
ata Merge branch 'for-v3.7' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping 2012-10-02 19:13:12 -07:00
bus drivers: bus: add a new driver for omap-ocp2scp 2012-08-22 14:31:49 +02:00
c6x C6X: devicetree support 2011-10-06 19:47:33 -04:00
clock Update arch-vt8500 and drivers to device tree and 2012-09-23 21:51:39 -07:00
cpufreq cpufreq: Add a generic cpufreq-cpu0 driver 2012-09-09 22:06:34 +02:00
crypto crypto: picoxcell - support for device tree matching 2011-08-10 19:00:26 +08:00
dma Merge branch 'for-v3.7' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping 2012-10-02 19:13:12 -07:00
fb video: mxsfb: add simple device tree probe 2012-07-03 13:22:37 +08:00
gpio So this is the LW GPIO patch stack for v3.7: 2012-10-02 16:05:10 -07:00
hwmon hwmon: (ads1015) Make gain and datarate configurable 2011-03-21 17:59:37 +01:00
i2c Documentation: dt: i2c: trivial-devices: Update for tmp102 2012-09-07 19:18:35 +02:00
input Linux 3.6-rc4 2012-09-04 22:57:19 -07:00
interrupt-controller ARM: bcm2835: add interrupt controller driver 2012-09-19 19:08:37 -06:00
iommu iommu/tegra: smmu: Add device tree support for SMMU 2012-06-25 13:50:43 +02:00
lpddr2 Documentation: dt: device tree bindings for LPDDR2 memories 2012-09-07 19:18:37 +02:00
media ARM: EXYNOS: Adds G-Scaler device from Device Tree 2012-09-07 14:13:08 +09:00
memory-controllers/ti Documentation: dt: emif: device tree bindings for TI's EMIF sdram controller 2012-09-07 19:18:38 +02:00
mfd Documentation: Add the AB8500 CODEC device to the MFD AB8500 doc 2012-09-20 12:32:30 +02:00
mips/cavium MIPS: Octeon: Add device tree source files. 2012-07-23 13:54:52 +01:00
misc drivers/misc/lis3lv02d/lis3lv02d_i2c.c: add lis3lv02d device tree init 2012-09-26 14:18:48 -07:00
mmc ARM: dts: imx51-babbage: fix esdhc cd/wp properties 2012-08-23 21:10:23 +08:00
mtd MTD: pxa3xx-nand: add devicetree bindings 2012-08-16 16:14:24 +08:00
net Merge branch 'for-v3.7' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping 2012-10-02 19:13:12 -07:00
nvec dt: name all Tegra binding docs consistently 2012-06-11 11:48:42 -06:00
pci
pinctrl These are the bulk pinctrl changes for kernel v3.7: 2012-10-02 16:20:20 -07:00
power PM / OPP: Initialize OPP table from device tree 2012-09-09 22:06:33 +02: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 Merge remote-tracking branches 'regulator/topic/core', 'regulator/topic/bypass', 'regulator/topic/tol', 'regulator/topic/drivers' and 'regulator/topic/tps6586x' into regulator-next 2012-09-28 14:45:07 +01:00
rtc Update arch-vt8500 and drivers to device tree and 2012-09-23 21:51:39 -07:00
serial MIPS: Octeon: Add device tree source files. 2012-07-23 13:54:52 +01:00
serio
sound Documentation: Define the MSP Driver Device Tree bindings 2012-09-20 09:10:59 +02:00
spi Merge branches 'spi-drivers' and 'spi-mxs' into spi-next 2012-09-28 14:05:29 +01:00
staging staging: drm/imx: Add devicetree binding documentation 2012-09-21 09:17:06 -07:00
thermal drivers/thermal/spear_thermal.c: add Device Tree probing capability 2012-06-02 01:49:38 -04:00
timer ARM: bcm2835: add system timer 2012-09-19 19:08:46 -06:00
tty/serial Update arch-vt8500 and drivers to device tree and 2012-09-23 21:51:39 -07:00
usb ARM: soc: device tree updates 2012-10-01 18:28:06 -07:00
video arm: vt8500: doc: Add device tree bindings for arch-vt8500 devices 2012-09-21 19:23:58 +12:00
virtio virtio: Add platform bus driver for memory mapped virtio device 2011-11-02 11:41:01 +10:30
w1 onewire: w1-gpio: add DT bindings 2012-08-16 10:00:23 -07:00
watchdog ARM: arm-soc Marvell Orion device-tree updates 2012-08-02 11:50:24 -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 ARM: soc: device tree updates 2012-10-01 18:28:06 -07:00
xilinx.txt