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

Commit 86310cc4 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'linux-can-next-for-4.6-20160220' of... 

Merge tag 'linux-can-next-for-4.6-20160220' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next



Marc Kleine-Budde says:

====================
pull-request: can-next 2016-02-20

this is a pull request of 9 patch for net-next/master.

The first 3 patches are from Damien Riegel, they add support for
Technologic Systems IP core to tje sja100 driver. The next patches 6 by
Marek Vasut (including one my me) first clean sort the CAN driver's
Kconfig and Makefiles and then add support for the IFI CANFD IP core.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 9c572dc4 0c4d9c94

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

0 → 100644
+15 −0
Original line number Diff line number Diff line 
IFI CANFD controller

--------------------



Required properties:

  - compatible: Should be "ifi,canfd-1.0"

  - reg: Should contain CAN controller registers location and length

  - interrupts: Should contain IRQ line for the CAN controller



Example:



	canfd0: canfd@ff220000 {

		compatible = "ifi,canfd-1.0";

		reg = <0xff220000 0x00001000>;

		interrupts = <0 43 0>;

	};

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

+2 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ Memory mapped SJA1000 CAN controller from NXP (formerly Philips) 


Required properties:



- compatible : should be "nxp,sja1000".

- compatible : should be one of "nxp,sja1000", "technologic,sja1000".



- reg : should specify the chip select, address offset and size required

	to map the registers of the SJA1000. The size is usually 0x80.
@@ -14,6 +14,7 @@ Optional properties: 


- reg-io-width : Specify the size (in bytes) of the IO accesses that

	should be performed on the device.  Valid value is 1, 2 or 4.

	This property is ignored for technologic version.

	Default to 1 (8 bits).



- nxp,external-clock-frequency : Frequency of the external oscillator

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ hp Hewlett Packard 
i2se	I2SE GmbH

ibm	International Business Machines (IBM)

idt	Integrated Device Technologies, Inc.

ifi	Ingenieurburo Fur Ic-Technologie (I/F/I)

iom	Iomega Corporation

img	Imagination Technologies Ltd.

ingenic	Ingenic Semiconductor

drivers/net/can/Kconfig

+29 −35
Original line number Diff line number Diff line
@@ -70,13 +70,6 @@ config CAN_AT91 
	  This is a driver for the SoC CAN controller in Atmel's AT91SAM9263

	  and AT91SAM9X5 processors.



config CAN_TI_HECC

	depends on ARM

	tristate "TI High End CAN Controller"

	---help---

	  Driver for TI HECC (High End CAN Controller) module found on many

	  TI devices. The device specifications are available from www.ti.com



config CAN_BFIN

	depends on BF534 || BF536 || BF537 || BF538 || BF539 || BF54x

	tristate "Analog Devices Blackfin on-chip CAN"
@@ -86,30 +79,12 @@ config CAN_BFIN 
	  To compile this driver as a module, choose M here: the

	  module will be called bfin_can.



config CAN_JANZ_ICAN3

	tristate "Janz VMOD-ICAN3 Intelligent CAN controller"

	depends on MFD_JANZ_CMODIO

	---help---

	  Driver for Janz VMOD-ICAN3 Intelligent CAN controller module, which

	  connects to a MODULbus carrier board.



	  This driver can also be built as a module. If so, the module will be

	  called janz-ican3.ko.



config CAN_FLEXCAN

	tristate "Support for Freescale FLEXCAN based chips"

	depends on ARM || PPC

	---help---

	  Say Y here if you want to support for Freescale FlexCAN.



config PCH_CAN

	tristate "Intel EG20T PCH CAN controller"

	depends on PCI && (X86_32 || COMPILE_TEST)

	---help---

	  This driver is for PCH CAN of Topcliff (Intel EG20T PCH) which

	  is an IOH for x86 embedded processor (Intel Atom E6xx series).

	  This driver can access CAN bus.



config CAN_GRCAN

	tristate "Aeroflex Gaisler GRCAN and GRHCAN CAN devices"

	depends on OF && HAS_DMA
@@ -119,6 +94,16 @@ config CAN_GRCAN 
	  endian syntheses of the cores would need some modifications on

	  the hardware level to work.



config CAN_JANZ_ICAN3

	tristate "Janz VMOD-ICAN3 Intelligent CAN controller"

	depends on MFD_JANZ_CMODIO

	---help---

	  Driver for Janz VMOD-ICAN3 Intelligent CAN controller module, which

	  connects to a MODULbus carrier board.



	  This driver can also be built as a module. If so, the module will be

	  called janz-ican3.ko.



config CAN_RCAR

	tristate "Renesas R-Car CAN controller"

	depends on ARM
@@ -139,6 +124,13 @@ config CAN_SUN4I 
	  To compile this driver as a module, choose M here: the module will

	  be called sun4i_can.



config CAN_TI_HECC

	depends on ARM

	tristate "TI High End CAN Controller"

	---help---

	  Driver for TI HECC (High End CAN Controller) module found on many

	  TI devices. The device specifications are available from www.ti.com



config CAN_XILINXCAN

	tristate "Xilinx CAN"

	depends on ARCH_ZYNQ || ARM64 || MICROBLAZE || COMPILE_TEST
@@ -147,22 +139,24 @@ config CAN_XILINXCAN 
	  Xilinx CAN driver. This driver supports both soft AXI CAN IP and

	  Zynq CANPS IP.



source "drivers/net/can/mscan/Kconfig"



source "drivers/net/can/sja1000/Kconfig"

config PCH_CAN

	tristate "Intel EG20T PCH CAN controller"

	depends on PCI && (X86_32 || COMPILE_TEST)

	---help---

	  This driver is for PCH CAN of Topcliff (Intel EG20T PCH) which

	  is an IOH for x86 embedded processor (Intel Atom E6xx series).

	  This driver can access CAN bus.



source "drivers/net/can/c_can/Kconfig"



source "drivers/net/can/m_can/Kconfig"



source "drivers/net/can/cc770/Kconfig"



source "drivers/net/can/ifi_canfd/Kconfig"

source "drivers/net/can/m_can/Kconfig"

source "drivers/net/can/mscan/Kconfig"

source "drivers/net/can/sja1000/Kconfig"

source "drivers/net/can/softing/Kconfig"

source "drivers/net/can/spi/Kconfig"



source "drivers/net/can/usb/Kconfig"



source "drivers/net/can/softing/Kconfig"



endif



config CAN_DEBUG_DEVICES

drivers/net/can/Makefile

+9 −8
Original line number Diff line number Diff line
@@ -14,21 +14,22 @@ obj-y += spi/ 
obj-y				+= usb/

obj-y				+= softing/



obj-$(CONFIG_CAN_SJA1000)	+= sja1000/

obj-$(CONFIG_CAN_MSCAN)		+= mscan/

obj-$(CONFIG_CAN_C_CAN)		+= c_can/

obj-$(CONFIG_CAN_M_CAN)		+= m_can/

obj-$(CONFIG_CAN_CC770)		+= cc770/

obj-$(CONFIG_CAN_AT91)		+= at91_can.o

obj-$(CONFIG_CAN_TI_HECC)	+= ti_hecc.o

obj-$(CONFIG_CAN_BFIN)		+= bfin_can.o

obj-$(CONFIG_CAN_JANZ_ICAN3)	+= janz-ican3.o

obj-$(CONFIG_CAN_CC770)		+= cc770/

obj-$(CONFIG_CAN_C_CAN)		+= c_can/

obj-$(CONFIG_CAN_FLEXCAN)	+= flexcan.o

obj-$(CONFIG_PCH_CAN)		+= pch_can.o

obj-$(CONFIG_CAN_GRCAN)		+= grcan.o

obj-$(CONFIG_CAN_IFI_CANFD)	+= ifi_canfd/

obj-$(CONFIG_CAN_JANZ_ICAN3)	+= janz-ican3.o

obj-$(CONFIG_CAN_MSCAN)		+= mscan/

obj-$(CONFIG_CAN_M_CAN)		+= m_can/

obj-$(CONFIG_CAN_RCAR)		+= rcar_can.o

obj-$(CONFIG_CAN_SJA1000)	+= sja1000/

obj-$(CONFIG_CAN_SUN4I)		+= sun4i_can.o

obj-$(CONFIG_CAN_TI_HECC)	+= ti_hecc.o

obj-$(CONFIG_CAN_XILINXCAN)	+= xilinx_can.o

obj-$(CONFIG_PCH_CAN)		+= pch_can.o



subdir-ccflags-y += -D__CHECK_ENDIAN__

subdir-ccflags-$(CONFIG_CAN_DEBUG_DEVICES) += -DDEBUG