Commit e2d6e64b authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'linux-can-next-for-4.16-20180126' of... 

Merge tag 'linux-can-next-for-4.16-20180126' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next



Marc Kleine-Budde says:

====================
pull-request: can-next 2018-01-26

this is a pull request for net-next/master consisting of 3 patches.

The first two patches target the CAN documentation. The first is by me
and fixes pointer to location of fsl,mpc5200-mscan node in the mpc5200
documentation. The second patch is by Robert Schwebel and it converts
the plain ASCII documentation to restructured text.

The third patch is by Fabrizio Castro add the r8a774[35] support to the
rcar_can dt-bindings documentation.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 72a231b7 216bf2f4

Documentation/devicetree/bindings/net/can/rcar_can.txt

+5 −2
Original line number Diff line number Diff line
@@ -2,7 +2,9 @@ Renesas R-Car CAN controller Device Tree Bindings 
-------------------------------------------------



Required properties:

- compatible: "renesas,can-r8a7778" if CAN controller is a part of R8A7778 SoC.

- compatible: "renesas,can-r8a7743" if CAN controller is a part of R8A7743 SoC.

	      "renesas,can-r8a7745" if CAN controller is a part of R8A7745 SoC.

	      "renesas,can-r8a7778" if CAN controller is a part of R8A7778 SoC.

	      "renesas,can-r8a7779" if CAN controller is a part of R8A7779 SoC.

	      "renesas,can-r8a7790" if CAN controller is a part of R8A7790 SoC.

	      "renesas,can-r8a7791" if CAN controller is a part of R8A7791 SoC.
@@ -12,7 +14,8 @@ Required properties: 
	      "renesas,can-r8a7795" if CAN controller is a part of R8A7795 SoC.

	      "renesas,can-r8a7796" if CAN controller is a part of R8A7796 SoC.

	      "renesas,rcar-gen1-can" for a generic R-Car Gen1 compatible device.

	      "renesas,rcar-gen2-can" for a generic R-Car Gen2 compatible device.

	      "renesas,rcar-gen2-can" for a generic R-Car Gen2 or RZ/G1

	      compatible device.

	      "renesas,rcar-gen3-can" for a generic R-Car Gen3 compatible device.

	      When compatible with the generic version, nodes must list the

	      SoC-specific version corresponding to the platform first

Documentation/devicetree/bindings/powerpc/fsl/mpc5200.txt

+1 −1
Original line number Diff line number Diff line
@@ -195,4 +195,4 @@ External interrupts: 


fsl,mpc5200-mscan nodes

-----------------------

See file can.txt in this directory.
 
See file Documentation/devicetree/bindings/powerpc/fsl/mpc5200.txt

Documentation/networking/00-INDEX

+0 −2
Original line number Diff line number Diff line
@@ -36,8 +36,6 @@ bonding.txt 
	- Linux Ethernet Bonding Driver HOWTO: link aggregation in Linux.

bridge.txt

	- where to get user space programs for ethernet bridging with Linux.

can.txt

	- documentation on CAN protocol family.

cdc_mbim.txt

	- 3G/LTE USB modem (Mobile Broadband Interface Model)

checksum-offloads.txt

Documentation/networking/can.txt→Documentation/networking/can.rst

+1437 −0

File changed and moved.

Preview size limit exceeded, changes collapsed.

Documentation/networking/index.rst

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ Contents: 
   :maxdepth: 2



   batman-adv

   can

   kapi

   z8530book

   msg_zerocopy

CRA Git | Maintained and supported by SUSTech CRA and CCSE