aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/Kconfig
diff options
context:
space:
mode:
authorAlessandro Rubini <rubini@gnudd.com>2012-04-04 13:40:21 -0400
committerH. Peter Anvin <hpa@zytor.com>2012-04-12 14:10:30 -0400
commit83125a3a189ec34fb22a04e8efad69ae6d52674a (patch)
tree34ba6fae7691402945c99e78c859c026f6ab8213 /arch/x86/Kconfig
parentf7219a5300ba753b0c762d631763bd878b8bb00c (diff)
x86, platform: Initial support for sta2x11 I/O hub
The "ConneXt" sta2x11 I/O Hub is a bridge from PCIe to AMBA, and is used as main chipset in some Atom boards. The set of peripherals it exports live in an AMBA bus internal to the chip, so a custom remapping of addresses is needed. This is implemented by fixup calls for the PCI deivices, based on CONFIG_X86_DEV_DMA_OPS and CONFIG_X86_DMA_REMAP . Signed-off-by: Alessandro Rubini <rubini@gnudd.com> Link: http://lkml.kernel.org/r/ddca670ca8180e52d49b3fe642742ddd23ab2cb2.1333560789.git.rubini@gnudd.com Acked-by: Giancarlo Asnaghi <giancarlo.asnaghi@st.com> Cc: Alan Cox <alan@linux.intel.com> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r--arch/x86/Kconfig28
1 files changed, 23 insertions, 5 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 95ca56036030..f9ed801abaf9 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -329,6 +329,7 @@ config X86_EXTENDED_PLATFORM
329 NUMAQ (IBM/Sequent) 329 NUMAQ (IBM/Sequent)
330 RDC R-321x SoC 330 RDC R-321x SoC
331 SGI 320/540 (Visual Workstation) 331 SGI 320/540 (Visual Workstation)
332 STA2X11-based (e.g. Northville)
332 Summit/EXA (IBM x440) 333 Summit/EXA (IBM x440)
333 Unisys ES7000 IA32 series 334 Unisys ES7000 IA32 series
334 Moorestown MID devices 335 Moorestown MID devices
@@ -461,10 +462,10 @@ config X86_32_NON_STANDARD
461 depends on X86_32 && SMP 462 depends on X86_32 && SMP
462 depends on X86_EXTENDED_PLATFORM 463 depends on X86_EXTENDED_PLATFORM
463 ---help--- 464 ---help---
464 This option compiles in the NUMAQ, Summit, bigsmp, ES7000, default 465 This option compiles in the NUMAQ, Summit, bigsmp, ES7000,
465 subarchitectures. It is intended for a generic binary kernel. 466 STA2X11, default subarchitectures. It is intended for a generic
466 if you select them all, kernel will probe it one by one. and will 467 binary kernel. If you select them all, kernel will probe it
467 fallback to default. 468 one by one and will fallback to default.
468 469
469# Alphabetically sorted list of Non standard 32 bit platforms 470# Alphabetically sorted list of Non standard 32 bit platforms
470 471
@@ -504,6 +505,22 @@ config X86_VISWS
504 A kernel compiled for the Visual Workstation will run on general 505 A kernel compiled for the Visual Workstation will run on general
505 PCs as well. See <file:Documentation/sgi-visws.txt> for details. 506 PCs as well. See <file:Documentation/sgi-visws.txt> for details.
506 507
508config STA2X11
509 bool "STA2X11 Companion Chip Support"
510 depends on X86_32_NON_STANDARD && PCI
511 select X86_DEV_DMA_OPS
512 select X86_DMA_REMAP
513 select SWIOTLB
514 select MFD_STA2X11
515 select ARCH_REQUIRE_GPIOLIB
516 default n
517 ---help---
518 This adds support for boards based on the STA2X11 IO-Hub,
519 a.k.a. "ConneXt". The chip is used in place of the standard
520 PC chipset, so all "standard" peripherals are missing. If this
521 option is selected the kernel will still be able to boot on
522 standard PC machines.
523
507config X86_SUMMIT 524config X86_SUMMIT
508 bool "Summit/EXA (IBM x440)" 525 bool "Summit/EXA (IBM x440)"
509 depends on X86_32_NON_STANDARD 526 depends on X86_32_NON_STANDARD
@@ -2218,10 +2235,11 @@ config HAVE_TEXT_POKE_SMP
2218 2235
2219config X86_DEV_DMA_OPS 2236config X86_DEV_DMA_OPS
2220 bool 2237 bool
2221 depends on X86_64 2238 depends on X86_64 || STA2X11
2222 2239
2223config X86_DMA_REMAP 2240config X86_DMA_REMAP
2224 bool 2241 bool
2242 depends on STA2X11
2225 2243
2226source "net/Kconfig" 2244source "net/Kconfig"
2227 2245