From a8965f0005ff85d653a1fb579017a3df4a500b5d Mon Sep 17 00:00:00 2001
From: Florian Fainelli <florian@openwrt.org>
Date: Sat, 23 Jun 2012 11:03:40 +0000
Subject: [PATCH] make hardware.h a forward inclusion of mcs814x.h
mach/hardware.h is soon to be removed by upstream kernel
SVN-Revision: 32487
---
.../arch/arm/mach-mcs814x/board-mcs8140-dt.c | 1 -
.../files-3.3/arch/arm/mach-mcs814x/clock.c | 2 +-
.../files-3.3/arch/arm/mach-mcs814x/common.c | 2 +-
.../mach-mcs814x/include/mach/debug-macro.S | 2 +-
.../mach-mcs814x/include/mach/entry-macro.S | 2 +-
.../arm/mach-mcs814x/include/mach/hardware.h | 20 +----------
.../arm/mach-mcs814x/include/mach/mcs814x.h | 34 +++++++++++++++++++
.../mach-mcs814x/include/mach/uncompress.h | 2 +-
.../files-3.3/arch/arm/mach-mcs814x/irq.c | 2 +-
.../files-3.3/arch/arm/mach-mcs814x/pci.c | 2 +-
.../files-3.3/arch/arm/mach-mcs814x/timer.c | 2 +-
11 files changed, 43 insertions(+), 28 deletions(-)
create mode 100644 target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/include/mach/mcs814x.h
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 f197fab9e7..766166b055 100644
--- 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 b5d2a445b5..99e31c9b34 100644
--- 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 c593561e24..cae6aaa26b 100644
--- 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 1f6cad90f7..5c6d373ae7 100644
--- 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 58ad30ea0a..eaca5921c6 100644
--- 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 6fb243c37e..529f648ae6 100644
--- 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
index 0000000000..9ae93b42c5
--- /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 717f1411fc..2362e3c95e 100644
--- 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 207a09c834..e2ce52a69a 100644
--- 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 61f8bf571f..a871aa86c3 100644
--- 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 f515c0b822..e1f3730383 100644
--- 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
--
GitLab