diff options
author | David S. Miller <davem@davemloft.net> | 2012-07-07 19:29:29 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-07-07 19:29:29 -0400 |
commit | 8f961faef791f6cc8fb1d10817fa7af3efcb544e (patch) | |
tree | 0d4ecd861c575d7ebd235cea61eeea7cac034a25 /Documentation | |
parent | 95162d652477f6e3d04687f5d39d443fcc64d8d7 (diff) | |
parent | f057bbb6f9ed0fb61ea11105c9ef0ed5ac1a354d (diff) |
Merge branch 'for-davem' of git://gitorious.org/linux-can/linux-can-next
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/devicetree/bindings/net/can/fsl-flexcan.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/net/can/fsl-flexcan.txt b/Documentation/devicetree/bindings/net/can/fsl-flexcan.txt index f31b686d4556..8ff324eaa889 100644 --- a/Documentation/devicetree/bindings/net/can/fsl-flexcan.txt +++ b/Documentation/devicetree/bindings/net/can/fsl-flexcan.txt | |||
@@ -11,6 +11,9 @@ Required properties: | |||
11 | 11 | ||
12 | - reg : Offset and length of the register set for this device | 12 | - reg : Offset and length of the register set for this device |
13 | - interrupts : Interrupt tuple for this device | 13 | - interrupts : Interrupt tuple for this device |
14 | |||
15 | Optional properties: | ||
16 | |||
14 | - clock-frequency : The oscillator frequency driving the flexcan device | 17 | - clock-frequency : The oscillator frequency driving the flexcan device |
15 | 18 | ||
16 | Example: | 19 | Example: |