2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-27 06:34:11 +08:00
linux-next/Documentation/devicetree/bindings/net
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
..
can can: c_can: Add device tree support to Bosch C_CAN/D_CAN controller 2012-09-21 23:58:47 +02:00
broadcom-bcm87xx.txt netdev/phy: Add driver for Broadcom BCM87XX 10G Ethernet PHYs 2012-06-27 21:23:25 -07:00
calxeda-xgmac.txt ARM: highbank: add coherent DMA setup 2012-10-02 08:58:07 +02:00
cavium-mdio.txt MIPS: Octeon: Add device tree source files. 2012-07-23 13:54:52 +01:00
cavium-mix.txt MIPS: Octeon: Add device tree source files. 2012-07-23 13:54:52 +01:00
cavium-pip.txt MIPS: Octeon: Add device tree source files. 2012-07-23 13:54:52 +01:00
cpsw.txt Revert "net: ti cpsw ethernet: allow reading phy interface mode from DT" 2012-10-01 17:39:31 -04:00
davinci_emac.txt net: ethernet: davinci_emac: add OF support 2012-07-18 09:40:54 -07:00
davinci-mdio.txt drivers: net: ethernet: davince_mdio: device tree implementation 2012-08-07 16:24:55 -07:00
fsl-fec.txt Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-07-19 11:17:30 -07:00
fsl-tsec-phy.txt ptp: Added a clock that uses the eTSEC found on the MPC85xx. 2011-05-23 13:10:14 -07:00
lpc-eth.txt net: Add device tree support to LPC32xx 2012-04-22 12:01:19 +02:00
macb.txt net/macb: add DT support for Cadence macb/gem driver 2011-12-16 13:11:00 +01:00
mdio-gpio.txt dt: Move device tree documentation out of powerpc directory 2011-01-31 00:09:01 -07:00
mdio-mux-gpio.txt netdev/of/phy: Add MDIO bus multiplexer driven by GPIO lines. 2012-05-07 22:58:09 -04:00
mdio-mux-mmioreg.txt netdev/phy: add MDIO bus multiplexer driven by a memory-mapped device 2012-08-30 12:54:48 -04:00
mdio-mux.txt netdev/of/phy: Add MDIO bus multiplexer support. 2012-05-07 22:58:09 -04:00
phy.txt netdev/phy/of: Handle IEEE802.3 clause 45 Ethernet PHYs in of_mdiobus_register() 2012-06-27 21:23:24 -07:00
smsc911x.txt net/smsc911x: add device tree probe support 2011-08-01 18:01:33 -07:00
smsc-lan91c111.txt arm/versatile: Add device tree support 2011-07-28 01:32:04 -06:00
stmmac.txt net: stmmac: Add ip version to dts bindings 2012-07-19 10:48:00 -07:00