Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[linux.git] / Documentation / devicetree / bindings / net / can / xilinx_can.txt

diff --git a/Documentation/devicetree/bindings/net/can/xilinx_can.txt b/Documentation/devicetree/bindings/net/can/xilinx_can.txt
index 9264d2f6a89d698aa28f90dd116266b5fc864800..060e2d46bad961d870467f6e86482a1714b58e45 100644 (file)
--- a/Documentation/devicetree/bindings/net/can/xilinx_can.txt
+++ b/Documentation/devicetree/bindings/net/can/xilinx_can.txt
@@ -2,19 +2,25 @@ Xilinx Axi CAN/Zynq CANPS controller Device Tree Bindings
 ---------------------------------------------------------
 
 Required properties:
-- compatible           : Should be "xlnx,zynq-can-1.0" for Zynq CAN
-                         controllers and "xlnx,axi-can-1.00.a" for Axi CAN
-                         controllers.
-- reg                  : Physical base address and size of the Axi CAN/Zynq
-                         CANPS registers map.
+- compatible           : Should be:
+                         - "xlnx,zynq-can-1.0" for Zynq CAN controllers
+                         - "xlnx,axi-can-1.00.a" for Axi CAN controllers
+                         - "xlnx,canfd-1.0" for CAN FD controllers
+- reg                  : Physical base address and size of the controller
+                         registers map.
 - interrupts           : Property with a value describing the interrupt
                          number.
-- clock-names          : List of input clock names - "can_clk", "pclk"
-                         (For CANPS), "can_clk" , "s_axi_aclk"(For AXI CAN)
+- clock-names          : List of input clock names
+                         - "can_clk", "pclk" (For CANPS),
+                         - "can_clk", "s_axi_aclk" (For AXI CAN and CAN FD).
                          (See clock bindings for details).
 - clocks               : Clock phandles (see clock bindings for details).
-- tx-fifo-depth                : Can Tx fifo depth.
-- rx-fifo-depth                : Can Rx fifo depth.
+- tx-fifo-depth                : Can Tx fifo depth (Zynq, Axi CAN).
+- rx-fifo-depth                : Can Rx fifo depth (Zynq, Axi CAN, CAN FD in
+                          sequential Rx mode).
+- tx-mailbox-count     : Can Tx mailbox buffer count (CAN FD).
+- rx-mailbox-count     : Can Rx mailbox buffer count (CAN FD in mailbox Rx
+                         mode).
 
 
 Example:
@@ -41,3 +47,14 @@ For Axi CAN Dts file:
                        tx-fifo-depth = <0x40>;
                        rx-fifo-depth = <0x40>;
                };
+For CAN FD Dts file:
+       canfd_0: canfd@40000000 {
+                       compatible = "xlnx,canfd-1.0";
+                       clocks = <&clkc 0>, <&clkc 1>;
+                       clock-names = "can_clk", "s_axi_aclk";
+                       reg = <0x40000000 0x2000>;
+                       interrupt-parent = <&intc>;
+                       interrupts = <0 59 1>;
+                       tx-mailbox-count = <0x20>;
+                       rx-fifo-depth = <0x20>;
+               };