diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2024-06-20 11:53:54 +0200 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2024-06-20 11:53:54 +0200 |
| commit | 20e69650d51f20e430d5b46d53bb48248b4c66ca (patch) | |
| tree | d4f4400b46f910ea30d87201ef2f5c5f7c8ead68 | |
| parent | ba63a7e08523be3496cc1b7e5f77d306144a3a40 (diff) | |
| parent | e562bad35fe38af22437caea9bdf911ff59cf56b (diff) | |
| download | lwn-20e69650d51f20e430d5b46d53bb48248b4c66ca.tar.gz lwn-20e69650d51f20e430d5b46d53bb48248b4c66ca.zip | |
Merge patch series "can: xilinx_can: Document driver description to list all supported IPs"
Harini T <harini.t@amd.com> says:
Xilinx CAN driver supports AXI CAN, AXI CANFD, CANPS and CANFD PS IPs.
1. Modify the dt-bindings title to indicate that both controllers are
supported.
2. Document all supported IPs in driver comment description.
Link: https://lore.kernel.org/all/20240503060553.8520-1-harini.t@amd.com
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
| -rw-r--r-- | Documentation/devicetree/bindings/net/can/xilinx,can.yaml | 2 | ||||
| -rw-r--r-- | drivers/net/can/xilinx_can.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/net/can/xilinx,can.yaml b/Documentation/devicetree/bindings/net/can/xilinx,can.yaml index 8d4e5af6fd6c..40835497050a 100644 --- a/Documentation/devicetree/bindings/net/can/xilinx,can.yaml +++ b/Documentation/devicetree/bindings/net/can/xilinx,can.yaml @@ -5,7 +5,7 @@ $id: http://devicetree.org/schemas/net/can/xilinx,can.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# title: - Xilinx Axi CAN/Zynq CANPS controller + Xilinx CAN and CANFD controller maintainers: - Appana Durga Kedareswara rao <appana.durga.rao@xilinx.com> diff --git a/drivers/net/can/xilinx_can.c b/drivers/net/can/xilinx_can.c index fae0120473f8..d944911d7f05 100644 --- a/drivers/net/can/xilinx_can.c +++ b/drivers/net/can/xilinx_can.c @@ -6,7 +6,7 @@ * Copyright (C) 2017 - 2018 Sandvik Mining and Construction Oy * * Description: - * This driver is developed for Axi CAN IP and for Zynq CANPS Controller. + * This driver is developed for AXI CAN IP, AXI CANFD IP, CANPS and CANFD PS Controller. */ #include <linux/bitfield.h> |