-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'linux-can-next-for-5.4-20190724' of git://git.kernel.org/p…
…ub/scm/linux/kernel/git/mkl/linux-can-next Marc Kleine-Budde says: ==================== pull-request: can-next 2019-07-24 this is a pull request for net-next/master consisting of 26 patches. The first two patches are by me. One adds missing files of the CAN subsystem to the MAINTAINERS file, while the other sorts the Makefile/Kconfig of the sja1000 drivers sub directory. In the next patch Ji-Ze Hong (Peter Hong) provides a driver for the "Fintek PCIE to 2 CAN" controller, based on the the sja1000 IP core. Gustavo A. R. Silva's patch for the kvaser_usb driver introduces the use of struct_size() instead of open coding it. Henning Colliander's patch adds a driver for the "Kvaser PCIEcan" devices. Another patch by Gustavo A. R. Silva marks expected switch fall-throughs properly. Dan Murphy provides 5 patches for the m_can. After cleanups a framework is introduced so that the driver can be used from memory mapped IO as well as SPI attached devices. Finally he adds a driver for the tcan4x5x which uses this framework. A series of 5 patches by Appana Durga Kedareswara rao for the xilinx_can driver, first clean up,then add support for CANFD. Colin Ian King contributes another cleanup for the xilinx_can driver. Robert P. J. Day's patch corrects the brief history of the CAN protocol given in the Kconfig menu entry. 2 patches by Dong Aisheng for the flexcan driver provide PE clock source select support and dt-bindings description. 2 patches by Sean Nyekjaer for the flexcan driver provide add CAN wakeup-source property and dt-bindings description. Jeroen Hofstee's patch converts the ti_hecc driver to make use of the rx-offload helper fixing a number of outstanding bugs. The first patch of Oliver Hartkopp removes the now obsolete empty ioctl() handler for the CAN protocols. The second patch adds SPDX license identifiers for CAN subsystem. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
- Loading branch information
Showing
32 changed files
with
4,098 additions
and
800 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
Texas Instruments TCAN4x5x CAN Controller | ||
================================================ | ||
|
||
This file provides device node information for the TCAN4x5x interface contains. | ||
|
||
Required properties: | ||
- compatible: "ti,tcan4x5x" | ||
- reg: 0 | ||
- #address-cells: 1 | ||
- #size-cells: 0 | ||
- spi-max-frequency: Maximum frequency of the SPI bus the chip can | ||
operate at should be less than or equal to 18 MHz. | ||
- data-ready-gpios: Interrupt GPIO for data and error reporting. | ||
- device-wake-gpios: Wake up GPIO to wake up the TCAN device. | ||
|
||
See Documentation/devicetree/bindings/net/can/m_can.txt for additional | ||
required property details. | ||
|
||
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. | ||
|
||
Example: | ||
tcan4x5x: tcan4x5x@0 { | ||
compatible = "ti,tcan4x5x"; | ||
reg = <0>; | ||
#address-cells = <1>; | ||
#size-cells = <1>; | ||
spi-max-frequency = <10000000>; | ||
bosch,mram-cfg = <0x0 0 0 32 0 0 1 1>; | ||
data-ready-gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; | ||
device-state-gpios = <&gpio3 21 GPIO_ACTIVE_HIGH>; | ||
device-wake-gpios = <&gpio1 15 GPIO_ACTIVE_HIGH>; | ||
reset-gpios = <&gpio1 27 GPIO_ACTIVE_LOW>; | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.