The two options "CAN bit-timing calculation" and

[socketcan-devel.git] / kernel / 2.6 / drivers / net / can / Kconfig

diff --git a/kernel/2.6/drivers/net/can/Kconfig b/kernel/2.6/drivers/net/can/Kconfig
index 5ecca597becf7dcecf641adf497b9c9b1f32da65..2a570f9cbbb5e6bc039344cab0680bfae75aaa71 100644 (file)
--- a/kernel/2.6/drivers/net/can/Kconfig
+++ b/kernel/2.6/drivers/net/can/Kconfig
@@ -14,15 +14,24 @@ config CAN_VCAN
 
 config CAN_SLCAN
        tristate "Serial / USB serial CAN Adaptors (slcan)"
 
 config CAN_SLCAN
        tristate "Serial / USB serial CAN Adaptors (slcan)"

-       depends on CAN && EXPERIMENTAL
+       depends on CAN

        default N
        ---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.
 
        default N
        ---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.
 

-         This driver can also be built as a module.  If so, the module
-         will be called 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_OLD_DRIVERS
        tristate "Prompt for old CAN drivers (e.g. no sysfs support)"
 
 config CAN_OLD_DRIVERS
        tristate "Prompt for old CAN drivers (e.g. no sysfs support)"


@@ -38,11 +47,11 @@ source "drivers/net/can/old/Kconfig"
 endif
 
 config CAN_DEV
 endif
 
 config CAN_DEV

-       tristate "Prompt for platform CAN drivers with netlink support"
-       depends on CAN && SYSFS
-       default Y
+       tristate "Platform CAN drivers with Netlink support"
+       depends on CAN
+       default y

        ---help---
        ---help---

-         Enables the common framework for platform CAN drivers with sysfs
+         Enables the common framework for platform CAN drivers with Netlink

          support. This is the standard library for CAN drivers.
          If unsure, say Y.
 
          support. This is the standard library for CAN drivers.
          If unsure, say Y.
 


@@ -59,133 +68,17 @@ config CAN_DEV_SYSFS
 config CAN_CALC_BITTIMING
        bool "CAN bit-timing calculation"
        depends on CAN_DEV
 config CAN_CALC_BITTIMING
        bool "CAN bit-timing calculation"
        depends on CAN_DEV

-       default Y
+       default y

        ---help---
          If enabled, CAN bit-timing parameters will be calculated for the
        ---help---
          If enabled, CAN bit-timing parameters will be calculated for the

-         bit-rate specified via SYSFS file "bitrate" when the device gets
-         started. This works fine for the most common CAN controllers
+         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
          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 SYSFS
-         files "tq", "prop_seg", "phase_seg1", "phase_seg2" and "sjw".
+         bit-timing parameters must be specified directly using the Netlink
+         arguments "tq", "prop_seg", "phase_seg1", "phase_seg2" and "sjw".

          If unsure, say Y.
 
          If unsure, say Y.
 

-config CAN_CC770
-       depends on HAS_IOMEM && CAN_DEV
-       tristate "Bosch CC770 and Intel AN82527"
-       ---help---
-         Driver for the Bosch CC770 and the compatible Intel AN82527
-         CAN controllers.
-
-config CAN_CC770_ISA
-       depends on CAN_CC770 && ISA
-       tristate "ISA Bus based legacy CC770 driver"
-       ---help---
-         This driver adds legacy support for CC770 and AN82527 chips
-         connected to the ISA bus using I/O port, memory mapped or
-         indirect access.
-
-config CAN_CC770_OF_PLATFORM
-       depends on CAN_CC770 && PPC_OF
-       tristate "Generic OF Platform Bus based CC770 driver"
-       ---help---
-         This driver adds support for the CC770 and other AN82527
-         compatible chips connected to the OpenFirmware "platform bus"
-         found on embedded systems with OpenFirmware bindings, e.g. if
-         you have a PowerPC based system you may want to enable this
-         option.
-
-config CAN_SJA1000
-       depends on CAN_DEV
-       tristate "Philips SJA1000"
-       ---help---
-         Driver for the SJA1000 CAN controllers from Philips or NXP
-
-config CAN_SJA1000_ISA
-       depends on CAN_SJA1000 && ISA
-       tristate "ISA Bus based legacy SJA1000 driver"
-       ---help---
-         This driver adds legacy support for SJA1000 chips connected to
-         the ISA bus using I/O port, memory mapped or indirect access.
-
-config CAN_SJA1000_PLATFORM
-       depends on CAN_SJA1000
-       tristate "generic Platform Bus based SJA1000 driver"
-       ---help---
-         This driver adds support for the SJA1000 chips connected to
-         the "platform bus" (Linux abstraction for directly to the
-         processor attached devices).  Which can be found on various
-         boards from Phytec (http://www.phytec.de) like the PCM027,
-         PCM038.
-
-config CAN_SJA1000_OF_PLATFORM
-       depends on CAN_SJA1000 && PPC_OF
-       tristate "Generic OF Platform Bus based SJA1000 driver"
-       ---help---
-         This driver adds support for the SJA1000 chips connected to
-         the OpenFirmware "platform bus" found on embedded systems with
-         OpenFirmware bindings, e.g. if you have a PowerPC based system
-         you may want to enable this option.
-
-config CAN_EMS_PCI
-       tristate "EMS CPC-PCI, CPC-PCIe and CPC-104P Card"
-       depends on PCI && CAN_SJA1000
-       ---help---
-         This driver is for the one, two or four channel CPC-PCI,
-         CPC-PCIe and CPC-104P cards from EMS Dr. Thomas Wuensche
-         (http://www.ems-wuensche.de).
-
-config CAN_EMS_PCMCIA
-       tristate "EMS CPC-CARD Card"
-       depends on PCMCIA && CAN_SJA1000
-       ---help---
-         This driver is for the one or two channel CPC-CARD cards from
-         EMS Dr. Thomas Wuensche (http://www.ems-wuensche.de).
-
-config CAN_EMS_104M
-       tristate "EMS CPC-104M Card"
-       depends on ISA && CAN_SJA1000
-       ---help---
-         This driver is for the one, two or four channel CPC-104M cards
-         from EMS Dr. Thomas Wuensche (http://www.ems-wuensche.de).
-
-config CAN_ESD_PCI
-       tristate "ESD PCI Cards"
-       depends on PCI && CAN_SJA1000
-       ---help---
-         This driver supports the esd PCI CAN cards CAN-PCI/200,
-         CAN-PCI/266, CAN-PMC/266 (PMC), CAN-CPCI/200 (CompactPCI),
-         CAN-PCIe2000 (PCI Express) and CAN-PCI104/200 (PCI104)
-         from the esd electronic system design gmbh (http://www.esd.eu).
-
-config CAN_IXXAT_PCI
-       tristate "IXXAT PCI Card"
-       depends on PCI && CAN_SJA1000
-       ---help---
-         This driver is for the IXXAT PC-I 04/PCI card (1 or 2 channel)
-         from the IXXAT Automation GmbH (http://www.ixxat.de).
-
-config CAN_PEAK_PCI
-       tristate "PEAK PCAN PCI Card"
-       depends on PCI && CAN_SJA1000
-       ---help---
-         This driver is for the PCAN PCI, the PC-PCI CAN plug-in card (1 or
-         2 channel) from PEAK Systems (http://www.peak-system.com).
-
-config CAN_PIPCAN
-       depends on CAN_SJA1000
-       tristate "MPL PIPCAN CAN module driver (SJA1000)"
-       ---help---
-         This driver adds support for the PIPCAN module used on some SBC
-         boards from MPL AG (http://www.mpl.ch).
-
-config CAN_KVASER_PCI
-       tristate "Kvaser PCIcanx and Kvaser PCIcan PCI Cards"
-       depends on PCI && CAN_SJA1000
-       ---help---
-         This driver is for the the PCIcanx and PCIcan cards (1, 2 or
-         4 channel) from Kvaser (http://www.kvaser.com).
-

 config CAN_ESD_PCI331
        tristate "ESD CAN 331 Cards"
        depends on PCI && CAN_DEV
 config CAN_ESD_PCI331
        tristate "ESD CAN 331 Cards"
        depends on PCI && CAN_DEV


@@ -217,29 +110,9 @@ config CAN_SOFTING_CS
          This version of the driver is written against
          firmware version 4.6
 
          This version of the driver is written against
          firmware version 4.6
 

-config CAN_MSCAN
-       depends on CAN_DEV && (PPC || M68K || M68KNOMMU)
-       tristate "Support for a Freescale MSCAN based chips"
-       ---help---
-         The Motorola Scalable Controller Area Network (MSCAN) definition
-         is based on the MSCAN12 definition which is the specific
-         implementation of the Motorola Scalable CAN concept targeted for
-         the Motorola MC68HC12 Microcontroller Family.
-
-config CAN_MPC52XX
-       tristate "Freescale MPC5200 onboard CAN controller"
-       depends on CAN_MSCAN && (PPC_MPC52xx || PPC_52xx)
-       default LITE5200
-       ---help---
-         If you say yes here you get support for Freescale MPC5200
-         onboard dualCAN controller.
-
-         This driver can also be built as a module.  If so, the module
-         will be called mpc52xx_can.
-

 config CAN_AT91
        tristate "Atmel AT91 onchip CAN controller"
 config CAN_AT91
        tristate "Atmel AT91 onchip CAN controller"

-       depends on CAN && ARCH_AT91SAM9263
+       depends on CAN_DEV && ARCH_AT91SAM9263

        default N
        ---help---
          This is a driver for the SoC CAN controller in Atmel's AT91SAM9263.
        default N
        ---help---
          This is a driver for the SoC CAN controller in Atmel's AT91SAM9263.


@@ -250,6 +123,14 @@ config CAN_MCP251X
        ---help---
          Driver for the Microchip MCP251x SPI CAN controllers.
 
        ---help---
          Driver for the Microchip MCP251x SPI CAN controllers.
 

+source "drivers/net/can/cc770/Kconfig"
+
+source "drivers/net/can/mscan/Kconfig"
+
+source "drivers/net/can/sja1000/Kconfig"
+
+source "drivers/net/can/usb/Kconfig"
+

 config CAN_DEBUG_DEVICES
        bool "CAN devices debugging messages"
        depends on CAN
 config CAN_DEBUG_DEVICES
        bool "CAN devices debugging messages"
        depends on CAN