diff options
| author | David S. Miller <davem@davemloft.net> | 2013-03-27 13:14:03 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-03-27 13:14:03 -0400 |
| commit | 7559d97993ae7d552c96313155286f372cf4cf7c (patch) | |
| tree | fe9a82b65e5a32b0cd16f0b93e40c9425e20719a /Documentation | |
| parent | a33e6112d9b0c1ab4fb55bb538832ec789200a10 (diff) | |
| parent | 21c11bc5d016ede062843cb3f98ee6824e6bcae2 (diff) | |
| download | linux-7559d97993ae7d552c96313155286f372cf4cf7c.tar.gz linux-7559d97993ae7d552c96313155286f372cf4cf7c.tar.bz2 linux-7559d97993ae7d552c96313155286f372cf4cf7c.zip | |
Merge branch 'for-davem' of git://gitorious.org/linux-can/linux-can-next
Marc Kleine-Budde says:
===================
this is a pull-request for net-next/master. It consists of three
patches by Lars-Peter Clausen to clean up the mcp251x spi-can driver,
two patches from Ludovic Desroches to bring device tree support to the
at91_can driver and a patch by me to fix a sparse warning in the
blackfin driver.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/net/can/atmel-can.txt | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/net/can/atmel-can.txt b/Documentation/devicetree/bindings/net/can/atmel-can.txt new file mode 100644 index 000000000000..72cf0c5daff4 --- /dev/null +++ b/Documentation/devicetree/bindings/net/can/atmel-can.txt @@ -0,0 +1,14 @@ +* AT91 CAN * + +Required properties: + - compatible: Should be "atmel,at91sam9263-can" or "atmel,at91sam9x5-can" + - reg: Should contain CAN controller registers location and length + - interrupts: Should contain IRQ line for the CAN controller + +Example: + + can0: can@f000c000 { + compatbile = "atmel,at91sam9x5-can"; + reg = <0xf000c000 0x300>; + interrupts = <40 4 5> + }; |