sparc32,leon: move leon ASI definitions to asi.h

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Cc: Konrad Eisele <konrad@gaisler.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/arch/sparc/include/asm/asi.h b/arch/sparc/include/asm/asi.h
index b2e3db63a64bba11e6990d08cf5940fb62874742..cbb93e5141de0ff27d4d0197363fff3c23397e9b 100644 (file)
--- a/arch/sparc/include/asm/asi.h
+++ b/arch/sparc/include/asm/asi.h
@@ -112,6 +112,20 @@
 
 #define ASI_M_ACTION       0x4c   /* Breakpoint Action Register (GNU/Viking) */
 
+/* LEON ASI */
+#define ASI_LEON_NOCACHE        0x01
+
+#define ASI_LEON_DCACHE_MISS    0x01
+
+#define ASI_LEON_CACHEREGS      0x02
+#define ASI_LEON_IFLUSH         0x10
+#define ASI_LEON_DFLUSH         0x11
+
+#define ASI_LEON_MMUFLUSH       0x18
+#define ASI_LEON_MMUREGS        0x19
+#define ASI_LEON_BYPASS         0x1c
+#define ASI_LEON_FLUSH_PAGE     0x10
+
 /* V9 Architecture mandary ASIs. */
 #define ASI_N                  0x04 /* Nucleus                         */
 #define ASI_NL                 0x0c /* Nucleus, little endian          */

diff --git a/arch/sparc/include/asm/leon.h b/arch/sparc/include/asm/leon.h
index 8095be271825e9512ba773410d0e2d533ad5b80f..ce76f402b5bfe80b90f728148dc69f2f11529b99 100644 (file)
--- a/arch/sparc/include/asm/leon.h
+++ b/arch/sparc/include/asm/leon.h
@@ -10,19 +10,6 @@
 
 #ifdef CONFIG_SPARC_LEON
 
-#define ASI_LEON_NOCACHE       0x01
-
-#define ASI_LEON_DCACHE_MISS   0x1
-
-#define ASI_LEON_CACHEREGS     0x02
-#define ASI_LEON_IFLUSH                0x10
-#define ASI_LEON_DFLUSH                0x11
-
-#define ASI_LEON_MMUFLUSH      0x18
-#define ASI_LEON_MMUREGS       0x19
-#define ASI_LEON_BYPASS                0x1c
-#define ASI_LEON_FLUSH_PAGE    0x10
-
 /* mmu register access, ASI_LEON_MMUREGS */
 #define LEON_CNR_CTRL          0x000
 #define LEON_CNR_CTXP          0x100