aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-07-07 16:29:29 -0700
committerDavid S. Miller <davem@davemloft.net>2012-07-07 16:29:29 -0700
commit8f961faef791f6cc8fb1d10817fa7af3efcb544e (patch)
tree0d4ecd861c575d7ebd235cea61eeea7cac034a25 /Documentation
parentasix: avoid copies in tx path (diff)
parentnet: em_canid: Ematch rule to match CAN frames according to their identifiers (diff)
downloadlinux-dev-8f961faef791f6cc8fb1d10817fa7af3efcb544e.tar.xz
linux-dev-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.txt3
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: