diff options
| author | David S. Miller <davem@davemloft.net> | 2023-08-04 08:46:07 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2023-08-04 08:46:07 +0100 |
| commit | f702dbbb9fc25de45d9d0fc2572f62b4b22cef16 (patch) | |
| tree | fdd9302b7d1ee0c9f4c8dab4db2909211a4c04c3 /Documentation | |
| parent | 992725ff32f534eaa13adfa37f933d4fbf1aa040 (diff) | |
| parent | 806e95aee5440a9fbe155c3822e1422ba6a90478 (diff) | |
| download | linux-stable-f702dbbb9fc25de45d9d0fc2572f62b4b22cef16.tar.gz linux-stable-f702dbbb9fc25de45d9d0fc2572f62b4b22cef16.tar.bz2 linux-stable-f702dbbb9fc25de45d9d0fc2572f62b4b22cef16.zip | |
Merge tag 'linux-can-next-for-6.6-20230803' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next
Marc Kleine-Budde says:
====================
pull-request: can-next 2023-08-03
This is a pull request of 9 patches for net-next/master.
The 1st patch is by Ruan Jinjie, targets the flexcan driver, and
cleans up the error handling of platform_get_irq() in the
flexcan_probe() function.
Markus Schneider-Pargmann contributes 6 patches for the tcan4x5x M_CAN
driver, consisting of some cleanups, and adding support for the
tcan4552/4553 chips.
Another patch by Ruan Jinjie, that cleans up the error path of
platform_get_irq() in the c_can_plat_probe() function of the C_CAN
platform driver.
The last patch is by Frank Jungclaus and adds support for the
CAN-USB/3 and CAN FD to the ESD USB CAN driver.
================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/net/can/tcan4x5x.txt | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/Documentation/devicetree/bindings/net/can/tcan4x5x.txt b/Documentation/devicetree/bindings/net/can/tcan4x5x.txt index e3501bfa22e9..170e23f0610d 100644 --- a/Documentation/devicetree/bindings/net/can/tcan4x5x.txt +++ b/Documentation/devicetree/bindings/net/can/tcan4x5x.txt @@ -4,7 +4,10 @@ Texas Instruments TCAN4x5x CAN Controller This file provides device node information for the TCAN4x5x interface contains. Required properties: - - compatible: "ti,tcan4x5x" + - compatible: + "ti,tcan4552", "ti,tcan4x5x" + "ti,tcan4553", "ti,tcan4x5x" or + "ti,tcan4x5x" - reg: 0 - #address-cells: 1 - #size-cells: 0 @@ -21,8 +24,10 @@ Optional properties: - reset-gpios: Hardwired output GPIO. If not defined then software reset. - device-state-gpios: Input GPIO that indicates if the device is in - a sleep state or if the device is active. - - device-wake-gpios: Wake up GPIO to wake up the TCAN device. + a sleep state or if the device is active. Not + available with tcan4552/4553. + - device-wake-gpios: Wake up GPIO to wake up the TCAN device. Not + available with tcan4552/4553. Example: tcan4x5x: tcan4x5x@0 { |