diff options
| author | David S. Miller <davem@davemloft.net> | 2016-06-18 07:22:06 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-06-18 07:22:06 +0200 |
| commit | 6762ef35e02f602bb5f5a5fad4df639db649088d (patch) | |
| tree | 135a46f555a347054a7b91addc4c609670e2b1b6 /drivers/net/can/rcar/Kconfig | |
| parent | Merge branch 'cpsw-delete-rx_descs' (diff) | |
| parent | can: rcar_can: Move Renesas CAN driver to rcar dir (diff) | |
| download | linux-6762ef35e02f602bb5f5a5fad4df639db649088d.tar.xz linux-6762ef35e02f602bb5f5a5fad4df639db649088d.zip | |
Merge tag 'linux-can-next-for-4.8-20160617' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next
Marc Kleine-Budde says:
====================
pull-request: can-next 2016-06-17
this is a pull request of 14 patches for net-next/master.
Geert Uytterhoeven contributes a patch that adds a file patterns for
CAN device tree bindings to MAINTAINERS. A patch by Alexander Aring
fixes warnings when building without proc support. A patch by me
improves the sample point calculation. Marek Vasut's patch converts
the slcan driver to use CAN_MTU. A patch by William Breathitt Gray
converts the tscan1 driver to use module_isa_driver.
Two patches by Maximilian Schneider for the gs_usb driver fix coding
style and add support for set_phys_id callback. 5 patches by Oliver
Hartkopp add support for CANFD to the bcm. And finally two patches
by Ramesh Shanmugasundaram, which add support for the rcar_canfd
driver.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/can/rcar/Kconfig')
| -rw-r--r-- | drivers/net/can/rcar/Kconfig | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/drivers/net/can/rcar/Kconfig b/drivers/net/can/rcar/Kconfig new file mode 100644 index 000000000000..7b03a3a37db7 --- /dev/null +++ b/drivers/net/can/rcar/Kconfig @@ -0,0 +1,21 @@ +config CAN_RCAR + tristate "Renesas R-Car CAN controller" + depends on ARCH_RENESAS || ARM + ---help--- + Say Y here if you want to use CAN controller found on Renesas R-Car + SoCs. + + To compile this driver as a module, choose M here: the module will + be called rcar_can. + +config CAN_RCAR_CANFD + tristate "Renesas R-Car CAN FD controller" + depends on ARCH_RENESAS || ARM + ---help--- + Say Y here if you want to use CAN FD controller found on + Renesas R-Car SoCs. The driver puts the controller in CAN FD only + mode, which can interoperate with CAN2.0 nodes but does not support + dedicated CAN 2.0 mode. + + To compile this driver as a module, choose M here: the module will + be called rcar_canfd. |