21eaab6d19
Here's the big tty/serial driver patches for 3.9-rc1. More tty port rework and fixes from Jiri here, as well as lots of individual serial driver updates and fixes. All of these have been in the linux-next tree for a while. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iEYEABECAAYFAlEmZYQACgkQMUfUDdst+ylJDgCg0B0nMevUUdM4hLvxunbbiyXM HUEAoIOedqriNNPvX4Bwy0hjeOEaWx0g =vi6x -----END PGP SIGNATURE----- Merge tag 'tty-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty Pull tty/serial patches from Greg Kroah-Hartman: "Here's the big tty/serial driver patches for 3.9-rc1. More tty port rework and fixes from Jiri here, as well as lots of individual serial driver updates and fixes. All of these have been in the linux-next tree for a while." * tag 'tty-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (140 commits) tty: mxser: improve error handling in mxser_probe() and mxser_module_init() serial: imx: fix uninitialized variable warning serial: tegra: assume CONFIG_OF TTY: do not update atime/mtime on read/write lguest: select CONFIG_TTY to build properly. ARM defconfigs: add missing inclusions of linux/platform_device.h fb/exynos: include platform_device.h ARM: sa1100/assabet: include platform_device.h directly serial: imx: Fix recursive locking bug pps: Fix build breakage from decoupling pps from tty tty: Remove ancient hardpps() pps: Additional cleanups in uart_handle_dcd_change pps: Move timestamp read into PPS code proper pps: Don't crash the machine when exiting will do pps: Fix a use-after free bug when unregistering a source. pps: Use pps_lookup_dev to reduce ldisc coupling pps: Add pps_lookup_dev() function tty: serial: uartlite: Support uartlite on big and little endian systems tty: serial: uartlite: Fix sparse and checkpatch warnings serial/arc-uart: Miscll DT related updates (Grant's review comments) ... Fix up trivial conflicts, mostly just due to the TTY config option clashing with the EXPERIMENTAL removal.
153 lines
4.9 KiB
Text
153 lines
4.9 KiB
Text
menu "CAN Device Drivers"
|
|
|
|
config CAN_VCAN
|
|
tristate "Virtual Local CAN Interface (vcan)"
|
|
---help---
|
|
Similar to the network loopback devices, vcan offers a
|
|
virtual local CAN interface.
|
|
|
|
This driver can also be built as a module. If so, the module
|
|
will be called vcan.
|
|
|
|
config CAN_SLCAN
|
|
tristate "Serial / USB serial CAN Adaptors (slcan)"
|
|
depends on TTY
|
|
---help---
|
|
CAN driver for several 'low cost' CAN interfaces that are attached
|
|
via serial lines or via USB-to-serial adapters using the LAWICEL
|
|
ASCII protocol. The driver implements the tty linediscipline N_SLCAN.
|
|
|
|
As only the sending and receiving of CAN frames is implemented, this
|
|
driver should work with the (serial/USB) CAN hardware from:
|
|
www.canusb.com / www.can232.com / www.mictronics.de / www.canhack.de
|
|
|
|
Userspace tools to attach the SLCAN line discipline (slcan_attach,
|
|
slcand) can be found in the can-utils at the SocketCAN SVN, see
|
|
http://developer.berlios.de/projects/socketcan for details.
|
|
|
|
The slcan driver supports up to 10 CAN netdevices by default which
|
|
can be changed by the 'maxdev=xx' module option. This driver can
|
|
also be built as a module. If so, the module will be called slcan.
|
|
|
|
config CAN_DEV
|
|
tristate "Platform CAN drivers with Netlink support"
|
|
default y
|
|
---help---
|
|
Enables the common framework for platform CAN drivers with Netlink
|
|
support. This is the standard library for CAN drivers.
|
|
If unsure, say Y.
|
|
|
|
if CAN_DEV
|
|
|
|
config CAN_CALC_BITTIMING
|
|
bool "CAN bit-timing calculation"
|
|
default y
|
|
---help---
|
|
If enabled, CAN bit-timing parameters will be calculated for the
|
|
bit-rate specified via Netlink argument "bitrate" when the device
|
|
get started. This works fine for the most common CAN controllers
|
|
with standard bit-rates but may fail for exotic bit-rates or CAN
|
|
source clock frequencies. Disabling saves some space, but then the
|
|
bit-timing parameters must be specified directly using the Netlink
|
|
arguments "tq", "prop_seg", "phase_seg1", "phase_seg2" and "sjw".
|
|
If unsure, say Y.
|
|
|
|
config CAN_LEDS
|
|
bool "Enable LED triggers for Netlink based drivers"
|
|
depends on LEDS_CLASS
|
|
select LEDS_TRIGGERS
|
|
---help---
|
|
This option adds two LED triggers for packet receive and transmit
|
|
events on each supported CAN device.
|
|
|
|
Say Y here if you are working on a system with led-class supported
|
|
LEDs and you want to use them as canbus activity indicators.
|
|
|
|
config CAN_AT91
|
|
tristate "Atmel AT91 onchip CAN controller"
|
|
depends on ARCH_AT91SAM9263 || ARCH_AT91SAM9X5
|
|
---help---
|
|
This is a driver for the SoC CAN controller in Atmel's AT91SAM9263
|
|
and AT91SAM9X5 processors.
|
|
|
|
config CAN_TI_HECC
|
|
depends on ARCH_OMAP3
|
|
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_MCP251X
|
|
tristate "Microchip MCP251x SPI CAN controllers"
|
|
depends on SPI && HAS_DMA
|
|
---help---
|
|
Driver for the Microchip MCP251x SPI CAN controllers.
|
|
|
|
config CAN_BFIN
|
|
depends on BF534 || BF536 || BF537 || BF538 || BF539 || BF54x
|
|
tristate "Analog Devices Blackfin on-chip CAN"
|
|
---help---
|
|
Driver for the Analog Devices Blackfin on-chip CAN controllers
|
|
|
|
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 HAVE_CAN_FLEXCAN
|
|
bool
|
|
|
|
config CAN_FLEXCAN
|
|
tristate "Support for Freescale FLEXCAN based chips"
|
|
depends on HAVE_CAN_FLEXCAN
|
|
---help---
|
|
Say Y here if you want to support for Freescale FlexCAN.
|
|
|
|
config PCH_CAN
|
|
tristate "Intel EG20T PCH CAN controller"
|
|
depends on PCI
|
|
---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
|
|
---help---
|
|
Say Y here if you want to use Aeroflex Gaisler GRCAN or GRHCAN.
|
|
Note that the driver supports little endian, even though little
|
|
endian syntheses of the cores would need some modifications on
|
|
the hardware level to work.
|
|
|
|
source "drivers/net/can/mscan/Kconfig"
|
|
|
|
source "drivers/net/can/sja1000/Kconfig"
|
|
|
|
source "drivers/net/can/c_can/Kconfig"
|
|
|
|
source "drivers/net/can/cc770/Kconfig"
|
|
|
|
source "drivers/net/can/usb/Kconfig"
|
|
|
|
source "drivers/net/can/softing/Kconfig"
|
|
|
|
endif
|
|
|
|
config CAN_DEBUG_DEVICES
|
|
bool "CAN devices debugging messages"
|
|
---help---
|
|
Say Y here if you want the CAN device drivers to produce a bunch of
|
|
debug messages to the system log. Select this if you are having
|
|
a problem with CAN support and want to see more of what is going
|
|
on.
|
|
|
|
endmenu
|