Skip to content

Commit

Permalink
can: xilinx CAN controller support
Browse files Browse the repository at this point in the history
This patch adds xilinx CAN controller support. This driver supports both ZYNQ
CANPS and Soft IP AXI CAN controller.

Signed-off-by: Kedareswara rao Appana <appanad@xilinx.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  • Loading branch information
Kedareswara rao Appana authored and Marc Kleine-Budde committed May 26, 2014
1 parent e649c64 commit b1201e4
Show file tree
Hide file tree
Showing 3 changed files with 1,217 additions and 0 deletions.
8 changes: 8 additions & 0 deletions drivers/net/can/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,14 @@ config CAN_RCAR
To compile this driver as a module, choose M here: the module will
be called rcar_can.

config CAN_XILINXCAN
tristate "Xilinx CAN"
depends on ARCH_ZYNQ || MICROBLAZE || COMPILE_TEST
depends on COMMON_CLK && HAS_IOMEM
---help---
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"
Expand Down
1 change: 1 addition & 0 deletions drivers/net/can/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,6 @@ obj-$(CONFIG_CAN_FLEXCAN) += flexcan.o
obj-$(CONFIG_PCH_CAN) += pch_can.o
obj-$(CONFIG_CAN_GRCAN) += grcan.o
obj-$(CONFIG_CAN_RCAR) += rcar_can.o
obj-$(CONFIG_CAN_XILINXCAN) += xilinx_can.o

ccflags-$(CONFIG_CAN_DEBUG_DEVICES) := -DDEBUG
Loading

0 comments on commit b1201e4

Please sign in to comment.