diff options
author | David S. Miller <davem@davemloft.net> | 2012-07-08 01:29:29 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-07-08 01:29:29 +0200 |
commit | 8f961faef791f6cc8fb1d10817fa7af3efcb544e (patch) | |
tree | 0d4ecd861c575d7ebd235cea61eeea7cac034a25 /Documentation | |
parent | asix: avoid copies in tx path (diff) | |
parent | net: em_canid: Ematch rule to match CAN frames according to their identifiers (diff) | |
download | linux-8f961faef791f6cc8fb1d10817fa7af3efcb544e.tar.xz linux-8f961faef791f6cc8fb1d10817fa7af3efcb544e.zip |
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: - reg : Offset and length of the register set for this device - interrupts : Interrupt tuple for this device + +Optional properties: + - clock-frequency : The oscillator frequency driving the flexcan device Example: |