ACPI: reboot.c: use new acpi_reset interface

[safe/jmp/linux-2.6] / drivers / serial / Kconfig

diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index ddfb1ea..579d63a 100644 (file)
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -1,8 +1,6 @@
 #
 # Serial device configuration
 #
 #
 # Serial device configuration
 #

-# $Id: Kconfig,v 1.11 2004/03/11 18:08:04 lethal Exp $
-#

 
 menu "Serial drivers"
        depends on HAS_IOMEM
 
 menu "Serial drivers"
        depends on HAS_IOMEM


@@ -11,7 +9,6 @@ menu "Serial drivers"
 # The new 8250/16550 serial drivers
 config SERIAL_8250
        tristate "8250/16550 and compatible serial support"
 # The new 8250/16550 serial drivers
 config SERIAL_8250
        tristate "8250/16550 and compatible serial support"

-       depends on (BROKEN || !SPARC)

        select SERIAL_CORE
        ---help---
          This selects whether you want to include the driver for the standard
        select SERIAL_CORE
        ---help---
          This selects whether you want to include the driver for the standard


@@ -262,12 +259,12 @@ config SERIAL_8250_ACORN
          cards.  If unsure, say N.
 
 config SERIAL_8250_AU1X00
          cards.  If unsure, say N.
 
 config SERIAL_8250_AU1X00

-       bool "AU1X00 serial port support"
+       bool "Au1x00 serial port support"

        depends on SERIAL_8250 != n && SOC_AU1X00
        help
        depends on SERIAL_8250 != n && SOC_AU1X00
        help

-         If you have an Au1x00 board and want to use the serial port, say Y
-         to this option.  The driver can handle 1 or 2 serial ports.
-         If unsure, say N.
+         If you have an Au1x00 SOC based board and want to use the serial port,
+         say Y to this option. The driver can handle up to 4 serial ports,
+         depending on the SOC. If unsure, say N.

 
 config SERIAL_8250_RM9K
        bool "Support for MIPS RM9xxx integrated serial port"
 
 config SERIAL_8250_RM9K
        bool "Support for MIPS RM9xxx integrated serial port"


@@ -380,6 +377,21 @@ config SERIAL_ATMEL_CONSOLE
          console is the device which receives all kernel messages and
          warnings and which allows logins in single user mode).
 
          console is the device which receives all kernel messages and
          warnings and which allows logins in single user mode).
 

+config SERIAL_ATMEL_PDC
+       bool "Support DMA transfers on AT91 / AT32 serial port"
+       depends on SERIAL_ATMEL
+       default y
+       help
+         Say Y here if you wish to use the PDC to do DMA transfers to
+         and from the Atmel AT91 / AT32 serial port. In order to
+         actually use DMA transfers, make sure that the use_dma_tx
+         and use_dma_rx members in the atmel_uart_data struct is set
+         appropriately for each port.
+
+         Note that break and error handling currently doesn't work
+         properly when DMA is enabled. Make sure that ports where
+         this matters don't use DMA.
+

 config SERIAL_ATMEL_TTYAT
        bool "Install as device ttyATn instead of ttySn"
        depends on SERIAL_ATMEL=y
 config SERIAL_ATMEL_TTYAT
        bool "Install as device ttyATn instead of ttySn"
        depends on SERIAL_ATMEL=y


@@ -433,9 +445,9 @@ config SERIAL_CLPS711X_CONSOLE
          your boot loader (lilo or loadlin) about how to pass options to the
          kernel at boot time.)
 
          your boot loader (lilo or loadlin) about how to pass options to the
          kernel at boot time.)
 

-config SERIAL_S3C2410
-       tristate "Samsung S3C2410/S3C2440/S3C2442/S3C2412 Serial port support"
-       depends on ARM && ARCH_S3C2410
+config SERIAL_SAMSUNG
+       tristate "Samsung SoC serial support"
+       depends on ARM && PLAT_S3C24XX

        select SERIAL_CORE
        help
          Support for the on-chip UARTs on the Samsung S3C24XX series CPUs,
        select SERIAL_CORE
        help
          Support for the on-chip UARTs on the Samsung S3C24XX series CPUs,


@@ -443,12 +455,18 @@ config SERIAL_S3C2410
          provide all of these ports, depending on how the serial port
          pins are configured.
 
          provide all of these ports, depending on how the serial port
          pins are configured.
 

-         Currently this driver supports the UARTS on the S3C2410, S3C2440,
-         S3C2442, S3C2412 and S3C2413 CPUs.
+config SERIAL_SAMSUNG_DEBUG
+       bool "Samsung SoC serial debug"
+       depends on SERIAL_SAMSUNG && DEBUG_LL
+       help
+         Add support for debugging the serial driver. Since this is
+         generally being used as a console, we use our own output
+         routines that go via the low-level debug printascii()
+         function.

 
 

-config SERIAL_S3C2410_CONSOLE
-       bool "Support for console on S3C2410 serial port"
-       depends on SERIAL_S3C2410=y
+config SERIAL_SAMSUNG_CONSOLE
+       bool "Support for console on Samsung SoC serial port"
+       depends on SERIAL_SAMSUNG=y

        select SERIAL_CORE_CONSOLE
        help
          Allow selection of the S3C24XX on-board serial ports for use as
        select SERIAL_CORE_CONSOLE
        help
          Allow selection of the S3C24XX on-board serial ports for use as


@@ -461,24 +479,59 @@ config SERIAL_S3C2410_CONSOLE
          your boot loader about how to pass options to the kernel at
          boot time.)
 
          your boot loader about how to pass options to the kernel at
          boot time.)
 

+config SERIAL_S3C2400
+       tristate "Samsung S3C2410 Serial port support"
+       depends on ARM && SERIAL_SAMSUNG && CPU_S3C2400
+       default y if CPU_S3C2400
+       help
+         Serial port support for the Samsung S3C2400 SoC
+
+config SERIAL_S3C2410
+       tristate "Samsung S3C2410 Serial port support"
+       depends on SERIAL_SAMSUNG && CPU_S3C2410
+       default y if CPU_S3C2410
+       help
+         Serial port support for the Samsung S3C2410 SoC
+
+config SERIAL_S3C2412
+       tristate "Samsung S3C2412/S3C2413 Serial port support"
+       depends on SERIAL_SAMSUNG && CPU_S3C2412
+       default y if CPU_S3C2412
+       help
+         Serial port support for the Samsung S3C2412 and S3C2413 SoC
+
+config SERIAL_S3C2440
+       tristate "Samsung S3C2440/S3C2442 Serial port support"
+       depends on SERIAL_SAMSUNG && (CPU_S3C2440 || CPU_S3C2442)
+       default y if CPU_S3C2440
+       default y if CPU_S3C2442
+       help
+         Serial port support for the Samsung S3C2440 and S3C2442 SoC
+
+
+

 config SERIAL_DZ
        bool "DECstation DZ serial driver"
        depends on MACH_DECSTATION && 32BIT
        select SERIAL_CORE
 config SERIAL_DZ
        bool "DECstation DZ serial driver"
        depends on MACH_DECSTATION && 32BIT
        select SERIAL_CORE

-       help
-         DZ11-family serial controllers for VAXstations, including the
-         DC7085, M7814, and M7819.
+       default y
+       ---help---
+         DZ11-family serial controllers for DECstations and VAXstations,
+         including the DC7085, M7814, and M7819.

 
 config SERIAL_DZ_CONSOLE
        bool "Support console on DECstation DZ serial driver"
        depends on SERIAL_DZ=y
        select SERIAL_CORE_CONSOLE
 
 config SERIAL_DZ_CONSOLE
        bool "Support console on DECstation DZ serial driver"
        depends on SERIAL_DZ=y
        select SERIAL_CORE_CONSOLE

-       help
+       default y
+       ---help---

          If you say Y here, it will be possible to use a serial port as the
          system console (the system console is the device which receives all
          kernel messages and warnings and which allows logins in single user
          If you say Y here, it will be possible to use a serial port as the
          system console (the system console is the device which receives all
          kernel messages and warnings and which allows logins in single user

-         mode).  Note that the firmware uses ttyS0 as the serial console on
-         the Maxine and ttyS2 on the others.
+         mode).
+
+         Note that the firmware uses ttyS3 as the serial console on
+         DECstations that use this driver.

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


@@ -667,7 +720,7 @@ config UART0_RTS_PIN
 
 config SERIAL_BFIN_UART1
        bool "Enable UART1"
 
 config SERIAL_BFIN_UART1
        bool "Enable UART1"

-       depends on SERIAL_BFIN && (BF534 || BF536 || BF537 || BF54x)
+       depends on SERIAL_BFIN && (!BF531 && !BF532 && !BF533 && !BF561)

        help
          Enable UART1
 
        help
          Enable UART1
 


@@ -680,14 +733,14 @@ config BFIN_UART1_CTSRTS
 
 config UART1_CTS_PIN
        int "UART1 CTS pin"
 
 config UART1_CTS_PIN
        int "UART1 CTS pin"

-       depends on BFIN_UART1_CTSRTS && (BF53x || BF561)
+       depends on BFIN_UART1_CTSRTS && !BF54x

        default -1
        help
          Refer to ./include/asm-blackfin/gpio.h to see the GPIO map.
 
 config UART1_RTS_PIN
        int "UART1 RTS pin"
        default -1
        help
          Refer to ./include/asm-blackfin/gpio.h to see the GPIO map.
 
 config UART1_RTS_PIN
        int "UART1 RTS pin"

-       depends on BFIN_UART1_CTSRTS && (BF53x || BF561)
+       depends on BFIN_UART1_CTSRTS && !BF54x

        default -1
        help
          Refer to ./include/asm-blackfin/gpio.h to see the GPIO map.
        default -1
        help
          Refer to ./include/asm-blackfin/gpio.h to see the GPIO map.


@@ -734,7 +787,7 @@ config BFIN_UART3_CTSRTS
 
 config SERIAL_IMX
        bool "IMX serial port support"
 
 config SERIAL_IMX
        bool "IMX serial port support"

-       depends on ARM && ARCH_IMX
+       depends on ARM && (ARCH_IMX || ARCH_MXC)

        select SERIAL_CORE
        help
          If you have a machine based on a Motorola IMX CPU you
        select SERIAL_CORE
        help
          If you have a machine based on a Motorola IMX CPU you


@@ -877,34 +930,18 @@ config SERIAL_SUNHV
          systems.  Say Y if you want to be able to use this device.
 
 config SERIAL_IP22_ZILOG
          systems.  Say Y if you want to be able to use this device.
 
 config SERIAL_IP22_ZILOG

-       tristate "IP22 Zilog8530 serial support"
-       depends on SGI_IP22
+       tristate "SGI Zilog8530 serial support"
+       depends on SGI_HAS_ZILOG

        select SERIAL_CORE
        help
        select SERIAL_CORE
        help

-         This driver supports the Zilog8530 serial ports found on SGI IP22
+         This driver supports the Zilog8530 serial ports found on SGI

          systems.  Say Y or M if you want to be able to these serial ports.
 
 config SERIAL_IP22_ZILOG_CONSOLE
          systems.  Say Y or M if you want to be able to these serial ports.
 
 config SERIAL_IP22_ZILOG_CONSOLE

-       bool "Console on IP22 Zilog8530 serial port"
+       bool "Console on SGI Zilog8530 serial port"

        depends on SERIAL_IP22_ZILOG=y
        select SERIAL_CORE_CONSOLE
 
        depends on SERIAL_IP22_ZILOG=y
        select SERIAL_CORE_CONSOLE
 

-config V850E_UART
-       bool "NEC V850E on-chip UART support"
-       depends on V850E_MA1 || V850E_ME2 || V850E_TEG || V850E2_ANNA || V850E_AS85EP1
-       select SERIAL_CORE
-       default y
-
-config V850E_UARTB
-        bool
-       depends on V850E_UART && V850E_ME2
-       default y
-
-config V850E_UART_CONSOLE
-       bool "Use NEC V850E on-chip UART for console"
-       depends on V850E_UART
-       select SERIAL_CORE_CONSOLE
-

 config SERIAL_SH_SCI
        tristate "SuperH SCI(F) serial port support"
        depends on SUPERH || H8300
 config SERIAL_SH_SCI
        tristate "SuperH SCI(F) serial port support"
        depends on SUPERH || H8300


@@ -942,6 +979,9 @@ config SERIAL_CORE
 config SERIAL_CORE_CONSOLE
        bool
 
 config SERIAL_CORE_CONSOLE
        bool
 

+config CONSOLE_POLL
+       bool
+

 config SERIAL_68328
        bool "68328 serial support"
        depends on M68328 || M68EZ328 || M68VZ328
 config SERIAL_68328
        bool "68328 serial support"
        depends on M68328 || M68EZ328 || M68VZ328


@@ -953,20 +993,12 @@ config SERIAL_68328_RTS_CTS
        bool "Support RTS/CTS on 68328 serial port"
        depends on SERIAL_68328
 
        bool "Support RTS/CTS on 68328 serial port"
        depends on SERIAL_68328
 

-config SERIAL_COLDFIRE
-       bool "ColdFire serial support"
-       depends on COLDFIRE
-       help
-         This driver supports the built-in serial ports of the Motorola ColdFire
-         family of CPUs.
-

 config SERIAL_MCF
 config SERIAL_MCF

-       bool "Coldfire serial support (new style driver)"
+       bool "Coldfire serial support"

        depends on COLDFIRE
        select SERIAL_CORE
        help
        depends on COLDFIRE
        select SERIAL_CORE
        help

-         This new serial driver supports the Freescale Coldfire serial ports
-         using the new serial driver subsystem.
+         This serial driver supports the Freescale Coldfire serial ports.

 
 config SERIAL_MCF_BAUDRATE
        int "Default baudrate for Coldfire serial ports"
 
 config SERIAL_MCF_BAUDRATE
        int "Default baudrate for Coldfire serial ports"


@@ -1091,42 +1123,6 @@ config SERIAL_CPM_CONSOLE
          your boot loader (lilo or loadlin) about how to pass options to the
          kernel at boot time.)
 
          your boot loader (lilo or loadlin) about how to pass options to the
          kernel at boot time.)
 

-config SERIAL_CPM_SCC1
-       bool "Support for SCC1 serial port"
-       depends on SERIAL_CPM=y
-       help
-         Select this option to use SCC1 as a serial port
-
-config SERIAL_CPM_SCC2
-       bool "Support for SCC2 serial port"
-       depends on SERIAL_CPM=y
-       help
-         Select this option to use SCC2 as a serial port
-
-config SERIAL_CPM_SCC3
-       bool "Support for SCC3 serial port"
-       depends on SERIAL_CPM=y
-       help
-         Select this option to use SCC3 as a serial port
-
-config SERIAL_CPM_SCC4
-       bool "Support for SCC4 serial port"
-       depends on SERIAL_CPM=y
-       help
-         Select this option to use SCC4 as a serial port
-
-config SERIAL_CPM_SMC1
-       bool "Support for SMC1 serial port"
-       depends on SERIAL_CPM=y
-       help
-         Select this option to use SMC1 as a serial port
-
-config SERIAL_CPM_SMC2
-       bool "Support for SMC2 serial port"
-       depends on SERIAL_CPM=y
-       help
-         Select this option to use SMC2 as a serial port
-

 config SERIAL_SGI_L1_CONSOLE
        bool "SGI Altix L1 serial console support"
        depends on IA64_GENERIC || IA64_SGI_SN2
 config SERIAL_SGI_L1_CONSOLE
        bool "SGI Altix L1 serial console support"
        depends on IA64_GENERIC || IA64_SGI_SN2


@@ -1280,7 +1276,7 @@ config SERIAL_SGI_IOC3
          say Y or M.  Otherwise, say N.
 
 config SERIAL_NETX
          say Y or M.  Otherwise, say N.
 
 config SERIAL_NETX

-       bool "NetX serial port support"
+       tristate "NetX serial port support"

        depends on ARM && ARCH_NETX
        select SERIAL_CORE
        help
        depends on ARM && ARCH_NETX
        select SERIAL_CORE
        help


@@ -1292,7 +1288,7 @@ config SERIAL_NETX
 
 config SERIAL_NETX_CONSOLE
        bool "Console on NetX serial port"
 
 config SERIAL_NETX_CONSOLE
        bool "Console on NetX serial port"

-       depends on SERIAL_NETX
+       depends on SERIAL_NETX=y

        select SERIAL_CORE_CONSOLE
        help
          If you have enabled the serial port on the Hilscher NetX SoC
        select SERIAL_CORE_CONSOLE
        help
          If you have enabled the serial port on the Hilscher NetX SoC


@@ -1318,4 +1314,62 @@ config SERIAL_QE
          This driver supports the QE serial ports on Freescale embedded
          PowerPC that contain a QUICC Engine.
 
          This driver supports the QE serial ports on Freescale embedded
          PowerPC that contain a QUICC Engine.
 

+config SERIAL_SC26XX
+       tristate "SC2681/SC2692 serial port support"
+       depends on SNI_RM
+       select SERIAL_CORE
+       help
+         This is a driver for the onboard serial ports of
+         older RM400 machines.
+
+config SERIAL_SC26XX_CONSOLE
+       bool "Console on SC2681/SC2692 serial port"
+       depends on SERIAL_SC26XX
+       select SERIAL_CORE_CONSOLE
+       help
+         Support for Console on SC2681/SC2692 serial ports.
+
+config SERIAL_BFIN_SPORT
+       tristate "Blackfin SPORT emulate UART (EXPERIMENTAL)"
+       depends on BLACKFIN && EXPERIMENTAL
+       select SERIAL_CORE
+       help
+         Enble support SPORT emulate UART on Blackfin series.
+
+         To compile this driver as a module, choose M here: the
+         module will be called bfin_sport_uart.
+
+choice
+       prompt "Baud rate for Blackfin SPORT UART"
+       depends on SERIAL_BFIN_SPORT
+       default SERIAL_SPORT_BAUD_RATE_57600
+       help
+         Choose a baud rate for the SPORT UART, other uart settings are
+         8 bit, 1 stop bit, no parity, no flow control.
+
+config SERIAL_SPORT_BAUD_RATE_115200
+       bool "115200"
+
+config SERIAL_SPORT_BAUD_RATE_57600
+       bool "57600"
+
+config SERIAL_SPORT_BAUD_RATE_38400
+       bool "38400"
+
+config SERIAL_SPORT_BAUD_RATE_19200
+       bool "19200"
+
+config SERIAL_SPORT_BAUD_RATE_9600
+       bool "9600"
+endchoice
+
+config SPORT_BAUD_RATE
+       int
+       depends on SERIAL_BFIN_SPORT
+       default 115200 if (SERIAL_SPORT_BAUD_RATE_115200)
+       default 57600 if (SERIAL_SPORT_BAUD_RATE_57600)
+       default 38400 if (SERIAL_SPORT_BAUD_RATE_38400)
+       default 19200 if (SERIAL_SPORT_BAUD_RATE_19200)
+       default 9600 if (SERIAL_SPORT_BAUD_RATE_9600)
+

 endmenu
 endmenu