Commit 5fffb951 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6 

* 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6:
  of_mdio: Don't phy_scan_fixups() twice
  Devicetree: Expand on ARM Primecell binding documentation
  dt: Add empty of_match_node() macro
  dt: add empty dt helpers for non-dt build
  devicetree: fix build error on drivers/tty/serial/altera_jtaguart.c
  devicetree: Add ARM pl022 spi controller binding doc
  devicetree: Add ARM pl061 gpio controller binding doc
  of/irq: of_irq_find_parent: check for parent equal to child
  MAINTAINERS: update devicetree maintainers
  dt: add helper to read 64-bit integers
  tty: use of_match_ptr() for of_match_table entry
  OF: Add of_match_ptr() macro
  dt: add empty for_each_child_of_node, of_find_property
  devicetree: Document Qualcomm and Atmel prefixes
  serial/imx: add of_alias_get_id() reference back
  dt: add of_alias_scan and of_alias_get_id
  devicetree: Add a registry of vendor prefixes
parents b96d7157 ae97159a

Documentation/devicetree/bindings/arm/primecell.txt

+3 −1
Original line number Diff line number Diff line
@@ -6,7 +6,9 @@ driver matching. 


Required properties:



- compatible : should be a specific value for peripheral and "arm,primecell"

- compatible : should be a specific name for the peripheral and

               "arm,primecell".  The specific name will match the ARM

               engineering name for the logic block in the form: "arm,pl???"



Optional properties:

Documentation/devicetree/bindings/gpio/pl061-gpio.txt

0 → 100644
+10 −0
Original line number Diff line number Diff line 
ARM PL061 GPIO controller



Required properties:

- compatible : "arm,pl061", "arm,primecell"

- #gpio-cells : Should be two. The first cell is the pin number and the

  second cell is used to specify optional parameters:

  - bit 0 specifies polarity (0 for normal, 1 for inverted)

- gpio-controller : Marks the device node as a GPIO controller.

- interrupts : Interrupt mapping for GPIO IRQ.

Documentation/devicetree/bindings/spi/spi_pl022.txt

0 → 100644
+12 −0
Original line number Diff line number Diff line 
ARM PL022 SPI controller



Required properties:

- compatible : "arm,pl022", "arm,primecell"

- reg : Offset and length of the register set for the device

- interrupts : Should contain SPI controller interrupt



Optional properties:

- cs-gpios : should specify GPIOs used for chipselects.

  The gpios will be referred to as reg = <index> in the SPI child nodes.

  If unspecified, a single SPI device without a chip select can be used.

Documentation/devicetree/bindings/vendor-prefixes.txt

0 → 100644
+40 −0
Original line number Diff line number Diff line 
Device tree binding vendor prefix registry.  Keep list in alphabetical order.



This isn't an exhaustive list, but you should add new prefixes to it before

using them to avoid name-space collisions.



adi	Analog Devices, Inc.

amcc	Applied Micro Circuits Corporation (APM, formally AMCC)

apm	Applied Micro Circuits Corporation (APM)

arm	ARM Ltd.

atmel	Atmel Corporation

chrp	Common Hardware Reference Platform

dallas	Maxim Integrated Products (formerly Dallas Semiconductor)

denx	Denx Software Engineering

epson	Seiko Epson Corp.

est	ESTeem Wireless Modems

fsl	Freescale Semiconductor

GEFanuc	GE Fanuc Intelligent Platforms Embedded Systems, Inc.

gef	GE Fanuc Intelligent Platforms Embedded Systems, Inc.

hp	Hewlett Packard

ibm	International Business Machines (IBM)

idt	Integrated Device Technologies, Inc.

intercontrol	Inter Control Group

linux	Linux-specific binding

marvell	Marvell Technology Group Ltd.

maxim	Maxim Integrated Products

mosaixtech	Mosaix Technologies, Inc.

national	National Semiconductor

nintendo	Nintendo

nvidia	NVIDIA

nxp	NXP Semiconductors

powervr	Imagination Technologies

qcom	Qualcomm, Inc.

ramtron	Ramtron International

samsung	Samsung Semiconductor

schindler	Schindler

simtek

sirf	SiRF Technology, Inc.

stericsson	ST-Ericsson

ti	Texas Instruments

xlnx	Xilinx

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -4760,10 +4760,12 @@ F: drivers/i2c/busses/i2c-ocores.c 


OPEN FIRMWARE AND FLATTENED DEVICE TREE

M:	Grant Likely <grant.likely@secretlab.ca>

M:	Rob Herring <rob.herring@calxeda.com>

L:	devicetree-discuss@lists.ozlabs.org (moderated for non-subscribers)

W:	http://fdt.secretlab.ca

T:	git git://git.secretlab.ca/git/linux-2.6.git

S:	Maintained

F:	Documentation/devicetree

F:	drivers/of

F:	include/linux/of*.h

K:	of_get_property

CRA Git | Maintained and supported by SUSTech CRA and CCSE