make hardware.h a forward inclusion of mcs814x.h

mach/hardware.h is soon to be removed by upstream kernel

SVN-Revision: 32487

diff --git a/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/board-mcs8140-dt.c b/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/board-mcs8140-dt.c
index f197fab9e7cd1bc6a84247f1e365f37428d49f61..766166b05508953338e5544f91c3edf283e1be45 100644 (file)
--- a/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/board-mcs8140-dt.c
+++ b/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/board-mcs8140-dt.c
@@ -12,7 +12,6 @@
 #include <linux/irqdomain.h>
 #include <linux/of_platform.h>
 
-#include <mach/hardware.h>
 #include "common.h"
 
 #include <asm/setup.h>

diff --git a/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/clock.c b/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/clock.c
index b5d2a445b521f1454eee26595c9c1aea499e2317..99e31c9b34de445fccc33896f7316271cca39c29 100644 (file)
--- a/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/clock.c
+++ b/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/clock.c
@@ -14,7 +14,7 @@
 #include <linux/clkdev.h>
 #include <linux/clk.h>
 
-#include <mach/hardware.h>
+#include <mach/mcs814x.h>
 
 /* System configuration registers offsets */
 #define SYSDBG_BS1     0x00

diff --git a/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/common.c b/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/common.c
index c593561e24d4b1b01aa5af8f72c1e11c602f0c9e..cae6aaa26b0b998644f73a98810b9fed45b6e26b 100644 (file)
--- a/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/common.c
+++ b/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/common.c
@@ -18,7 +18,7 @@
 #include <asm/setup.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
-#include <mach/hardware.h>
+#include <mach/mcs814x.h>
 #include <mach/cpu.h>
 #include <asm/pgtable.h>
 #include <asm/mach/map.h>

diff --git a/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/include/mach/debug-macro.S b/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/include/mach/debug-macro.S
index 1f6cad90f76a1f10c34d654f961c160dca5f5566..5c6d373ae707c414701aff024a71951af4d73bcd 100644 (file)
--- a/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/include/mach/debug-macro.S
+++ b/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/include/mach/debug-macro.S
@@ -1,4 +1,4 @@
-#include <mach/hardware.h>
+#include <mach/mcs814x.h>
 
                 .macro  addruart, rp, rv, tmp
                ldr     \rp, =_PHYS_CONFADDR

diff --git a/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/include/mach/entry-macro.S b/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/include/mach/entry-macro.S
index 58ad30ea0a151010611883dd470b9eba629cbb14..eaca5921c6a8a7c9d71b3bddeef5280ab9e66bed 100644 (file)
--- a/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/include/mach/entry-macro.S
+++ b/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/include/mach/entry-macro.S
@@ -1,4 +1,4 @@
-#include <mach/hardware.h>
+#include <mach/mcs814x.h>
                 .macro  disable_fiq
                 .endm
 

diff --git a/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/include/mach/hardware.h b/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/include/mach/hardware.h
index 6fb243c37eafbcd96eed32cb48d79c5cd112310f..529f648ae636bb27b0cb25463d41099b3229d6a0 100644 (file)
--- a/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/include/mach/hardware.h
+++ b/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/include/mach/hardware.h
@@ -10,25 +10,7 @@
 #ifndef __ASM_ARCH_HARDWARE_H
 #define __ASM_ARCH_HARDWARE_H
 
-#define MCS814X_IO_BASE                0xF0000000
-#define MCS814X_IO_START       0x40000000
-#define MCS814X_IO_SIZE                0x00100000
-
-/* IRQ controller register offset */
-#define MCS814X_IRQ_ICR                0x00
-#define MCS814X_IRQ_ISR                0x04
-#define MCS814X_IRQ_MASK       0x20
-#define MCS814X_IRQ_STS0       0x40
-
-#define _PHYS_CONFADDR         0x40000000
-#define _VIRT_CONFADDR         MCS814X_IO_BASE
-
-#define _CONFOFFSET_UART    0x000DC000
-#define _CONFOFFSET_DBGLED  0x000EC000
-#define _CONFOFFSET_SYSDBG  0x000F8000
-
-#define _CONFADDR_DBGLED  (_VIRT_CONFADDR + _CONFOFFSET_DBGLED)
-#define _CONFADDR_SYSDBG  (_VIRT_CONFADDR + _CONFOFFSET_SYSDBG)
+#include "mcs814x.h"
 
 #endif
 

diff --git a/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/include/mach/mcs814x.h b/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/include/mach/mcs814x.h
new file mode 100644 (file)
index 0000000..9ae93b4
--- /dev/null
+++ b/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/include/mach/mcs814x.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2003 Artec Design Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ */
+
+#ifndef __ASM_ARCH_MCS814X_H
+#define __ASM_ARCH_MCS814X_H
+
+#define MCS814X_IO_BASE                0xF0000000
+#define MCS814X_IO_START       0x40000000
+#define MCS814X_IO_SIZE                0x00100000
+
+/* IRQ controller register offset */
+#define MCS814X_IRQ_ICR                0x00
+#define MCS814X_IRQ_ISR                0x04
+#define MCS814X_IRQ_MASK       0x20
+#define MCS814X_IRQ_STS0       0x40
+
+#define _PHYS_CONFADDR         0x40000000
+#define _VIRT_CONFADDR         MCS814X_IO_BASE
+
+#define _CONFOFFSET_UART    0x000DC000
+#define _CONFOFFSET_DBGLED  0x000EC000
+#define _CONFOFFSET_SYSDBG  0x000F8000
+
+#define _CONFADDR_DBGLED  (_VIRT_CONFADDR + _CONFOFFSET_DBGLED)
+#define _CONFADDR_SYSDBG  (_VIRT_CONFADDR + _CONFOFFSET_SYSDBG)
+
+#endif /* __ASM_ARCH_MCS814X_H */
+

diff --git a/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/include/mach/uncompress.h b/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/include/mach/uncompress.h
index 717f1411fc0352f81e908421e624f6383cedd958..2362e3c95e85de051e126d4dd0da174724df6187 100644 (file)
--- a/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/include/mach/uncompress.h
+++ b/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/include/mach/uncompress.h
@@ -11,7 +11,7 @@
 
 #include <linux/serial_reg.h>
 #include <asm/io.h>
-#include <mach/hardware.h>
+#include <mach/mcs814x.h>
 #include <mach/cpu.h>
 
 #define UART_SHIFT     (2)

diff --git a/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/irq.c b/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/irq.c
index 207a09c8343ed3b268a0806a6ce144f5f40b04b1..e2ce52a69af885b7d16285ba50682528f3e43ac9 100644 (file)
--- a/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/irq.c
+++ b/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/irq.c
@@ -14,7 +14,7 @@
 
 #include <asm/exception.h>
 #include <asm/mach/irq.h>
-#include <mach/hardware.h>
+#include <mach/mcs814x.h>
 
 void __iomem *mcs814x_intc_base;
 

diff --git a/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/pci.c b/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/pci.c
index 61f8bf571f5fa8ab00f3f88e6d9e07c37e4fbf4a..a871aa86c3746ab3f18d424c726c7fbb389fa35f 100644 (file)
--- a/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/pci.c
+++ b/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/pci.c
@@ -27,7 +27,7 @@
 #include <asm/system.h>
 #include <asm/mach/pci.h>
 #include <asm/mach/map.h>
-#include <mach/hardware.h>
+#include <mach/mcs814x.h>
 #include <mach/irqs.h>
 
 #define MCS8140_PCI_CONFIG_SIZE                SZ_64M

diff --git a/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/timer.c b/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/timer.c
index f515c0b822afbb251723b31ba07a148242e49255..e1f3730383d09cd5d5a9d23e132248ff6df29e7b 100644 (file)
--- a/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/timer.c
+++ b/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/timer.c
@@ -17,7 +17,7 @@
 #include <linux/of_address.h>
 
 #include <asm/mach/time.h>
-#include <mach/hardware.h>
+#include <mach/mcs814x.h>
 
 /* Timer block registers */
 #define TIMER_VAL      0x00