Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...

[linux-2.6] / drivers / serial / Kconfig

diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 9bc42763623c8de5cf5d48eef56f0f018568fee2..09f6346d38a8127b6a05d58c4c2b9c3fc23d1b77 100644 (file)
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -448,9 +448,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,


@@ -458,12 +458,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
+       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


@@ -476,6 +482,37 @@ 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
 config SERIAL_DZ
        bool "DECstation DZ serial driver"
        depends on MACH_DECSTATION && 32BIT


@@ -753,7 +790,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