SPARC: Move serial config over to use UART layer.

arch/sparc/Config.help

@@ -910,34 +910,6 @@ CONFIG_VT_CONSOLE
 
   If unsure, say Y.
 
-CONFIG_SERIAL
-  This selects whether you want to include the driver for the standard
-  serial ports.  The standard answer is Y.  People who might say N
-  here are those that are setting up dedicated Ethernet WWW/FTP
-  servers, or users that have one of the various bus mice instead of a
-  serial mouse and don't intend to use their machine's standard serial
-  port for anything.  (Note that the Cyclades and Stallion multi
-  serial port drivers do not need this driver built in for them to
-  work.)
-
-  If you want to compile this driver as a module, say M here and read
-  <file:Documentation/modules.txt>.  The module will be called
-  serial.o.
-  [WARNING: Do not compile this driver as a module if you are using
-  non-standard serial ports, since the configuration information will
-  be lost when the driver is unloaded.  This limitation may be lifted
-  in the future.]
-
-  BTW1: If you have a mouseman serial mouse which is not recognized by
-  the X window system, try running gpm first.
-
-  BTW2: If you intend to use a software modem (also called Winmodem)
-  under Linux, forget it.  These modems are crippled and require
-  proprietary drivers which are only available under Windows.
-
-  Most people will say Y or M here, so that they can use serial mice,
-  modems and similar devices connecting to the standard serial ports.
-
 CONFIG_SERIAL_CONSOLE
   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
@@ -1018,25 +990,6 @@ CONFIG_PRINTER
   If you have more than 8 printers, you need to increase the LP_NO
   macro in lp.c and the PARPORT_MAX macro in parport.h.
 
-CONFIG_BUSMOUSE
-  Say Y here if your machine has a bus mouse as opposed to a serial
-  mouse. Most people have a regular serial MouseSystem or
-  Microsoft mouse (made by Logitech) that plugs into a COM port
-  (rectangular with 9 or 25 pins). These people say N here. 
-
-  If you have a laptop, you either have to check the documentation or
-  experiment a bit to find out whether the trackball is a serial mouse
-  or not; it's best to say Y here for you.
-
-  This is the generic bus mouse driver code. If you have a bus mouse,
-  you will have to say Y here and also to the specific driver for your
-  mouse below.
-
-  This code is also available as a module ( = code which can be
-  inserted in and removed from the running kernel whenever you want).
-  The module will be called busmouse.o. If you want to compile it as a
-  module, say M here and read <file:Documentation/modules.txt>.
-
 CONFIG_SOFT_WATCHDOG
   A software monitoring watchdog. This will fail to reboot your system
   from some situations that the hardware watchdog will recover
@@ -1106,11 +1059,3 @@ CONFIG_SUNOS_EMUL
   want to run SunOS binaries on an Ultra you must also say Y to
   "Kernel support for 32-bit a.out binaries" above.
 
-CONFIG_SUN_KEYBOARD
-  Say Y here to support the keyboard found on Sun 3 and 3x
-  workstations.  It can also be used support Sun Type-5 keyboards
-  through an adaptor.  See
-  <http://www.suse.cz/development/input/adapters.html> and
-  <http://sourceforge.net/projects/linuxconsole/> for details on the
-  latter.
-

arch/sparc/config.in

@@ -27,13 +27,7 @@ define_bool CONFIG_MCA n
 define_bool CONFIG_PCMCIA n
 define_bool CONFIG_SBUS y
 define_bool CONFIG_SBUSCHAR y
-define_bool CONFIG_BUSMOUSE y
-define_bool CONFIG_SUN_MOUSE y
-define_bool CONFIG_SERIAL y
-define_bool CONFIG_SUN_SERIAL y
 define_bool CONFIG_SERIAL_CONSOLE y
-define_bool CONFIG_SUN_KEYBOARD y
-define_bool CONFIG_SUN_CONSOLE y
 define_bool CONFIG_SUN_AUXIO y
 define_bool CONFIG_SUN_IO y
 define_bool CONFIG_RWSEM_GENERIC_SPINLOCK y
@@ -68,6 +62,7 @@ endmenu
 
 source drivers/mtd/Config.in
 
+source drivers/serial/Config.in
 if [ "$CONFIG_SUN4" != "y" ]; then
    source drivers/sbus/char/Config.in
    source drivers/sbus/audio/Config.in

arch/sparc64/Config.help

@@ -949,34 +949,6 @@ CONFIG_VT_CONSOLE
 
   If unsure, say Y.
 
-CONFIG_SERIAL
-  This selects whether you want to include the driver for the standard
-  serial ports.  The standard answer is Y.  People who might say N
-  here are those that are setting up dedicated Ethernet WWW/FTP
-  servers, or users that have one of the various bus mice instead of a
-  serial mouse and don't intend to use their machine's standard serial
-  port for anything.  (Note that the Cyclades and Stallion multi
-  serial port drivers do not need this driver built in for them to
-  work.)
-
-  If you want to compile this driver as a module, say M here and read
-  <file:Documentation/modules.txt>.  The module will be called
-  serial.o.
-  [WARNING: Do not compile this driver as a module if you are using
-  non-standard serial ports, since the configuration information will
-  be lost when the driver is unloaded.  This limitation may be lifted
-  in the future.]
-
-  BTW1: If you have a mouseman serial mouse which is not recognized by
-  the X window system, try running gpm first.
-
-  BTW2: If you intend to use a software modem (also called Winmodem)
-  under Linux, forget it.  These modems are crippled and require
-  proprietary drivers which are only available under Windows.
-
-  Most people will say Y or M here, so that they can use serial mice,
-  modems and similar devices connecting to the standard serial ports.
-
 CONFIG_SERIAL_CONSOLE
   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
@@ -1065,25 +1037,6 @@ CONFIG_BBC_I2C
   temperature sensors.  The second controller also connects to the
   smartcard reader, if present.  Say Y to enable support for these.
 
-CONFIG_BUSMOUSE
-  Say Y here if your machine has a bus mouse as opposed to a serial
-  mouse. Most people have a regular serial MouseSystem or
-  Microsoft mouse (made by Logitech) that plugs into a COM port
-  (rectangular with 9 or 25 pins). These people say N here. 
-
-  If you have a laptop, you either have to check the documentation or
-  experiment a bit to find out whether the trackball is a serial mouse
-  or not; it's best to say Y here for you.
-
-  This is the generic bus mouse driver code. If you have a bus mouse,
-  you will have to say Y here and also to the specific driver for your
-  mouse below.
-
-  This code is also available as a module ( = code which can be
-  inserted in and removed from the running kernel whenever you want).
-  The module will be called busmouse.o. If you want to compile it as a
-  module, say M here and read <file:Documentation/modules.txt>.
-
 CONFIG_DRM
   Kernel-level support for the Direct Rendering Infrastructure (DRI)
   introduced in XFree86 4.0. If you say Y here, you need to select
@@ -1209,14 +1162,6 @@ CONFIG_SUNOS_EMUL
   want to run SunOS binaries on an Ultra you must also say Y to
   "Kernel support for 32-bit a.out binaries" above.
 
-CONFIG_SUN_KEYBOARD
-  Say Y here to support the keyboard found on Sun 3 and 3x
-  workstations.  It can also be used support Sun Type-5 keyboards
-  through an adaptor.  See
-  <http://www.suse.cz/development/input/adapters.html> and
-  <http://sourceforge.net/projects/linuxconsole/> for details on the
-  latter.
-
 CONFIG_VIDEO_DEV
   Support for audio/video capture and overlay devices and FM radio
   cards. The exact capabilities of each device vary. User tools for

arch/sparc64/config.in

@@ -33,13 +33,6 @@ define_bool CONFIG_MCA n
 define_bool CONFIG_PCMCIA n
 define_bool CONFIG_SBUS y
 define_bool CONFIG_SBUSCHAR y
-define_bool CONFIG_BUSMOUSE y
-define_bool CONFIG_SUN_MOUSE y
-define_bool CONFIG_SERIAL y
-define_bool CONFIG_SUN_SERIAL y
-define_bool CONFIG_SERIAL_CONSOLE y
-define_bool CONFIG_SUN_KEYBOARD y
-define_bool CONFIG_SUN_CONSOLE y
 define_bool CONFIG_SUN_AUXIO y
 define_bool CONFIG_SUN_IO y
 bool 'PCI support' CONFIG_PCI
@@ -79,6 +72,7 @@ bool 'PROM console' CONFIG_PROM_CONSOLE
 source drivers/video/Config.in
 endmenu
 
+source drivers/serial/Config.in
 source drivers/sbus/char/Config.in
 source drivers/sbus/audio/Config.in
 source drivers/mtd/Config.in

drivers/sbus/char/Config.help

@@ -57,10 +57,6 @@ CONFIG_SUN_JSFLASH
   If you say Y here, you will be able to boot from your JavaStation's
   Flash memory.
 
-CONFIG_SAB82532
-  This driver supports the serial ports on newer (PCI) Ultra systems.
-  Say Y if you want to be able to use your serial ports.
-
 CONFIG_SUN_VIDEOPIX
   Say Y here to support the Videopix Frame Grabber from Sun
   Microsystems, commonly found on SPARCstations.  This card, which is

drivers/sbus/char/Config.in

@@ -3,9 +3,6 @@ comment 'Misc Linux/SPARC drivers'
 tristate '/dev/openprom device support' CONFIG_SUN_OPENPROMIO
 tristate 'Mostek real time clock support' CONFIG_SUN_MOSTEK_RTC
 if [ "$CONFIG_SPARC64" = "y" ]; then
-   if [ "$CONFIG_PCI" = "y" ]; then
-      tristate 'Siemens SAB82532 serial support' CONFIG_SAB82532
-   fi
    tristate 'OBP Flash Device support' CONFIG_OBP_FLASH
 fi
 

drivers/sbus/char/Makefile

@@ -7,15 +7,14 @@
 # Rewritten to use lists instead of if-statements.
 #
 
-export-objs := su.o bbc_i2c.o
-obj-y := sunkbd.o sunkbdmap.o sunmouse.o sunserial.o zs.o
+export-objs := bbc_i2c.o
+obj-y := sunkbdmap.o
 
 vfc-objs := vfc_dev.o vfc_i2c.o
 bbc-objs := bbc_i2c.o bbc_envctrl.o
 
-obj-$(CONFIG_PCI) += su.o pcikbd.o
+obj-$(CONFIG_PCI) += pcikbd.o
 
-obj-$(CONFIG_SAB82532)			+= sab82532.o
 obj-$(CONFIG_ENVCTRL)			+= envctrl.o
 obj-$(CONFIG_DISPLAY7SEG)		+= display7seg.o
 obj-$(CONFIG_WATCHDOG_CP1XXX)		+= cpwatchdog.o