Here are some tty/serial patches for 3.3-rc1
Big thing here is the movement of the 8250 serial drivers to their own directory, now that the patch churn has calmed down. Other than that, only minor stuff (omap patches were reverted as they were found to be wrong), and another broken driver removed from the system. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) iEYEABECAAYFAk8nB3wACgkQMUfUDdst+ykJAgCeKirJzWs6KrXMX6TWSabSvvsX xbUAn2mnT+UooWSDawrACknkDsQ7y41n =9tuj -----END PGP SIGNATURE----- Merge tag 'tty-3.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty Here are some tty/serial patches for 3.3-rc1 Big thing here is the movement of the 8250 serial drivers to their own directory, now that the patch churn has calmed down. Other than that, only minor stuff (omap patches were reverted as they were found to be wrong), and another broken driver removed from the system. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> * tag 'tty-3.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: serial: Kill off Moorestown code Revert "tty: serial: OMAP: ensure FIFO levels are set correctly in non-DMA mode" Revert "tty: serial: OMAP: transmit FIFO threshold interrupts don't wake the chip" serial: Fix wakeup init logic to speed up startup docbook: don't use serial_core.h in device-drivers book serial: amba-pl011: lock console writes against interrupts amba-pl011: do not disable RTS during shutdown tty: serial: OMAP: transmit FIFO threshold interrupts don't wake the chip tty: serial: OMAP: ensure FIFO levels are set correctly in non-DMA mode omap-serial: make serial_omap_restore_context depend on CONFIG_PM_RUNTIME omap-serial :Make the suspend/resume functions depend on CONFIG_PM_SLEEP. TTY: fix UV serial console regression jsm: Fixed EEH recovery error Updated TTY MAINTAINERS info serial: group all the 8250 related code together
This commit is contained in:
Linus Torvalds
commit
27ba234c8d
|
|
@ -6678,7 +6678,7 @@ TTY LAYER
|
|||
M: Greg Kroah-Hartman <gregkh@suse.de>
|
||||
S: Maintained
|
||||
T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git
|
||||
F: drivers/tty/*
|
||||
F: drivers/tty/
|
||||
F: drivers/tty/serial/serial_core.c
|
||||
F: include/linux/serial_core.h
|
||||
F: include/linux/serial.h
|
||||
|
|
|
|||
|
|
@ -0,0 +1,280 @@
|
|||
#
|
||||
# The 8250/16550 serial drivers. You shouldn't be in this list unless
|
||||
# you somehow have an implicit or explicit dependency on SERIAL_8250.
|
||||
#
|
||||
|
||||
config SERIAL_8250
|
||||
tristate "8250/16550 and compatible serial support"
|
||||
select SERIAL_CORE
|
||||
---help---
|
||||
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.)
|
||||
|
||||
To compile this driver as a module, choose M here: the
|
||||
module will be called 8250.
|
||||
[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_8250_CONSOLE
|
||||
bool "Console on 8250/16550 and compatible serial port"
|
||||
depends on SERIAL_8250=y
|
||||
select SERIAL_CORE_CONSOLE
|
||||
---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
|
||||
mode). This could be useful if some terminal or printer is connected
|
||||
to that serial port.
|
||||
|
||||
Even if you say Y here, the currently visible virtual console
|
||||
(/dev/tty0) will still be used as the system console by default, but
|
||||
you can alter that using a kernel command line option such as
|
||||
"console=ttyS1". (Try "man bootparam" or see the documentation of
|
||||
your boot loader (grub or lilo or loadlin) about how to pass options
|
||||
to the kernel at boot time.)
|
||||
|
||||
If you don't have a VGA card installed and you say Y here, the
|
||||
kernel will automatically use the first serial line, /dev/ttyS0, as
|
||||
system console.
|
||||
|
||||
You can set that using a kernel command line option such as
|
||||
"console=uart8250,io,0x3f8,9600n8"
|
||||
"console=uart8250,mmio,0xff5e0000,115200n8".
|
||||
and it will switch to normal serial console when the corresponding
|
||||
port is ready.
|
||||
"earlycon=uart8250,io,0x3f8,9600n8"
|
||||
"earlycon=uart8250,mmio,0xff5e0000,115200n8".
|
||||
it will not only setup early console.
|
||||
|
||||
If unsure, say N.
|
||||
|
||||
config FIX_EARLYCON_MEM
|
||||
bool
|
||||
depends on X86
|
||||
default y
|
||||
|
||||
config SERIAL_8250_GSC
|
||||
tristate
|
||||
depends on SERIAL_8250 && GSC
|
||||
default SERIAL_8250
|
||||
|
||||
config SERIAL_8250_PCI
|
||||
tristate "8250/16550 PCI device support" if EXPERT
|
||||
depends on SERIAL_8250 && PCI
|
||||
default SERIAL_8250
|
||||
help
|
||||
This builds standard PCI serial support. You may be able to
|
||||
disable this feature if you only need legacy serial support.
|
||||
Saves about 9K.
|
||||
|
||||
config SERIAL_8250_PNP
|
||||
tristate "8250/16550 PNP device support" if EXPERT
|
||||
depends on SERIAL_8250 && PNP
|
||||
default SERIAL_8250
|
||||
help
|
||||
This builds standard PNP serial support. You may be able to
|
||||
disable this feature if you only need legacy serial support.
|
||||
|
||||
config SERIAL_8250_HP300
|
||||
tristate
|
||||
depends on SERIAL_8250 && HP300
|
||||
default SERIAL_8250
|
||||
|
||||
config SERIAL_8250_CS
|
||||
tristate "8250/16550 PCMCIA device support"
|
||||
depends on PCMCIA && SERIAL_8250
|
||||
---help---
|
||||
Say Y here to enable support for 16-bit PCMCIA serial devices,
|
||||
including serial port cards, modems, and the modem functions of
|
||||
multi-function Ethernet/modem cards. (PCMCIA- or PC-cards are
|
||||
credit-card size devices often used with laptops.)
|
||||
|
||||
To compile this driver as a module, choose M here: the
|
||||
module will be called serial_cs.
|
||||
|
||||
If unsure, say N.
|
||||
|
||||
config SERIAL_8250_NR_UARTS
|
||||
int "Maximum number of 8250/16550 serial ports"
|
||||
depends on SERIAL_8250
|
||||
default "4"
|
||||
help
|
||||
Set this to the number of serial ports you want the driver
|
||||
to support. This includes any ports discovered via ACPI or
|
||||
PCI enumeration and any ports that may be added at run-time
|
||||
via hot-plug, or any ISA multi-port serial cards.
|
||||
|
||||
config SERIAL_8250_RUNTIME_UARTS
|
||||
int "Number of 8250/16550 serial ports to register at runtime"
|
||||
depends on SERIAL_8250
|
||||
range 0 SERIAL_8250_NR_UARTS
|
||||
default "4"
|
||||
help
|
||||
Set this to the maximum number of serial ports you want
|
||||
the kernel to register at boot time. This can be overridden
|
||||
with the module parameter "nr_uarts", or boot-time parameter
|
||||
8250.nr_uarts
|
||||
|
||||
config SERIAL_8250_EXTENDED
|
||||
bool "Extended 8250/16550 serial driver options"
|
||||
depends on SERIAL_8250
|
||||
help
|
||||
If you wish to use any non-standard features of the standard "dumb"
|
||||
driver, say Y here. This includes HUB6 support, shared serial
|
||||
interrupts, special multiport support, support for more than the
|
||||
four COM 1/2/3/4 boards, etc.
|
||||
|
||||
Note that the answer to this question won't directly affect the
|
||||
kernel: saying N will just cause the configurator to skip all
|
||||
the questions about serial driver options. If unsure, say N.
|
||||
|
||||
config SERIAL_8250_MANY_PORTS
|
||||
bool "Support more than 4 legacy serial ports"
|
||||
depends on SERIAL_8250_EXTENDED && !IA64
|
||||
help
|
||||
Say Y here if you have dumb serial boards other than the four
|
||||
standard COM 1/2/3/4 ports. This may happen if you have an AST
|
||||
FourPort, Accent Async, Boca (read the Boca mini-HOWTO, available
|
||||
from <http://www.tldp.org/docs.html#howto>), or other custom
|
||||
serial port hardware which acts similar to standard serial port
|
||||
hardware. If you only use the standard COM 1/2/3/4 ports, you can
|
||||
say N here to save some memory. You can also say Y if you have an
|
||||
"intelligent" multiport card such as Cyclades, Digiboards, etc.
|
||||
|
||||
#
|
||||
# Multi-port serial cards
|
||||
#
|
||||
|
||||
config SERIAL_8250_FOURPORT
|
||||
tristate "Support Fourport cards"
|
||||
depends on SERIAL_8250 != n && ISA && SERIAL_8250_MANY_PORTS
|
||||
help
|
||||
Say Y here if you have an AST FourPort serial board.
|
||||
|
||||
To compile this driver as a module, choose M here: the module
|
||||
will be called 8250_fourport.
|
||||
|
||||
config SERIAL_8250_ACCENT
|
||||
tristate "Support Accent cards"
|
||||
depends on SERIAL_8250 != n && ISA && SERIAL_8250_MANY_PORTS
|
||||
help
|
||||
Say Y here if you have an Accent Async serial board.
|
||||
|
||||
To compile this driver as a module, choose M here: the module
|
||||
will be called 8250_accent.
|
||||
|
||||
config SERIAL_8250_BOCA
|
||||
tristate "Support Boca cards"
|
||||
depends on SERIAL_8250 != n && ISA && SERIAL_8250_MANY_PORTS
|
||||
help
|
||||
Say Y here if you have a Boca serial board. Please read the Boca
|
||||
mini-HOWTO, available from <http://www.tldp.org/docs.html#howto>
|
||||
|
||||
To compile this driver as a module, choose M here: the module
|
||||
will be called 8250_boca.
|
||||
|
||||
config SERIAL_8250_EXAR_ST16C554
|
||||
tristate "Support Exar ST16C554/554D Quad UART"
|
||||
depends on SERIAL_8250 != n && ISA && SERIAL_8250_MANY_PORTS
|
||||
help
|
||||
The Uplogix Envoy TU301 uses this Exar Quad UART. If you are
|
||||
tinkering with your Envoy TU301, or have a machine with this UART,
|
||||
say Y here.
|
||||
|
||||
To compile this driver as a module, choose M here: the module
|
||||
will be called 8250_exar_st16c554.
|
||||
|
||||
config SERIAL_8250_HUB6
|
||||
tristate "Support Hub6 cards"
|
||||
depends on SERIAL_8250 != n && ISA && SERIAL_8250_MANY_PORTS
|
||||
help
|
||||
Say Y here if you have a HUB6 serial board.
|
||||
|
||||
To compile this driver as a module, choose M here: the module
|
||||
will be called 8250_hub6.
|
||||
|
||||
#
|
||||
# Misc. options/drivers.
|
||||
#
|
||||
|
||||
config SERIAL_8250_SHARE_IRQ
|
||||
bool "Support for sharing serial interrupts"
|
||||
depends on SERIAL_8250_EXTENDED
|
||||
help
|
||||
Some serial boards have hardware support which allows multiple dumb
|
||||
serial ports on the same board to share a single IRQ. To enable
|
||||
support for this in the serial driver, say Y here.
|
||||
|
||||
config SERIAL_8250_DETECT_IRQ
|
||||
bool "Autodetect IRQ on standard ports (unsafe)"
|
||||
depends on SERIAL_8250_EXTENDED
|
||||
help
|
||||
Say Y here if you want the kernel to try to guess which IRQ
|
||||
to use for your serial port.
|
||||
|
||||
This is considered unsafe; it is far better to configure the IRQ in
|
||||
a boot script using the setserial command.
|
||||
|
||||
If unsure, say N.
|
||||
|
||||
config SERIAL_8250_RSA
|
||||
bool "Support RSA serial ports"
|
||||
depends on SERIAL_8250_EXTENDED
|
||||
help
|
||||
::: To be written :::
|
||||
|
||||
config SERIAL_8250_MCA
|
||||
tristate "Support 8250-type ports on MCA buses"
|
||||
depends on SERIAL_8250 != n && MCA
|
||||
help
|
||||
Say Y here if you have a MCA serial ports.
|
||||
|
||||
To compile this driver as a module, choose M here: the module
|
||||
will be called 8250_mca.
|
||||
|
||||
config SERIAL_8250_ACORN
|
||||
tristate "Acorn expansion card serial port support"
|
||||
depends on ARCH_ACORN && SERIAL_8250
|
||||
help
|
||||
If you have an Atomwide Serial card or Serial Port card for an Acorn
|
||||
system, say Y to this option. The driver can handle 1, 2, or 3 port
|
||||
cards. If unsure, say N.
|
||||
|
||||
config SERIAL_8250_RM9K
|
||||
bool "Support for MIPS RM9xxx integrated serial port"
|
||||
depends on SERIAL_8250 != n && SERIAL_RM9000
|
||||
select SERIAL_8250_SHARE_IRQ
|
||||
help
|
||||
Selecting this option will add support for the integrated serial
|
||||
port hardware found on MIPS RM9122 and similar processors.
|
||||
If unsure, say N.
|
||||
|
||||
config SERIAL_8250_FSL
|
||||
bool
|
||||
depends on SERIAL_8250_CONSOLE && PPC_UDBG_16550
|
||||
default PPC
|
||||
|
||||
config SERIAL_8250_DW
|
||||
tristate "Support for Synopsys DesignWare 8250 quirks"
|
||||
depends on SERIAL_8250 && OF
|
||||
help
|
||||
Selecting this option will enable handling of the extra features
|
||||
present in the Synopsys DesignWare APB UART.
|
||||
|
|
@ -0,0 +1,20 @@
|
|||
#
|
||||
# Makefile for the 8250 serial device drivers.
|
||||
#
|
||||
|
||||
obj-$(CONFIG_SERIAL_8250) += 8250.o
|
||||
obj-$(CONFIG_SERIAL_8250_PNP) += 8250_pnp.o
|
||||
obj-$(CONFIG_SERIAL_8250_GSC) += 8250_gsc.o
|
||||
obj-$(CONFIG_SERIAL_8250_PCI) += 8250_pci.o
|
||||
obj-$(CONFIG_SERIAL_8250_HP300) += 8250_hp300.o
|
||||
obj-$(CONFIG_SERIAL_8250_CS) += serial_cs.o
|
||||
obj-$(CONFIG_SERIAL_8250_ACORN) += 8250_acorn.o
|
||||
obj-$(CONFIG_SERIAL_8250_CONSOLE) += 8250_early.o
|
||||
obj-$(CONFIG_SERIAL_8250_FOURPORT) += 8250_fourport.o
|
||||
obj-$(CONFIG_SERIAL_8250_ACCENT) += 8250_accent.o
|
||||
obj-$(CONFIG_SERIAL_8250_BOCA) += 8250_boca.o
|
||||
obj-$(CONFIG_SERIAL_8250_EXAR_ST16C554) += 8250_exar_st16c554.o
|
||||
obj-$(CONFIG_SERIAL_8250_HUB6) += 8250_hub6.o
|
||||
obj-$(CONFIG_SERIAL_8250_MCA) += 8250_mca.o
|
||||
obj-$(CONFIG_SERIAL_8250_FSL) += 8250_fsl.o
|
||||
obj-$(CONFIG_SERIAL_8250_DW) += 8250_dw.o
|
||||
|
|
@ -5,279 +5,7 @@
|
|||
menu "Serial drivers"
|
||||
depends on HAS_IOMEM
|
||||
|
||||
#
|
||||
# The new 8250/16550 serial drivers
|
||||
config SERIAL_8250
|
||||
tristate "8250/16550 and compatible serial support"
|
||||
select SERIAL_CORE
|
||||
---help---
|
||||
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.)
|
||||
|
||||
To compile this driver as a module, choose M here: the
|
||||
module will be called 8250.
|
||||
[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_8250_CONSOLE
|
||||
bool "Console on 8250/16550 and compatible serial port"
|
||||
depends on SERIAL_8250=y
|
||||
select SERIAL_CORE_CONSOLE
|
||||
---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
|
||||
mode). This could be useful if some terminal or printer is connected
|
||||
to that serial port.
|
||||
|
||||
Even if you say Y here, the currently visible virtual console
|
||||
(/dev/tty0) will still be used as the system console by default, but
|
||||
you can alter that using a kernel command line option such as
|
||||
"console=ttyS1". (Try "man bootparam" or see the documentation of
|
||||
your boot loader (grub or lilo or loadlin) about how to pass options
|
||||
to the kernel at boot time.)
|
||||
|
||||
If you don't have a VGA card installed and you say Y here, the
|
||||
kernel will automatically use the first serial line, /dev/ttyS0, as
|
||||
system console.
|
||||
|
||||
You can set that using a kernel command line option such as
|
||||
"console=uart8250,io,0x3f8,9600n8"
|
||||
"console=uart8250,mmio,0xff5e0000,115200n8".
|
||||
and it will switch to normal serial console when the corresponding
|
||||
port is ready.
|
||||
"earlycon=uart8250,io,0x3f8,9600n8"
|
||||
"earlycon=uart8250,mmio,0xff5e0000,115200n8".
|
||||
it will not only setup early console.
|
||||
|
||||
If unsure, say N.
|
||||
|
||||
config FIX_EARLYCON_MEM
|
||||
bool
|
||||
depends on X86
|
||||
default y
|
||||
|
||||
config SERIAL_8250_GSC
|
||||
tristate
|
||||
depends on SERIAL_8250 && GSC
|
||||
default SERIAL_8250
|
||||
|
||||
config SERIAL_8250_PCI
|
||||
tristate "8250/16550 PCI device support" if EXPERT
|
||||
depends on SERIAL_8250 && PCI
|
||||
default SERIAL_8250
|
||||
help
|
||||
This builds standard PCI serial support. You may be able to
|
||||
disable this feature if you only need legacy serial support.
|
||||
Saves about 9K.
|
||||
|
||||
config SERIAL_8250_PNP
|
||||
tristate "8250/16550 PNP device support" if EXPERT
|
||||
depends on SERIAL_8250 && PNP
|
||||
default SERIAL_8250
|
||||
help
|
||||
This builds standard PNP serial support. You may be able to
|
||||
disable this feature if you only need legacy serial support.
|
||||
|
||||
config SERIAL_8250_FSL
|
||||
bool
|
||||
depends on SERIAL_8250_CONSOLE && PPC_UDBG_16550
|
||||
default PPC
|
||||
|
||||
config SERIAL_8250_HP300
|
||||
tristate
|
||||
depends on SERIAL_8250 && HP300
|
||||
default SERIAL_8250
|
||||
|
||||
config SERIAL_8250_CS
|
||||
tristate "8250/16550 PCMCIA device support"
|
||||
depends on PCMCIA && SERIAL_8250
|
||||
---help---
|
||||
Say Y here to enable support for 16-bit PCMCIA serial devices,
|
||||
including serial port cards, modems, and the modem functions of
|
||||
multi-function Ethernet/modem cards. (PCMCIA- or PC-cards are
|
||||
credit-card size devices often used with laptops.)
|
||||
|
||||
To compile this driver as a module, choose M here: the
|
||||
module will be called serial_cs.
|
||||
|
||||
If unsure, say N.
|
||||
|
||||
config SERIAL_8250_NR_UARTS
|
||||
int "Maximum number of 8250/16550 serial ports"
|
||||
depends on SERIAL_8250
|
||||
default "4"
|
||||
help
|
||||
Set this to the number of serial ports you want the driver
|
||||
to support. This includes any ports discovered via ACPI or
|
||||
PCI enumeration and any ports that may be added at run-time
|
||||
via hot-plug, or any ISA multi-port serial cards.
|
||||
|
||||
config SERIAL_8250_RUNTIME_UARTS
|
||||
int "Number of 8250/16550 serial ports to register at runtime"
|
||||
depends on SERIAL_8250
|
||||
range 0 SERIAL_8250_NR_UARTS
|
||||
default "4"
|
||||
help
|
||||
Set this to the maximum number of serial ports you want
|
||||
the kernel to register at boot time. This can be overridden
|
||||
with the module parameter "nr_uarts", or boot-time parameter
|
||||
8250.nr_uarts
|
||||
|
||||
config SERIAL_8250_EXTENDED
|
||||
bool "Extended 8250/16550 serial driver options"
|
||||
depends on SERIAL_8250
|
||||
help
|
||||
If you wish to use any non-standard features of the standard "dumb"
|
||||
driver, say Y here. This includes HUB6 support, shared serial
|
||||
interrupts, special multiport support, support for more than the
|
||||
four COM 1/2/3/4 boards, etc.
|
||||
|
||||
Note that the answer to this question won't directly affect the
|
||||
kernel: saying N will just cause the configurator to skip all
|
||||
the questions about serial driver options. If unsure, say N.
|
||||
|
||||
config SERIAL_8250_MANY_PORTS
|
||||
bool "Support more than 4 legacy serial ports"
|
||||
depends on SERIAL_8250_EXTENDED && !IA64
|
||||
help
|
||||
Say Y here if you have dumb serial boards other than the four
|
||||
standard COM 1/2/3/4 ports. This may happen if you have an AST
|
||||
FourPort, Accent Async, Boca (read the Boca mini-HOWTO, available
|
||||
from <http://www.tldp.org/docs.html#howto>), or other custom
|
||||
serial port hardware which acts similar to standard serial port
|
||||
hardware. If you only use the standard COM 1/2/3/4 ports, you can
|
||||
say N here to save some memory. You can also say Y if you have an
|
||||
"intelligent" multiport card such as Cyclades, Digiboards, etc.
|
||||
|
||||
#
|
||||
# Multi-port serial cards
|
||||
#
|
||||
|
||||
config SERIAL_8250_FOURPORT
|
||||
tristate "Support Fourport cards"
|
||||
depends on SERIAL_8250 != n && ISA && SERIAL_8250_MANY_PORTS
|
||||
help
|
||||
Say Y here if you have an AST FourPort serial board.
|
||||
|
||||
To compile this driver as a module, choose M here: the module
|
||||
will be called 8250_fourport.
|
||||
|
||||
config SERIAL_8250_ACCENT
|
||||
tristate "Support Accent cards"
|
||||
depends on SERIAL_8250 != n && ISA && SERIAL_8250_MANY_PORTS
|
||||
help
|
||||
Say Y here if you have an Accent Async serial board.
|
||||
|
||||
To compile this driver as a module, choose M here: the module
|
||||
will be called 8250_accent.
|
||||
|
||||
config SERIAL_8250_BOCA
|
||||
tristate "Support Boca cards"
|
||||
depends on SERIAL_8250 != n && ISA && SERIAL_8250_MANY_PORTS
|
||||
help
|
||||
Say Y here if you have a Boca serial board. Please read the Boca
|
||||
mini-HOWTO, available from <http://www.tldp.org/docs.html#howto>
|
||||
|
||||
To compile this driver as a module, choose M here: the module
|
||||
will be called 8250_boca.
|
||||
|
||||
config SERIAL_8250_EXAR_ST16C554
|
||||
tristate "Support Exar ST16C554/554D Quad UART"
|
||||
depends on SERIAL_8250 != n && ISA && SERIAL_8250_MANY_PORTS
|
||||
help
|
||||
The Uplogix Envoy TU301 uses this Exar Quad UART. If you are
|
||||
tinkering with your Envoy TU301, or have a machine with this UART,
|
||||
say Y here.
|
||||
|
||||
To compile this driver as a module, choose M here: the module
|
||||
will be called 8250_exar_st16c554.
|
||||
|
||||
config SERIAL_8250_HUB6
|
||||
tristate "Support Hub6 cards"
|
||||
depends on SERIAL_8250 != n && ISA && SERIAL_8250_MANY_PORTS
|
||||
help
|
||||
Say Y here if you have a HUB6 serial board.
|
||||
|
||||
To compile this driver as a module, choose M here: the module
|
||||
will be called 8250_hub6.
|
||||
|
||||
config SERIAL_8250_SHARE_IRQ
|
||||
bool "Support for sharing serial interrupts"
|
||||
depends on SERIAL_8250_EXTENDED
|
||||
help
|
||||
Some serial boards have hardware support which allows multiple dumb
|
||||
serial ports on the same board to share a single IRQ. To enable
|
||||
support for this in the serial driver, say Y here.
|
||||
|
||||
config SERIAL_8250_DETECT_IRQ
|
||||
bool "Autodetect IRQ on standard ports (unsafe)"
|
||||
depends on SERIAL_8250_EXTENDED
|
||||
help
|
||||
Say Y here if you want the kernel to try to guess which IRQ
|
||||
to use for your serial port.
|
||||
|
||||
This is considered unsafe; it is far better to configure the IRQ in
|
||||
a boot script using the setserial command.
|
||||
|
||||
If unsure, say N.
|
||||
|
||||
config SERIAL_8250_RSA
|
||||
bool "Support RSA serial ports"
|
||||
depends on SERIAL_8250_EXTENDED
|
||||
help
|
||||
::: To be written :::
|
||||
|
||||
config SERIAL_8250_MCA
|
||||
tristate "Support 8250-type ports on MCA buses"
|
||||
depends on SERIAL_8250 != n && MCA
|
||||
help
|
||||
Say Y here if you have a MCA serial ports.
|
||||
|
||||
To compile this driver as a module, choose M here: the module
|
||||
will be called 8250_mca.
|
||||
|
||||
config SERIAL_8250_ACORN
|
||||
tristate "Acorn expansion card serial port support"
|
||||
depends on ARCH_ACORN && SERIAL_8250
|
||||
help
|
||||
If you have an Atomwide Serial card or Serial Port card for an Acorn
|
||||
system, say Y to this option. The driver can handle 1, 2, or 3 port
|
||||
cards. If unsure, say N.
|
||||
|
||||
config SERIAL_8250_RM9K
|
||||
bool "Support for MIPS RM9xxx integrated serial port"
|
||||
depends on SERIAL_8250 != n && SERIAL_RM9000
|
||||
select SERIAL_8250_SHARE_IRQ
|
||||
help
|
||||
Selecting this option will add support for the integrated serial
|
||||
port hardware found on MIPS RM9122 and similar processors.
|
||||
If unsure, say N.
|
||||
|
||||
config SERIAL_8250_DW
|
||||
tristate "Support for Synopsys DesignWare 8250 quirks"
|
||||
depends on SERIAL_8250 && OF
|
||||
help
|
||||
Selecting this option will enable handling of the extra features
|
||||
present in the Synopsys DesignWare APB UART.
|
||||
source "drivers/tty/serial/8250/Kconfig"
|
||||
|
||||
comment "Non-8250 serial port support"
|
||||
|
||||
|
|
@ -536,15 +264,6 @@ config SERIAL_MAX3107
|
|||
help
|
||||
MAX3107 chip support
|
||||
|
||||
config SERIAL_MAX3107_AAVA
|
||||
tristate "MAX3107 AAVA platform support"
|
||||
depends on X86_MRST && SERIAL_MAX3107 && GPIOLIB
|
||||
select SERIAL_CORE
|
||||
help
|
||||
Support for the MAX3107 chip configuration found on the AAVA
|
||||
platform. Includes the extra initialisation and GPIO support
|
||||
neded for this device.
|
||||
|
||||
config SERIAL_DZ
|
||||
bool "DECstation DZ serial driver"
|
||||
depends on MACH_DECSTATION && 32BIT
|
||||
|
|
|
|||
|
|
@ -14,22 +14,9 @@ obj-$(CONFIG_SERIAL_SUNZILOG) += sunzilog.o
|
|||
obj-$(CONFIG_SERIAL_SUNSU) += sunsu.o
|
||||
obj-$(CONFIG_SERIAL_SUNSAB) += sunsab.o
|
||||
|
||||
obj-$(CONFIG_SERIAL_8250) += 8250.o
|
||||
obj-$(CONFIG_SERIAL_8250_PNP) += 8250_pnp.o
|
||||
obj-$(CONFIG_SERIAL_8250_GSC) += 8250_gsc.o
|
||||
obj-$(CONFIG_SERIAL_8250_PCI) += 8250_pci.o
|
||||
obj-$(CONFIG_SERIAL_8250_HP300) += 8250_hp300.o
|
||||
obj-$(CONFIG_SERIAL_8250_CS) += serial_cs.o
|
||||
obj-$(CONFIG_SERIAL_8250_ACORN) += 8250_acorn.o
|
||||
obj-$(CONFIG_SERIAL_8250_CONSOLE) += 8250_early.o
|
||||
obj-$(CONFIG_SERIAL_8250_FOURPORT) += 8250_fourport.o
|
||||
obj-$(CONFIG_SERIAL_8250_ACCENT) += 8250_accent.o
|
||||
obj-$(CONFIG_SERIAL_8250_BOCA) += 8250_boca.o
|
||||
obj-$(CONFIG_SERIAL_8250_EXAR_ST16C554) += 8250_exar_st16c554.o
|
||||
obj-$(CONFIG_SERIAL_8250_HUB6) += 8250_hub6.o
|
||||
obj-$(CONFIG_SERIAL_8250_MCA) += 8250_mca.o
|
||||
obj-$(CONFIG_SERIAL_8250_FSL) += 8250_fsl.o
|
||||
obj-$(CONFIG_SERIAL_8250_DW) += 8250_dw.o
|
||||
# Now bring in any enabled 8250/16450/16550 type drivers.
|
||||
obj-$(CONFIG_SERIAL_8250) += 8250/
|
||||
|
||||
obj-$(CONFIG_SERIAL_AMBA_PL010) += amba-pl010.o
|
||||
obj-$(CONFIG_SERIAL_AMBA_PL011) += amba-pl011.o
|
||||
obj-$(CONFIG_SERIAL_CLPS711X) += clps711x.o
|
||||
|
|
@ -42,7 +29,6 @@ obj-$(CONFIG_SERIAL_BFIN_SPORT) += bfin_sport_uart.o
|
|||
obj-$(CONFIG_SERIAL_SAMSUNG) += samsung.o
|
||||
obj-$(CONFIG_SERIAL_MAX3100) += max3100.o
|
||||
obj-$(CONFIG_SERIAL_MAX3107) += max3107.o
|
||||
obj-$(CONFIG_SERIAL_MAX3107_AAVA) += max3107-aava.o
|
||||
obj-$(CONFIG_SERIAL_IP22_ZILOG) += ip22zilog.o
|
||||
obj-$(CONFIG_SERIAL_MUX) += mux.o
|
||||
obj-$(CONFIG_SERIAL_68328) += 68328serial.o
|
||||
|
|
|
|||
|
|
@ -159,6 +159,7 @@ struct uart_amba_port {
|
|||
unsigned int fifosize; /* vendor-specific */
|
||||
unsigned int lcrh_tx; /* vendor-specific */
|
||||
unsigned int lcrh_rx; /* vendor-specific */
|
||||
unsigned int old_cr; /* state during shutdown */
|
||||
bool autorts;
|
||||
char type[12];
|
||||
bool interrupt_may_hang; /* vendor-specific */
|
||||
|
|
@ -1411,7 +1412,9 @@ static int pl011_startup(struct uart_port *port)
|
|||
while (readw(uap->port.membase + UART01x_FR) & UART01x_FR_BUSY)
|
||||
barrier();
|
||||
|
||||
cr = UART01x_CR_UARTEN | UART011_CR_RXE | UART011_CR_TXE;
|
||||
/* restore RTS and DTR */
|
||||
cr = uap->old_cr & (UART011_CR_RTS | UART011_CR_DTR);
|
||||
cr |= UART01x_CR_UARTEN | UART011_CR_RXE | UART011_CR_TXE;
|
||||
writew(cr, uap->port.membase + UART011_CR);
|
||||
|
||||
/* Clear pending error interrupts */
|
||||
|
|
@ -1469,6 +1472,7 @@ static void pl011_shutdown_channel(struct uart_amba_port *uap,
|
|||
static void pl011_shutdown(struct uart_port *port)
|
||||
{
|
||||
struct uart_amba_port *uap = (struct uart_amba_port *)port;
|
||||
unsigned int cr;
|
||||
|
||||
/*
|
||||
* disable all interrupts
|
||||
|
|
@ -1488,9 +1492,16 @@ static void pl011_shutdown(struct uart_port *port)
|
|||
|
||||
/*
|
||||
* disable the port
|
||||
* disable the port. It should not disable RTS and DTR.
|
||||
* Also RTS and DTR state should be preserved to restore
|
||||
* it during startup().
|
||||
*/
|
||||
uap->autorts = false;
|
||||
writew(UART01x_CR_UARTEN | UART011_CR_TXE, uap->port.membase + UART011_CR);
|
||||
cr = readw(uap->port.membase + UART011_CR);
|
||||
uap->old_cr = cr;
|
||||
cr &= UART011_CR_RTS | UART011_CR_DTR;
|
||||
cr |= UART01x_CR_UARTEN | UART011_CR_TXE;
|
||||
writew(cr, uap->port.membase + UART011_CR);
|
||||
|
||||
/*
|
||||
* disable break condition and fifos
|
||||
|
|
@ -1740,9 +1751,19 @@ pl011_console_write(struct console *co, const char *s, unsigned int count)
|
|||
{
|
||||
struct uart_amba_port *uap = amba_ports[co->index];
|
||||
unsigned int status, old_cr, new_cr;
|
||||
unsigned long flags;
|
||||
int locked = 1;
|
||||
|
||||
clk_enable(uap->clk);
|
||||
|
||||
local_irq_save(flags);
|
||||
if (uap->port.sysrq)
|
||||
locked = 0;
|
||||
else if (oops_in_progress)
|
||||
locked = spin_trylock(&uap->port.lock);
|
||||
else
|
||||
spin_lock(&uap->port.lock);
|
||||
|
||||
/*
|
||||
* First save the CR then disable the interrupts
|
||||
*/
|
||||
|
|
@ -1762,6 +1783,10 @@ pl011_console_write(struct console *co, const char *s, unsigned int count)
|
|||
} while (status & UART01x_FR_BUSY);
|
||||
writew(old_cr, uap->port.membase + UART011_CR);
|
||||
|
||||
if (locked)
|
||||
spin_unlock(&uap->port.lock);
|
||||
local_irq_restore(flags);
|
||||
|
||||
clk_disable(uap->clk);
|
||||
}
|
||||
|
||||
|
|
@ -1905,6 +1930,7 @@ static int pl011_probe(struct amba_device *dev, const struct amba_id *id)
|
|||
uap->vendor = vendor;
|
||||
uap->lcrh_rx = vendor->lcrh_rx;
|
||||
uap->lcrh_tx = vendor->lcrh_tx;
|
||||
uap->old_cr = 0;
|
||||
uap->fifosize = vendor->fifosize;
|
||||
uap->interrupt_may_hang = vendor->interrupt_may_hang;
|
||||
uap->port.dev = &dev->dev;
|
||||
|
|
|
|||
|
|
@ -251,6 +251,7 @@ static void jsm_io_resume(struct pci_dev *pdev)
|
|||
struct jsm_board *brd = pci_get_drvdata(pdev);
|
||||
|
||||
pci_restore_state(pdev);
|
||||
pci_save_state(pdev);
|
||||
|
||||
jsm_uart_port_init(brd);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,344 +0,0 @@
|
|||
/*
|
||||
* max3107.c - spi uart protocol driver for Maxim 3107
|
||||
* Based on max3100.c
|
||||
* by Christian Pellegrin <chripell@evolware.org>
|
||||
* and max3110.c
|
||||
* by Feng Tang <feng.tang@intel.com>
|
||||
*
|
||||
* Copyright (C) Aavamobile 2009
|
||||
*
|
||||
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*
|
||||
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
*
|
||||
*/
|
||||
|
||||
#include <linux/delay.h>
|
||||
#include <linux/device.h>
|
||||
#include <linux/serial_core.h>
|
||||
#include <linux/serial.h>
|
||||
#include <linux/spi/spi.h>
|
||||
#include <linux/freezer.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/gpio.h>
|
||||
#include <linux/sfi.h>
|
||||
#include <linux/module.h>
|
||||
#include <asm/mrst.h>
|
||||
#include "max3107.h"
|
||||
|
||||
/* GPIO direction to input function */
|
||||
static int max3107_gpio_direction_in(struct gpio_chip *chip, unsigned offset)
|
||||
{
|
||||
struct max3107_port *s = container_of(chip, struct max3107_port, chip);
|
||||
u16 buf[1]; /* Buffer for SPI transfer */
|
||||
|
||||
if (offset >= MAX3107_GPIO_COUNT) {
|
||||
dev_err(&s->spi->dev, "Invalid GPIO\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
/* Read current GPIO configuration register */
|
||||
buf[0] = MAX3107_GPIOCFG_REG;
|
||||
/* Perform SPI transfer */
|
||||
if (max3107_rw(s, (u8 *)buf, (u8 *)buf, 2)) {
|
||||
dev_err(&s->spi->dev, "SPI transfer GPIO read failed\n");
|
||||
return -EIO;
|
||||
}
|
||||
buf[0] &= MAX3107_SPI_RX_DATA_MASK;
|
||||
|
||||
/* Set GPIO to input */
|
||||
buf[0] &= ~(0x0001 << offset);
|
||||
|
||||
/* Write new GPIO configuration register value */
|
||||
buf[0] |= (MAX3107_WRITE_BIT | MAX3107_GPIOCFG_REG);
|
||||
/* Perform SPI transfer */
|
||||
if (max3107_rw(s, (u8 *)buf, NULL, 2)) {
|
||||
dev_err(&s->spi->dev, "SPI transfer GPIO write failed\n");
|
||||
return -EIO;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* GPIO direction to output function */
|
||||
static int max3107_gpio_direction_out(struct gpio_chip *chip, unsigned offset,
|
||||
int value)
|
||||
{
|
||||
struct max3107_port *s = container_of(chip, struct max3107_port, chip);
|
||||
u16 buf[2]; /* Buffer for SPI transfers */
|
||||
|
||||
if (offset >= MAX3107_GPIO_COUNT) {
|
||||
dev_err(&s->spi->dev, "Invalid GPIO\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
/* Read current GPIO configuration and data registers */
|
||||
buf[0] = MAX3107_GPIOCFG_REG;
|
||||
buf[1] = MAX3107_GPIODATA_REG;
|
||||
/* Perform SPI transfer */
|
||||
if (max3107_rw(s, (u8 *)buf, (u8 *)buf, 4)) {
|
||||
dev_err(&s->spi->dev, "SPI transfer gpio failed\n");
|
||||
return -EIO;
|
||||
}
|
||||
buf[0] &= MAX3107_SPI_RX_DATA_MASK;
|
||||
buf[1] &= MAX3107_SPI_RX_DATA_MASK;
|
||||
|
||||
/* Set GPIO to output */
|
||||
buf[0] |= (0x0001 << offset);
|
||||
/* Set value */
|
||||
if (value)
|
||||
buf[1] |= (0x0001 << offset);
|
||||
else
|
||||
buf[1] &= ~(0x0001 << offset);
|
||||
|
||||
/* Write new GPIO configuration and data register values */
|
||||
buf[0] |= (MAX3107_WRITE_BIT | MAX3107_GPIOCFG_REG);
|
||||
buf[1] |= (MAX3107_WRITE_BIT | MAX3107_GPIODATA_REG);
|
||||
/* Perform SPI transfer */
|
||||
if (max3107_rw(s, (u8 *)buf, NULL, 4)) {
|
||||
dev_err(&s->spi->dev,
|
||||
"SPI transfer for GPIO conf data w failed\n");
|
||||
return -EIO;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* GPIO value query function */
|
||||
static int max3107_gpio_get(struct gpio_chip *chip, unsigned offset)
|
||||
{
|
||||
struct max3107_port *s = container_of(chip, struct max3107_port, chip);
|
||||
u16 buf[1]; /* Buffer for SPI transfer */
|
||||
|
||||
if (offset >= MAX3107_GPIO_COUNT) {
|
||||
dev_err(&s->spi->dev, "Invalid GPIO\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
/* Read current GPIO data register */
|
||||
buf[0] = MAX3107_GPIODATA_REG;
|
||||
/* Perform SPI transfer */
|
||||
if (max3107_rw(s, (u8 *)buf, (u8 *)buf, 2)) {
|
||||
dev_err(&s->spi->dev, "SPI transfer GPIO data r failed\n");
|
||||
return -EIO;
|
||||
}
|
||||
buf[0] &= MAX3107_SPI_RX_DATA_MASK;
|
||||
|
||||
/* Return value */
|
||||
return buf[0] & (0x0001 << offset);
|
||||
}
|
||||
|
||||
/* GPIO value set function */
|
||||
static void max3107_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
|
||||
{
|
||||
struct max3107_port *s = container_of(chip, struct max3107_port, chip);
|
||||
u16 buf[2]; /* Buffer for SPI transfers */
|
||||
|
||||
if (offset >= MAX3107_GPIO_COUNT) {
|
||||
dev_err(&s->spi->dev, "Invalid GPIO\n");
|
||||
return;
|
||||
}
|
||||
|
||||
/* Read current GPIO configuration registers*/
|
||||
buf[0] = MAX3107_GPIODATA_REG;
|
||||
buf[1] = MAX3107_GPIOCFG_REG;
|
||||
/* Perform SPI transfer */
|
||||
if (max3107_rw(s, (u8 *)buf, (u8 *)buf, 4)) {
|
||||
dev_err(&s->spi->dev,
|
||||
"SPI transfer for GPIO data and config read failed\n");
|
||||
return;
|
||||
}
|
||||
buf[0] &= MAX3107_SPI_RX_DATA_MASK;
|
||||
buf[1] &= MAX3107_SPI_RX_DATA_MASK;
|
||||
|
||||
if (!(buf[1] & (0x0001 << offset))) {
|
||||
/* Configured as input, can't set value */
|
||||
dev_warn(&s->spi->dev,
|
||||
"Trying to set value for input GPIO\n");
|
||||
return;
|
||||
}
|
||||
|
||||
/* Set value */
|
||||
if (value)
|
||||
buf[0] |= (0x0001 << offset);
|
||||
else
|
||||
buf[0] &= ~(0x0001 << offset);
|
||||
|
||||
/* Write new GPIO data register value */
|
||||
buf[0] |= (MAX3107_WRITE_BIT | MAX3107_GPIODATA_REG);
|
||||
/* Perform SPI transfer */
|
||||
if (max3107_rw(s, (u8 *)buf, NULL, 2))
|
||||
dev_err(&s->spi->dev, "SPI transfer GPIO data w failed\n");
|
||||
}
|
||||
|
||||
/* GPIO chip data */
|
||||
static struct gpio_chip max3107_gpio_chip = {
|
||||
.owner = THIS_MODULE,
|
||||
.direction_input = max3107_gpio_direction_in,
|
||||
.direction_output = max3107_gpio_direction_out,
|
||||
.get = max3107_gpio_get,
|
||||
.set = max3107_gpio_set,
|
||||
.can_sleep = 1,
|
||||
.base = MAX3107_GPIO_BASE,
|
||||
.ngpio = MAX3107_GPIO_COUNT,
|
||||
};
|
||||
|
||||
/**
|
||||
* max3107_aava_reset - reset on AAVA systems
|
||||
* @spi: The SPI device we are probing
|
||||
*
|
||||
* Reset the device ready for probing.
|
||||
*/
|
||||
|
||||
static int max3107_aava_reset(struct spi_device *spi)
|
||||
{
|
||||
/* Reset the chip */
|
||||
if (gpio_request(MAX3107_RESET_GPIO, "max3107")) {
|
||||
pr_err("Requesting RESET GPIO failed\n");
|
||||
return -EIO;
|
||||
}
|
||||
if (gpio_direction_output(MAX3107_RESET_GPIO, 0)) {
|
||||
pr_err("Setting RESET GPIO to 0 failed\n");
|
||||
gpio_free(MAX3107_RESET_GPIO);
|
||||
return -EIO;
|
||||
}
|
||||
msleep(MAX3107_RESET_DELAY);
|
||||
if (gpio_direction_output(MAX3107_RESET_GPIO, 1)) {
|
||||
pr_err("Setting RESET GPIO to 1 failed\n");
|
||||
gpio_free(MAX3107_RESET_GPIO);
|
||||
return -EIO;
|
||||
}
|
||||
gpio_free(MAX3107_RESET_GPIO);
|
||||
msleep(MAX3107_WAKEUP_DELAY);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int max3107_aava_configure(struct max3107_port *s)
|
||||
{
|
||||
int retval;
|
||||
|
||||
/* Initialize GPIO chip data */
|
||||
s->chip = max3107_gpio_chip;
|
||||
s->chip.label = s->spi->modalias;
|
||||
s->chip.dev = &s->spi->dev;
|
||||
|
||||
/* Add GPIO chip */
|
||||
retval = gpiochip_add(&s->chip);
|
||||
if (retval) {
|
||||
dev_err(&s->spi->dev, "Adding GPIO chip failed\n");
|
||||
return retval;
|
||||
}
|
||||
|
||||
/* Temporary fix for EV2 boot problems, set modem reset to 0 */
|
||||
max3107_gpio_direction_out(&s->chip, 3, 0);
|
||||
return 0;
|
||||
}
|
||||
|
||||
#if 0
|
||||
/* This will get enabled once we have the board stuff merged for this
|
||||
specific case */
|
||||
|
||||
static const struct baud_table brg13_ext[] = {
|
||||
{ 300, MAX3107_BRG13_B300 },
|
||||
{ 600, MAX3107_BRG13_B600 },
|
||||
{ 1200, MAX3107_BRG13_B1200 },
|
||||
{ 2400, MAX3107_BRG13_B2400 },
|
||||
{ 4800, MAX3107_BRG13_B4800 },
|
||||
{ 9600, MAX3107_BRG13_B9600 },
|
||||
{ 19200, MAX3107_BRG13_B19200 },
|
||||
{ 57600, MAX3107_BRG13_B57600 },
|
||||
{ 115200, MAX3107_BRG13_B115200 },
|
||||
{ 230400, MAX3107_BRG13_B230400 },
|
||||
{ 460800, MAX3107_BRG13_B460800 },
|
||||
{ 921600, MAX3107_BRG13_B921600 },
|
||||
{ 0, 0 }
|
||||
};
|
||||
|
||||
static void max3107_aava_init(struct max3107_port *s)
|
||||
{
|
||||
/*override for AAVA SC specific*/
|
||||
if (mrst_platform_id() == MRST_PLATFORM_AAVA_SC) {
|
||||
if (get_koski_build_id() <= KOSKI_EV2)
|
||||
if (s->ext_clk) {
|
||||
s->brg_cfg = MAX3107_BRG13_B9600;
|
||||
s->baud_tbl = (struct baud_table *)brg13_ext;
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
static int __devexit max3107_aava_remove(struct spi_device *spi)
|
||||
{
|
||||
struct max3107_port *s = dev_get_drvdata(&spi->dev);
|
||||
|
||||
/* Remove GPIO chip */
|
||||
if (gpiochip_remove(&s->chip))
|
||||
dev_warn(&spi->dev, "Removing GPIO chip failed\n");
|
||||
|
||||
/* Then do the default remove */
|
||||
return max3107_remove(spi);
|
||||
}
|
||||
|
||||
/* Platform data */
|
||||
static struct max3107_plat aava_plat_data = {
|
||||
.loopback = 0,
|
||||
.ext_clk = 1,
|
||||
/* .init = max3107_aava_init, */
|
||||
.configure = max3107_aava_configure,
|
||||
.hw_suspend = max3107_hw_susp,
|
||||
.polled_mode = 0,
|
||||
.poll_time = 0,
|
||||
};
|
||||
|
||||
|
||||
static int __devinit max3107_probe_aava(struct spi_device *spi)
|
||||
{
|
||||
int err = max3107_aava_reset(spi);
|
||||
if (err < 0)
|
||||
return err;
|
||||
return max3107_probe(spi, &aava_plat_data);
|
||||
}
|
||||
|
||||
/* Spi driver data */
|
||||
static struct spi_driver max3107_driver = {
|
||||
.driver = {
|
||||
.name = "aava-max3107",
|
||||
.owner = THIS_MODULE,
|
||||
},
|
||||
.probe = max3107_probe_aava,
|
||||
.remove = __devexit_p(max3107_aava_remove),
|
||||
.suspend = max3107_suspend,
|
||||
.resume = max3107_resume,
|
||||
};
|
||||
|
||||
/* Driver init function */
|
||||
static int __init max3107_init(void)
|
||||
{
|
||||
return spi_register_driver(&max3107_driver);
|
||||
}
|
||||
|
||||
/* Driver exit function */
|
||||
static void __exit max3107_exit(void)
|
||||
{
|
||||
spi_unregister_driver(&max3107_driver);
|
||||
}
|
||||
|
||||
module_init(max3107_init);
|
||||
module_exit(max3107_exit);
|
||||
|
||||
MODULE_DESCRIPTION("MAX3107 driver");
|
||||
MODULE_AUTHOR("Aavamobile");
|
||||
MODULE_ALIAS("spi:aava-max3107");
|
||||
MODULE_LICENSE("GPL v2");
|
||||
|
|
@ -1160,7 +1160,7 @@ static struct uart_driver serial_omap_reg = {
|
|||
.cons = OMAP_CONSOLE,
|
||||
};
|
||||
|
||||
#ifdef CONFIG_SUSPEND
|
||||
#ifdef CONFIG_PM_SLEEP
|
||||
static int serial_omap_suspend(struct device *dev)
|
||||
{
|
||||
struct uart_omap_port *up = dev_get_drvdata(dev);
|
||||
|
|
@ -1521,6 +1521,7 @@ static void serial_omap_mdr1_errataset(struct uart_omap_port *up, u8 mdr1)
|
|||
}
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PM_RUNTIME
|
||||
static void serial_omap_restore_context(struct uart_omap_port *up)
|
||||
{
|
||||
if (up->errata & UART_ERRATA_i202_MDR1_ACCESS)
|
||||
|
|
@ -1550,7 +1551,6 @@ static void serial_omap_restore_context(struct uart_omap_port *up)
|
|||
serial_out(up, UART_OMAP_MDR1, up->mdr1);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PM_RUNTIME
|
||||
static int serial_omap_runtime_suspend(struct device *dev)
|
||||
{
|
||||
struct uart_omap_port *up = dev_get_drvdata(dev);
|
||||
|
|
|
|||
|
|
@ -2348,11 +2348,11 @@ int uart_add_one_port(struct uart_driver *drv, struct uart_port *uport)
|
|||
*/
|
||||
tty_dev = tty_register_device(drv->tty_driver, uport->line, uport->dev);
|
||||
if (likely(!IS_ERR(tty_dev))) {
|
||||
device_init_wakeup(tty_dev, 1);
|
||||
device_set_wakeup_enable(tty_dev, 0);
|
||||
} else
|
||||
device_set_wakeup_capable(tty_dev, 1);
|
||||
} else {
|
||||
printk(KERN_ERR "Cannot register tty device on line %d\n",
|
||||
uport->line);
|
||||
}
|
||||
|
||||
/*
|
||||
* Ensure UPF_DEAD is not set.
|
||||
|
|
|
|||
|
|
@ -227,7 +227,6 @@ int tty_port_block_til_ready(struct tty_port *port,
|
|||
int do_clocal = 0, retval;
|
||||
unsigned long flags;
|
||||
DEFINE_WAIT(wait);
|
||||
int cd;
|
||||
|
||||
/* block if port is in the process of being closed */
|
||||
if (tty_hung_up_p(filp) || port->flags & ASYNC_CLOSING) {
|
||||
|
|
@ -284,11 +283,14 @@ int tty_port_block_til_ready(struct tty_port *port,
|
|||
retval = -ERESTARTSYS;
|
||||
break;
|
||||
}
|
||||
/* Probe the carrier. For devices with no carrier detect this
|
||||
will always return true */
|
||||
cd = tty_port_carrier_raised(port);
|
||||
/*
|
||||
* Probe the carrier. For devices with no carrier detect
|
||||
* tty_port_carrier_raised will always return true.
|
||||
* Never ask drivers if CLOCAL is set, this causes troubles
|
||||
* on some hardware.
|
||||
*/
|
||||
if (!(port->flags & ASYNC_CLOSING) &&
|
||||
(do_clocal || cd))
|
||||
(do_clocal || tty_port_carrier_raised(port)))
|
||||
break;
|
||||
if (signal_pending(current)) {
|
||||
retval = -ERESTARTSYS;
|
||||
|
|
|
|||
Loading…
Reference in New Issue