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

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";

	};

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

	  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

	tristate "Xilinx CAN"

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

obj-$(CONFIG_PCH_CAN)		+= pch_can.o

obj-$(CONFIG_CAN_GRCAN)		+= grcan.o

obj-$(CONFIG_CAN_RCAR)		+= rcar_can.o

obj-$(CONFIG_CAN_SUN4I)		+= sun4i_can.o

obj-$(CONFIG_CAN_XILINXCAN)	+= xilinx_can.o

subdir-ccflags-y += -D__CHECK_ENDIAN__