diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-01 19:37:56 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-01 19:37:56 -0700 |
commit | f1a3c0b933e7ff856223d6fcd7456d403e54e4e5 (patch) | |
tree | 248904252b10d6685b5a81f2ba4dc5cf35dcec38 /Documentation/devicetree/bindings/net/cpsw.txt | |
parent | 089b669506ef28fae2c24a0ec21e06c02a38556b (diff) | |
parent | c8fb70a3e8dd60e31c4422bae85783cf1733f038 (diff) | |
download | blackbird-obmc-linux-f1a3c0b933e7ff856223d6fcd7456d403e54e4e5.tar.gz blackbird-obmc-linux-f1a3c0b933e7ff856223d6fcd7456d403e54e4e5.zip |
Merge tag 'devicetree-for-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull devicetree updates from Rob Herring:
- added Frank Rowand as DT maintainer in preparation for Grant's
retirement.
- generic MSI binding documentation and a few other minor doc updates
- fix long standing issue with DT platorm device unregistration
- fix loop forever bug in of_find_matching_node_by_address()
* tag 'devicetree-for-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
MAINTAINERS: Add Frank Rowand as DT maintainer
mtd: nand: pxa3xx: add optional dma for pxa architecture
Documentation: DT: cpsw: document missing compatible
Docs: dt: add generic MSI bindings
drivercore: Fix unregistration path of platform devices
of/address: Don't loop forever in of_find_matching_node_by_address().
of: Add vendor prefix for JEDEC Solid State Technology Association
of/platform: add function to populate default bus
of: Add vendor prefix for Sharp Corporation
Diffstat (limited to 'Documentation/devicetree/bindings/net/cpsw.txt')
-rw-r--r-- | Documentation/devicetree/bindings/net/cpsw.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/net/cpsw.txt b/Documentation/devicetree/bindings/net/cpsw.txt index 33fe8462edf4..a9df21aaa154 100644 --- a/Documentation/devicetree/bindings/net/cpsw.txt +++ b/Documentation/devicetree/bindings/net/cpsw.txt @@ -2,7 +2,11 @@ TI SoC Ethernet Switch Controller Device Tree Bindings ------------------------------------------------------ Required properties: -- compatible : Should be "ti,cpsw" +- compatible : Should be one of the below:- + "ti,cpsw" for backward compatible + "ti,am335x-cpsw" for AM335x controllers + "ti,am4372-cpsw" for AM437x controllers + "ti,dra7-cpsw" for DRA7x controllers - reg : physical base address and size of the cpsw registers map - interrupts : property with a value describing the interrupt |