Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18148f09 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'linux-can-next-for-4.13-20170404' of... 

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: default avatarDavid S. Miller <davem@davemloft.net>
parents af0e5461 57e83fb9

Documentation/devicetree/bindings/net/can/holt_hi311x.txt

0 → 100644
+24 −0
Original line number Diff line number Diff line 
* 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 = <&reg5v0>;

		xceiver-supply = <&reg5v0>;

	};

Documentation/devicetree/bindings/net/can/ti_hecc.txt

0 → 100644
+32 −0
Original line number Diff line number Diff line 
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>;

	};

drivers/net/can/spi/Kconfig

+6 −0
Original line number Diff line number Diff line 
menu "CAN SPI interfaces"

	depends on SPI



config CAN_HI311X

	tristate "Holt HI311x SPI CAN controllers"

	depends on CAN_DEV && SPI && HAS_DMA

	---help---

	  Driver for the Holt HI311x SPI CAN controllers.



config CAN_MCP251X

	tristate "Microchip MCP251x SPI CAN controllers"

	depends on HAS_DMA

drivers/net/can/spi/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -3,4 +3,5 @@ 
#





obj-$(CONFIG_CAN_HI311X)	+= hi311x.o

obj-$(CONFIG_CAN_MCP251X)	+= mcp251x.o

drivers/net/can/spi/hi311x.c

0 → 100644
+1076 −0

File added.

Preview size limit exceeded, changes collapsed.