Skip to content

Commit 85ef87b

Browse files
committed
Merge tag 'linux-can-next-for-5.19-20220419' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next
Marc Kleine-Budde says: ==================== pull-request: can-next 2022-04-19 this is a pull request of 17 patches for net-next/master. The first 2 patches are by me and target the CAN driver infrastructure. One patch renames a function in the rx_offload helper the other one updates the CAN bitrate calculation to prefer small bit rate pre-scalers over larger ones, which is encouraged by the CAN in Automation. Kris Bahnsen contributes a patch to fix the links to Technologic Systems web resources in the sja1000 driver. Christophe Leroy's patch prepares the mpc5xxx_can driver for upcoming powerpc header cleanup. Minghao Chi's patch converts the flexcan driver to use pm_runtime_resume_and_get(). The next 2 patches target the Xilinx CAN driver. Lukas Bulwahn's patch fixes an entry in the MAINTAINERS file. A patch by me marks the bit timing constants as const. Wolfram Sang's patch documents r8a77961 support on the renesas,rcar-canfd bindings document. The next 2 patches are by me and add support for the mcp251863 chip to the mcp251xfd driver. The last 7 patches are by Pavel Pisa, Martin Jerabek et al. and add the ctucanfd driver for the CTU CAN FD IP Core. ==================== Signed-off-by: David S. Miller <[email protected]>
2 parents c1f6f1e + cfdb2f3 commit 85ef87b

30 files changed

+3382
-47
lines changed
Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/net/can/ctu,ctucanfd.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: CTU CAN FD Open-source IP Core Device Tree Bindings
8+
9+
description: |
10+
Open-source CAN FD IP core developed at the Czech Technical University in Prague
11+
12+
The core sources and documentation on project page
13+
[1] sources : https://gitlab.fel.cvut.cz/canbus/ctucanfd_ip_core
14+
[2] datasheet : https://canbus.pages.fel.cvut.cz/ctucanfd_ip_core/doc/Datasheet.pdf
15+
16+
Integration in Xilinx Zynq SoC based system together with
17+
OpenCores SJA1000 compatible controllers
18+
[3] project : https://gitlab.fel.cvut.cz/canbus/zynq/zynq-can-sja1000-top
19+
Martin Jerabek dimploma thesis with integration and testing
20+
framework description
21+
[4] PDF : https://dspace.cvut.cz/bitstream/handle/10467/80366/F3-DP-2019-Jerabek-Martin-Jerabek-thesis-2019-canfd.pdf
22+
23+
maintainers:
24+
- Pavel Pisa <[email protected]>
25+
- Ondrej Ille <[email protected]>
26+
- Martin Jerabek <[email protected]>
27+
28+
properties:
29+
compatible:
30+
oneOf:
31+
- items:
32+
- const: ctu,ctucanfd-2
33+
- const: ctu,ctucanfd
34+
- const: ctu,ctucanfd
35+
36+
reg:
37+
maxItems: 1
38+
39+
interrupts:
40+
maxItems: 1
41+
42+
clocks:
43+
description: |
44+
phandle of reference clock (100 MHz is appropriate
45+
for FPGA implementation on Zynq-7000 system).
46+
maxItems: 1
47+
48+
required:
49+
- compatible
50+
- reg
51+
- interrupts
52+
- clocks
53+
54+
additionalProperties: false
55+
56+
examples:
57+
- |
58+
ctu_can_fd_0: can@43c30000 {
59+
compatible = "ctu,ctucanfd";
60+
interrupts = <0 30 4>;
61+
clocks = <&clkc 15>;
62+
reg = <0x43c30000 0x10000>;
63+
};

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

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ $id: http://devicetree.org/schemas/net/can/microchip,mcp251xfd.yaml#
55
$schema: http://devicetree.org/meta-schemas/core.yaml#
66

77
title:
8-
Microchip MCP2517FD and MCP2518FD stand-alone CAN controller device tree
9-
bindings
8+
Microchip MCP2517FD, MCP2518FD and MCP251863 stand-alone CAN
9+
controller device tree bindings
1010

1111
maintainers:
1212
- Marc Kleine-Budde <[email protected]>
@@ -17,13 +17,14 @@ allOf:
1717
properties:
1818
compatible:
1919
oneOf:
20-
- const: microchip,mcp2517fd
21-
description: for MCP2517FD
22-
- const: microchip,mcp2518fd
23-
description: for MCP2518FD
24-
- const: microchip,mcp251xfd
25-
description: to autodetect chip variant
26-
20+
- enum:
21+
- microchip,mcp2517fd
22+
- microchip,mcp2518fd
23+
- microchip,mcp251xfd
24+
- items:
25+
- enum:
26+
- microchip,mcp251863
27+
- const: microchip,mcp2518fd
2728
reg:
2829
maxItems: 1
2930

Documentation/devicetree/bindings/net/can/renesas,rcar-canfd.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ properties:
2323
- renesas,r8a774e1-canfd # RZ/G2H
2424
- renesas,r8a7795-canfd # R-Car H3
2525
- renesas,r8a7796-canfd # R-Car M3-W
26+
- renesas,r8a77961-canfd # R-Car M3-W+
2627
- renesas,r8a77965-canfd # R-Car M3-N
2728
- renesas,r8a77970-canfd # R-Car V3M
2829
- renesas,r8a77980-canfd # R-Car V3H

Documentation/devicetree/bindings/vendor-prefixes.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -283,6 +283,8 @@ patternProperties:
283283
description: Shenzen Chuangsiqi Technology Co.,Ltd.
284284
"^ctera,.*":
285285
description: CTERA Networks Intl.
286+
"^ctu,.*":
287+
description: Czech Technical University in Prague
286288
"^cubietech,.*":
287289
description: Cubietech, Ltd.
288290
"^cui,.*":

0 commit comments

Comments
 (0)