forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 9
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-4.13-20170404' of git://git.kernel.org/…
…pub/scm/linux/kernel/git/mkl/linux-can-next Marc Kleine-Budde says: ==================== pull-request: can-next 2017-03-03 this is a pull request of 5 patches for net-next/master. There are two patches by Yegor Yefremov which convert the ti_hecc driver into a DT only driver, as there is no in-tree user of the old platform driver interface anymore. The next patch by Mario Kicherer adds network namespace support to the can subsystem. The last two patches by Akshay Bhat add support for the holt_hi311x SPI CAN driver. ==================== Signed-off-by: David S. Miller <[email protected]>
- Loading branch information
Showing
16 changed files
with
1,469 additions
and
305 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
* Holt HI-311X stand-alone CAN controller device tree bindings | ||
|
||
Required properties: | ||
- compatible: Should be one of the following: | ||
- "holt,hi3110" for HI-3110 | ||
- reg: SPI chip select. | ||
- clocks: The clock feeding the CAN controller. | ||
- interrupt-parent: The parent interrupt controller. | ||
- interrupts: Should contain IRQ line for the CAN controller. | ||
|
||
Optional properties: | ||
- vdd-supply: Regulator that powers the CAN controller. | ||
- xceiver-supply: Regulator that powers the CAN transceiver. | ||
|
||
Example: | ||
can0: can@1 { | ||
compatible = "holt,hi3110"; | ||
reg = <1>; | ||
clocks = <&clk32m>; | ||
interrupt-parent = <&gpio4>; | ||
interrupts = <13 IRQ_TYPE_EDGE_RISING>; | ||
vdd-supply = <®5v0>; | ||
xceiver-supply = <®5v0>; | ||
}; |
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,32 @@ | ||
Texas Instruments High End CAN Controller (HECC) | ||
================================================ | ||
|
||
This file provides information, what the device node | ||
for the hecc interface contains. | ||
|
||
Required properties: | ||
- compatible: "ti,am3517-hecc" | ||
- reg: addresses and lengths of the register spaces for 'hecc', 'hecc-ram' | ||
and 'mbx' | ||
- reg-names :"hecc", "hecc-ram", "mbx" | ||
- interrupts: interrupt mapping for the hecc interrupts sources | ||
- clocks: clock phandles (see clock bindings for details) | ||
|
||
Optional properties: | ||
- ti,use-hecc1int: if provided configures HECC to produce all interrupts | ||
on HECC1INT interrupt line. By default HECC0INT interrupt | ||
line will be used. | ||
- xceiver-supply: regulator that powers the CAN transceiver | ||
|
||
Example: | ||
|
||
For am3517evm board: | ||
hecc: can@5c050000 { | ||
compatible = "ti,am3517-hecc"; | ||
reg = <0x5c050000 0x80>, | ||
<0x5c053000 0x180>, | ||
<0x5c052000 0x200>; | ||
reg-names = "hecc", "hecc-ram", "mbx"; | ||
interrupts = <24>; | ||
clocks = <&hecc_ck>; | ||
}; |
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 |
---|---|---|
|
@@ -3,4 +3,5 @@ | |
# | ||
|
||
|
||
obj-$(CONFIG_CAN_HI311X) += hi311x.o | ||
obj-$(CONFIG_CAN_MCP251X) += mcp251x.o |
Oops, something went wrong.