Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull Intel Quark SoC support from Ingo Molnar:
 "This adds support for Intel Quark X1000 SoC boards, used in the low
  power 32-bit x86 Intel Galileo microcontroller board intended for the
  Arduino space.

  There's been some preparatory core x86 patches for Quark CPU quirks
  merged already, but this rounds it all up and adds Kconfig enablement.
  It's a clean hardware enablement addition tree at this point"

* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/intel/quark: Fix simple_return.cocci warnings
  x86/intel/quark: Fix ptr_ret.cocci warnings
  x86/intel/quark: Add Intel Quark platform support
  x86/intel/quark: Add Isolated Memory Regions for Quark X1000

1 files changed, 25 insertions, 0 deletions

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 638e797037da..97527614141b 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -735,6 +735,31 @@ config INTEL_IPS
           functionality.  If in doubt, say Y here; it will only load on
           supported platforms.
 
+config INTEL_IMR
+        bool "Intel Isolated Memory Region support"
+        default n
+        depends on X86_INTEL_QUARK && IOSF_MBI
+        ---help---
+          This option provides a means to manipulate Isolated Memory Regions.
+          IMRs are a set of registers that define read and write access masks
+          to prohibit certain system agents from accessing memory with 1 KiB
+          granularity.
+
+          IMRs make it possible to control read/write access to an address
+          by hardware agents inside the SoC. Read and write masks can be
+          defined for:
+                - eSRAM flush
+                - Dirty CPU snoop (write only)
+                - RMU access
+                - PCI Virtual Channel 0/Virtual Channel 1
+                - SMM mode
+                - Non SMM mode
+
+          Quark contains a set of eight IMR registers and makes use of those
+          registers during its bootup process.
+
+          If you are running on a Galileo/Quark say Y here.
+
 config IBM_RTL
         tristate "Device driver to enable PRTL support"
         depends on X86 && PCI