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

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

Merge tag 'linux-can-next-for-4.4-20150917' of... 

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



Marc Kleine-Budde says:

====================
pull-request: can-next 2015-09-17

this is a pull request of two patches for net-next/master.

Gerhard Bertelsmann adds support for the CAN controller found on the
Allwinner A10/A20 SoC.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 22a3f9a2 0738eff1

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

0 → 100644
+36 −0
Original line number Original line Diff line number Diff line 
Allwinner A10/A20 CAN controller Device Tree Bindings

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



Required properties:

- compatible: "allwinner,sun4i-a10-can"

- reg: physical base address and size of the Allwinner A10/A20 CAN register map.

- interrupts: interrupt specifier for the sole interrupt.

- clock: phandle and clock specifier.



Example

-------



SoC common .dtsi file:



	can0_pins_a: can0@0 {

		allwinner,pins = "PH20","PH21";

		allwinner,function = "can";

		allwinner,drive = <0>;

		allwinner,pull = <0>;

	};

...

	can0: can@01c2bc00 {

		compatible = "allwinner,sun4i-a10-can";

		reg = <0x01c2bc00 0x400>;

		interrupts = <0 26 4>;

		clocks = <&apb1_gates 4>;

		status = "disabled";

	};



Board specific .dts file:



	can0: can@01c2bc00 {

		pinctrl-names = "default";

		pinctrl-0 = <&can0_pins_a>;

		status = "okay";

	};

drivers/net/can/Kconfig

+10 −0
Original line number Original line Diff line number Diff line
@@ -129,6 +129,16 @@ config CAN_RCAR 
	  To compile this driver as a module, choose M here: the module will

	  To compile this driver as a module, choose M here: the module will

	  be called rcar_can.

	  be called rcar_can.





config CAN_SUN4I

	tristate "Allwinner A10 CAN controller"

	depends on MACH_SUN4I || MACH_SUN7I || COMPILE_TEST

	---help---

	  Say Y here if you want to use CAN controller found on Allwinner

	  A10/A20 SoCs.



	  To compile this driver as a module, choose M here: the module will

	  be called sun4i_can.



config CAN_XILINXCAN

config CAN_XILINXCAN

	tristate "Xilinx CAN"

	tristate "Xilinx CAN"

	depends on ARCH_ZYNQ || ARM64 || MICROBLAZE || COMPILE_TEST

	depends on ARCH_ZYNQ || ARM64 || MICROBLAZE || COMPILE_TEST

drivers/net/can/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -27,6 +27,7 @@ obj-$(CONFIG_CAN_FLEXCAN) += flexcan.o 
obj-$(CONFIG_PCH_CAN)		+= pch_can.o

obj-$(CONFIG_PCH_CAN)		+= pch_can.o

obj-$(CONFIG_CAN_GRCAN)		+= grcan.o

obj-$(CONFIG_CAN_GRCAN)		+= grcan.o

obj-$(CONFIG_CAN_RCAR)		+= rcar_can.o

obj-$(CONFIG_CAN_RCAR)		+= rcar_can.o

obj-$(CONFIG_CAN_SUN4I)		+= sun4i_can.o

obj-$(CONFIG_CAN_XILINXCAN)	+= xilinx_can.o

obj-$(CONFIG_CAN_XILINXCAN)	+= xilinx_can.o





subdir-ccflags-y += -D__CHECK_ENDIAN__

subdir-ccflags-y += -D__CHECK_ENDIAN__

drivers/net/can/sun4i_can.c

0 → 100644
+857 −0

File added.

Preview size limit exceeded, changes collapsed.