Commit 8f5e71b9 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'linux-can-next-for-5.10-20201007' of... 

Merge tag 'linux-can-next-for-5.10-20201007' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next



Marc Kleine-Budde says:

====================
linux-can-next-for-5.10-20201007

The first 3 patches are by me and fix several warnings found
when compiling the  kernel with W=1.

Lukas Bulwahn's patch adjusts the MAINTAINERS file, to accommodate
the renaming of the mcp251xfd driver.

Vincent Mailhol contributes 3 patches for the CAN networking layer.
First error queue support is added the the CAN RAW protocol.
The second patch converts the get_can_dlc() and get_canfd_dlc()
in-Kernel-only macros from using __u8 to u8.
The third patch adds a helper function to calculate the length of
one bit in in multiple of time quanta.

Oliver Hartkopp's patch add support for the ISO 15765-2:2016
transport protocol to the CAN stack.

Three patches by Lad Prabhakar add documentation for various
new rcar controllers to the device tree bindings of the rcar_can
and rcan_canfd driver.

Michael Walle's patch adds various processors to the flexcan
driver binding documentation.

The next two patches are by me and target the flexcan driver aswell.
The remove the ack_grp and ack_bit from the fsl,stop-mode DT property
and the driver, as they are not used anymore. As these are the last
two arguments this change will not break existing device trees.

The last three patches are by Srinivas Neeli and target
the xilinx_can driver.
The first one increases the lower limit for the bit rate
prescaler to 2, the other two fix sparse and coverity findings.
====================

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 3b8f56ee 164ab90d

Documentation/devicetree/bindings/net/can/fsl-flexcan.txt

+7 −3
Original line number Diff line number Diff line
@@ -4,6 +4,12 @@ Required properties: 


- compatible : Should be "fsl,<processor>-flexcan"



  where <processor> is imx8qm, imx6q, imx28, imx53, imx35, imx25, p1010,

  vf610, ls1021ar2, lx2160ar1, ls1028ar1.



  The ls1028ar1 must be followed by lx2160ar1, e.g.

   - "fsl,ls1028ar1-flexcan", "fsl,lx2160ar1-flexcan"



  An implementation should also claim any of the following compatibles

  that it is fully backwards compatible with:
@@ -25,12 +31,10 @@ Optional properties: 
              endian.



- fsl,stop-mode: register bits of stop mode control, the format is

		 <&gpr req_gpr req_bit ack_gpr ack_bit>.

		 <&gpr req_gpr req_bit>.

		 gpr is the phandle to general purpose register node.

		 req_gpr is the gpr register offset of CAN stop request.

		 req_bit is the bit offset of CAN stop request.

		 ack_gpr is the gpr register offset of CAN stop acknowledge.

		 ack_bit is the bit offset of CAN stop acknowledge.



- fsl,clk-source: Select the clock source to the CAN Protocol Engine (PE).

		  It's SoC Implementation dependent. Refer to RM for detailed

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

+5 −3
Original line number Diff line number Diff line
@@ -2,13 +2,15 @@ Renesas R-Car CAN controller Device Tree Bindings 
-------------------------------------------------



Required properties:

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

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

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

	      "renesas,can-r8a7744" if CAN controller is a part of R8A7744 SoC.

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

	      "renesas,can-r8a77470" if CAN controller is a part of R8A77470 SoC.

	      "renesas,can-r8a774a1" if CAN controller is a part of R8A774A1 SoC.

	      "renesas,can-r8a774b1" if CAN controller is a part of R8A774B1 SoC.

	      "renesas,can-r8a774c0" if CAN controller is a part of R8A774C0 SoC.

	      "renesas,can-r8a774e1" if CAN controller is a part of R8A774E1 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.
@@ -37,8 +39,8 @@ Required properties: 
- pinctrl-0: pin control group to be used for this controller.

- pinctrl-names: must be "default".



Required properties for R8A774A1, R8A774B1, R8A774C0, R8A7795, R8A7796,

R8A77965, R8A77990, and R8A77995:

Required properties for R8A774A1, R8A774B1, R8A774C0, R8A774E1, R8A7795,

R8A7796, R8A77965, R8A77990, and R8A77995:

For the denoted SoCs, "clkp2" can be CANFD clock. This is a div6 clock and can

be used by both CAN and CAN FD controller at the same time. It needs to be

scaled to maximum frequency if any of these controllers use it. This is done

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

+3 −2
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ Required properties: 
  - "renesas,r8a774a1-canfd" for R8A774A1 (RZ/G2M) compatible controller.

  - "renesas,r8a774b1-canfd" for R8A774B1 (RZ/G2N) compatible controller.

  - "renesas,r8a774c0-canfd" for R8A774C0 (RZ/G2E) compatible controller.

  - "renesas,r8a774e1-canfd" for R8A774E1 (RZ/G2H) compatible controller.

  - "renesas,r8a7795-canfd" for R8A7795 (R-Car H3) compatible controller.

  - "renesas,r8a7796-canfd" for R8A7796 (R-Car M3-W) compatible controller.

  - "renesas,r8a77965-canfd" for R8A77965 (R-Car M3-N) compatible controller.
@@ -32,8 +33,8 @@ The name of the child nodes are "channel0" and "channel1" respectively. Each 
child node supports the "status" property only, which is used to

enable/disable the respective channel.



Required properties for R8A774A1, R8A774B1, R8A774C0, R8A7795, R8A7796,

R8A77965, R8A77990, and R8A77995:

Required properties for R8A774A1, R8A774B1, R8A774C0, R8A774E1, R8A7795,

R8A7796, R8A77965, R8A77990, and R8A77995:

In the denoted SoCs, canfd clock is a div6 clock and can be used by both CAN

and CAN FD controller at the same time. It needs to be scaled to maximum

frequency if any of these controllers use it. This is done using the below

MAINTAINERS

+4 −3
Original line number Diff line number Diff line
@@ -3917,6 +3917,7 @@ F: include/net/netns/can.h 
F:	include/uapi/linux/can.h

F:	include/uapi/linux/can/bcm.h

F:	include/uapi/linux/can/gw.h

F:	include/uapi/linux/can/isotp.h

F:	include/uapi/linux/can/raw.h

F:	net/can/








@@ -10680,14 +10681,14 @@ L:	linux-input@vger.kernel.org







S:	Maintained









F:	drivers/hid/hid-mcp2221.c

















MCP25XXFD SPI-CAN NETWORK DRIVER









MCP251XFD SPI-CAN NETWORK DRIVER









M:	Marc Kleine-Budde <mkl@pengutronix.de>









M:	Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>









R:	Thomas Kopp <thomas.kopp@microchip.com>









L:	linux-can@vger.kernel.org









S:	Maintained









F:	Documentation/devicetree/bindings/net/can/microchip,mcp25xxfd.yaml









F:	drivers/net/can/spi/mcp25xxfd/









F:	Documentation/devicetree/bindings/net/can/microchip,mcp251xfd.yaml









F:	drivers/net/can/spi/mcp251xfd/

















MCP4018 AND MCP4531 MICROCHIP DIGITAL POTENTIOMETER DRIVERS









M:	Peter Rosin <peda@axentia.se>
































drivers/net/can/c_can/c_can.h



+2
−2






























Original line number
Diff line number
Diff line







@@ -81,7 +81,7 @@ enum reg {







	C_CAN_FUNCTION_REG,









};



















static const u16 reg_map_c_can[] = {









static const u16 __maybe_unused reg_map_c_can[] = {









	[C_CAN_CTRL_REG]	= 0x00,









	[C_CAN_STS_REG]		= 0x02,









	[C_CAN_ERR_CNT_REG]	= 0x04,








@@ -121,7 +121,7 @@ static const u16 reg_map_c_can[] = {







	[C_CAN_MSGVAL2_REG]	= 0xB2,









};



















static const u16 reg_map_d_can[] = {









static const u16 __maybe_unused reg_map_d_can[] = {









	[C_CAN_CTRL_REG]	= 0x00,









	[C_CAN_CTRL_EX_REG]	= 0x02,









	[C_CAN_STS_REG]		= 0x04,








































































CRA Git | Maintained and supported by SUSTech CRA and CCSE