Merge branch 'stable-3.18' of git://git.infradead.org/users/pcmoore/selinux into...

[firefly-linux-kernel-4.4.55.git] / arch / x86 / Kconfig

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 3eb8a41509b3d8ab531da89df39b20389793b23a..f2327e88e07cc64236636a9f5973af898be947f1 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -491,6 +491,36 @@ config X86_INTEL_LPSS
          things like clock tree (common clock framework) and pincontrol
          which are needed by the LPSS peripheral drivers.
 
+config IOSF_MBI
+       tristate "Intel SoC IOSF Sideband support for SoC platforms"
+       depends on PCI
+       ---help---
+         This option enables sideband register access support for Intel SoC
+         platforms. On these platforms the IOSF sideband is used in lieu of
+         MSR's for some register accesses, mostly but not limited to thermal
+         and power. Drivers may query the availability of this device to
+         determine if they need the sideband in order to work on these
+         platforms. The sideband is available on the following SoC products.
+         This list is not meant to be exclusive.
+          - BayTrail
+          - Braswell
+          - Quark
+
+         You should say Y if you are running a kernel on one of these SoC's.
+
+config IOSF_MBI_DEBUG
+       bool "Enable IOSF sideband access through debugfs"
+       depends on IOSF_MBI && DEBUG_FS
+       ---help---
+         Select this option to expose the IOSF sideband access registers (MCR,
+         MDR, MCRX) through debugfs to write and read register information from
+         different units on the SoC. This is most useful for obtaining device
+         state information for debug and analysis. As this is a general access
+         mechanism, users of this option would have specific knowledge of the
+         device they want to access.
+
+         If you don't require the option or are in doubt, say N.
+
 config X86_RDC321X
        bool "RDC R-321x SoC"
        depends on X86_32
@@ -2454,11 +2484,6 @@ config X86_DMA_REMAP
        bool
        depends on STA2X11
 
-config IOSF_MBI
-       tristate
-       default m
-       depends on PCI
-
 config PMC_ATOM
        def_bool y
         depends on PCI