Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2d0cfb52 authored by Patrick Gefre's avatar Patrick Gefre Committed by Linus Torvalds
Browse files

[PATCH] Altix: ioc3 serial support 



Add driver support for a 2 port PCI IOC3-based serial card on Altix boxes:

This is a re-submission.  On the original submission I was asked to
organize the code so that the MIPS ioc3 ethernet and serial parts could be
used with this driver.  Stanislaw Skowronek was kind enough to provide the
shim layer for this - thanks Stanislaw.  This patch includes the shim layer
and the Altix PCI ioc3 serial driver.  The MIPS merged ioc3 ethernet and
serial support is forthcoming.

Signed-off-by: default avatarPatrick Gefre <pfg@sgi.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 7170be5f

arch/ia64/configs/gensparse_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -701,6 +701,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y 
CONFIG_SERIAL_SGI_L1_CONSOLE=y

# CONFIG_SERIAL_JSM is not set

CONFIG_SERIAL_SGI_IOC4=y

CONFIG_SERIAL_SGI_IOC3=y

CONFIG_UNIX98_PTYS=y

CONFIG_LEGACY_PTYS=y

CONFIG_LEGACY_PTY_COUNT=256
@@ -1046,6 +1047,7 @@ CONFIG_INFINIBAND_IPOIB=m 
# SN Devices

#

CONFIG_SGI_IOC4=y

CONFIG_SGI_IOC3=y



#

# File systems

arch/ia64/configs/sn2_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -659,6 +659,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y 
CONFIG_SERIAL_SGI_L1_CONSOLE=y

# CONFIG_SERIAL_JSM is not set

CONFIG_SERIAL_SGI_IOC4=y

CONFIG_SERIAL_SGI_IOC3=y

CONFIG_UNIX98_PTYS=y

CONFIG_LEGACY_PTYS=y

CONFIG_LEGACY_PTY_COUNT=256
@@ -899,6 +900,7 @@ CONFIG_INFINIBAND_SRP=m 
# SN Devices

#

CONFIG_SGI_IOC4=y

CONFIG_SGI_IOC3=y



#

# File systems

drivers/serial/Kconfig

+8 −1
Original line number Diff line number Diff line
@@ -190,7 +190,6 @@ config SERIAL_8250_BOCA 
	  To compile this driver as a module, choose M here: the module

	  will be called 8250_boca.





config SERIAL_8250_HUB6

	tristate "Support Hub6 cards"

	depends on SERIAL_8250 != n && ISA && SERIAL_8250_MANY_PORTS
@@ -917,4 +916,12 @@ config SERIAL_SGI_IOC4 
		and wish to use the serial ports on this card, say Y.

		Otherwise, say N.



config SERIAL_SGI_IOC3

	tristate "SGI Altix IOC3 serial support"

	depends on (IA64_GENERIC || IA64_SGI_SN2) && SGI_IOC3

	select SERIAL_CORE

	help

	  If you have an SGI Altix with an IOC3 serial card,

	  say Y or M.  Otherwise, say N.



endmenu

drivers/serial/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -56,4 +56,5 @@ obj-$(CONFIG_SERIAL_JSM) += jsm/ 
obj-$(CONFIG_SERIAL_TXX9) += serial_txx9.o

obj-$(CONFIG_SERIAL_VR41XX) += vr41xx_siu.o

obj-$(CONFIG_SERIAL_SGI_IOC4) += ioc4_serial.o

obj-$(CONFIG_SERIAL_SGI_IOC3) += ioc3_serial.o

obj-$(CONFIG_SERIAL_AT91) += at91_serial.o

drivers/serial/ioc3_serial.c

0 → 100644
+2197 −0

File added.

Preview size limit exceeded, changes collapsed.