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

Commit e5d310b3 authored by Brent Casavant's avatar Brent Casavant Committed by Linus Torvalds
Browse files

[PATCH] ioc4: CONFIG split 



The SGI IOC4 I/O controller chip drivers are currently all configured by
CONFIG_BLK_DEV_SGIIOC4.  This is undesirable as not all IOC4 hardware features
are needed by all systems.

This patch adds two configuration variables, CONFIG_SGI_IOC4 for core IOC4
driver support (see patch 1/3 in this series for further explanation) and
CONFIG_SERIAL_SGI_IOC4 to independently enable serial port support.

Signed-off-by: default avatarBrent Casavant <bcasavan@sgi.com>
Acked-by: default avatarPat Gefre <pfg@sgi.com>
Acked-by: default avatarJeremy Higdon <jeremy@sgi.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 22329b51

arch/ia64/configs/sn2_defconfig

+6 −0
Original line number Diff line number Diff line
@@ -588,6 +588,7 @@ CONFIG_SGI_MBCS=m 
CONFIG_SERIAL_CORE=y

CONFIG_SERIAL_CORE_CONSOLE=y

CONFIG_SERIAL_SGI_L1_CONSOLE=y

CONFIG_SERIAL_SGI_IOC4=y

CONFIG_UNIX98_PTYS=y

CONFIG_LEGACY_PTYS=y

CONFIG_LEGACY_PTY_COUNT=256
@@ -787,6 +788,11 @@ CONFIG_INFINIBAND_MTHCA=m 
CONFIG_INFINIBAND_IPOIB=m

# CONFIG_INFINIBAND_IPOIB_DEBUG is not set



#

# SN Devices

#

CONFIG_SGI_IOC4=y



#

# File systems

#

arch/ia64/defconfig

+6 −0
Original line number Diff line number Diff line
@@ -638,6 +638,7 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y 
CONFIG_SERIAL_CORE=y

CONFIG_SERIAL_CORE_CONSOLE=y

CONFIG_SERIAL_SGI_L1_CONSOLE=y

CONFIG_SERIAL_SGI_IOC4=y

CONFIG_UNIX98_PTYS=y

CONFIG_LEGACY_PTYS=y

CONFIG_LEGACY_PTY_COUNT=256
@@ -942,6 +943,11 @@ CONFIG_INFINIBAND_MTHCA=m 
CONFIG_INFINIBAND_IPOIB=m

# CONFIG_INFINIBAND_IPOIB_DEBUG is not set



#

# SN Devices

#

CONFIG_SGI_IOC4=y



#

# File systems

#

drivers/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -58,4 +58,6 @@ source "drivers/mmc/Kconfig" 


source "drivers/infiniband/Kconfig"



source "drivers/sn/Kconfig"



endmenu

drivers/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -61,6 +61,6 @@ obj-$(CONFIG_EISA) += eisa/ 
obj-$(CONFIG_CPU_FREQ)		+= cpufreq/

obj-$(CONFIG_MMC)		+= mmc/

obj-$(CONFIG_INFINIBAND)	+= infiniband/

obj-$(CONFIG_BLK_DEV_SGIIOC4)	+= sn/

obj-$(CONFIG_SGI_IOC4)		+= sn/

obj-y				+= firmware/

obj-$(CONFIG_CRYPTO)		+= crypto/

drivers/ide/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -672,8 +672,8 @@ config BLK_DEV_SVWKS 
	  chipsets.



config BLK_DEV_SGIIOC4

	tristate "Silicon Graphics IOC4 chipset support"

	depends on IA64_SGI_SN2 || IA64_GENERIC

	tristate "Silicon Graphics IOC4 chipset ATA/ATAPI support"

	depends on (IA64_SGI_SN2 || IA64_GENERIC) && SGI_IOC4

	help

	  This driver adds PIO & MultiMode DMA-2 support for the SGI IOC4

	  chipset, which has one channel and can support two devices.