Merge tag 'm68k-for-v5.3-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert...

[linux.git] / include / linux / ioport.h

diff --git a/include/linux/ioport.h b/include/linux/ioport.h
index da0ebaec25f0a1648d36e5edaf7fe5e9c0d5493b..5db386cfc2d48d34e34352e8b6a202a33b05840c 100644 (file)
--- a/include/linux/ioport.h
+++ b/include/linux/ioport.h
@@ -12,6 +12,7 @@
 #ifndef __ASSEMBLY__
 #include <linux/compiler.h>
 #include <linux/types.h>
+#include <linux/bits.h>
 /*
  * Resources are tree-like, allowing
  * nesting etc..
@@ -133,6 +134,15 @@ enum {
        IORES_DESC_PERSISTENT_MEMORY_LEGACY     = 5,
        IORES_DESC_DEVICE_PRIVATE_MEMORY        = 6,
        IORES_DESC_DEVICE_PUBLIC_MEMORY         = 7,
+       IORES_DESC_RESERVED                     = 8,
+};
+
+/*
+ * Flags controlling ioremap() behavior.
+ */
+enum {
+       IORES_MAP_SYSTEM_RAM            = BIT(0),
+       IORES_MAP_ENCRYPTED             = BIT(1),
 };
 
 /* helpers to define resources */