[PATCH 24/39] MIPS: lasat: Add header file path prefix

From: bibo mao
Date: Mon Mar 30 2020 - 04:59:56 EST

Next message: bibo mao: "[PATCH 25/39] MIPS: pic32: Add header file path prefix"
Previous message: bibo mao: "[PATCH 23/39] MIPS: lantiq: Add header file path prefix"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

Remove header files from arch/mips/include/asm/mach-lasat
to arch/mips/lasat/include/mach

Signed-off-by: bibo mao <maobibo@xxxxxxxxxxx>
---
arch/mips/Kconfig | 1 +
arch/mips/lasat/Platform | 2 +-
arch/mips/lasat/include/mach/cpu-feature-overrides.h | 2 ++
arch/mips/lasat/include/mach/ioremap.h | 2 ++
arch/mips/{include/asm/mach-lasat => lasat/include/mach}/irq.h | 0
arch/mips/lasat/include/mach/kernel-entry-init.h | 2 ++
arch/mips/lasat/include/mach/kmalloc.h | 2 ++
arch/mips/{include/asm/mach-lasat => lasat/include/mach}/mach-gt64120.h | 0
arch/mips/lasat/include/mach/mangle-port.h | 2 ++
arch/mips/lasat/include/mach/mc146818rtc.h | 2 ++
arch/mips/lasat/include/mach/spaces.h | 2 ++
arch/mips/lasat/include/mach/topology.h | 2 ++
arch/mips/lasat/include/mach/war.h | 2 ++
arch/mips/lasat/interrupt.c | 2 +-
arch/mips/pci/pci-lasat.c | 2 +-
15 files changed, 22 insertions(+), 3 deletions(-)
create mode 100644 arch/mips/lasat/include/mach/cpu-feature-overrides.h
create mode 100644 arch/mips/lasat/include/mach/ioremap.h
rename arch/mips/{include/asm/mach-lasat => lasat/include/mach}/irq.h (100%)
create mode 100644 arch/mips/lasat/include/mach/kernel-entry-init.h
create mode 100644 arch/mips/lasat/include/mach/kmalloc.h
rename arch/mips/{include/asm/mach-lasat => lasat/include/mach}/mach-gt64120.h (100%)
create mode 100644 arch/mips/lasat/include/mach/mangle-port.h
create mode 100644 arch/mips/lasat/include/mach/mc146818rtc.h
create mode 100644 arch/mips/lasat/include/mach/spaces.h
create mode 100644 arch/mips/lasat/include/mach/topology.h
create mode 100644 arch/mips/lasat/include/mach/war.h

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 738863fc..37d4d48 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -455,6 +455,7 @@ config LASAT
select SYS_SUPPORTS_32BIT_KERNEL
select SYS_SUPPORTS_64BIT_KERNEL if BROKEN
select SYS_SUPPORTS_LITTLE_ENDIAN
+ select HAVE_MACH_HEAD_FILES

config MACH_LOONGSON32
bool "Loongson 32-bit family of machines"
diff --git a/arch/mips/lasat/Platform b/arch/mips/lasat/Platform
index 7602528..9bd958b 100644
--- a/arch/mips/lasat/Platform
+++ b/arch/mips/lasat/Platform
@@ -3,5 +3,5 @@
#
platform-$(CONFIG_LASAT) += lasat/
cflags-$(CONFIG_LASAT) += \
- -I$(srctree)/arch/mips/include/asm/mach-lasat
+ -I$(srctree)/arch/mips/lasat/include
load-$(CONFIG_LASAT) += 0xffffffff80000000
diff --git a/arch/mips/lasat/include/mach/cpu-feature-overrides.h b/arch/mips/lasat/include/mach/cpu-feature-overrides.h
new file mode 100644
index 0000000..f3e0e12
--- /dev/null
+++ b/arch/mips/lasat/include/mach/cpu-feature-overrides.h
@@ -0,0 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#include <asm/mach-generic/cpu-feature-overrides.h>
diff --git a/arch/mips/lasat/include/mach/ioremap.h b/arch/mips/lasat/include/mach/ioremap.h
new file mode 100644
index 0000000..2369393
--- /dev/null
+++ b/arch/mips/lasat/include/mach/ioremap.h
@@ -0,0 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#include <asm/mach-generic/ioremap.h>
diff --git a/arch/mips/include/asm/mach-lasat/irq.h b/arch/mips/lasat/include/mach/irq.h
similarity index 100%
rename from arch/mips/include/asm/mach-lasat/irq.h
rename to arch/mips/lasat/include/mach/irq.h
diff --git a/arch/mips/lasat/include/mach/kernel-entry-init.h b/arch/mips/lasat/include/mach/kernel-entry-init.h
new file mode 100644
index 0000000..19b872be
--- /dev/null
+++ b/arch/mips/lasat/include/mach/kernel-entry-init.h
@@ -0,0 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#include <asm/mach-generic/kernel-entry-init.h>
diff --git a/arch/mips/lasat/include/mach/kmalloc.h b/arch/mips/lasat/include/mach/kmalloc.h
new file mode 100644
index 0000000..4f056db
--- /dev/null
+++ b/arch/mips/lasat/include/mach/kmalloc.h
@@ -0,0 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#include <asm/mach-generic/kmalloc.h>
diff --git a/arch/mips/include/asm/mach-lasat/mach-gt64120.h b/arch/mips/lasat/include/mach/mach-gt64120.h
similarity index 100%
rename from arch/mips/include/asm/mach-lasat/mach-gt64120.h
rename to arch/mips/lasat/include/mach/mach-gt64120.h
diff --git a/arch/mips/lasat/include/mach/mangle-port.h b/arch/mips/lasat/include/mach/mangle-port.h
new file mode 100644
index 0000000..b9736e3
--- /dev/null
+++ b/arch/mips/lasat/include/mach/mangle-port.h
@@ -0,0 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#include <asm/mach-generic/mangle-port.h>
diff --git a/arch/mips/lasat/include/mach/mc146818rtc.h b/arch/mips/lasat/include/mach/mc146818rtc.h
new file mode 100644
index 0000000..7284af8
--- /dev/null
+++ b/arch/mips/lasat/include/mach/mc146818rtc.h
@@ -0,0 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#include <asm/mach-generic/mc146818rtc.h>
diff --git a/arch/mips/lasat/include/mach/spaces.h b/arch/mips/lasat/include/mach/spaces.h
new file mode 100644
index 0000000..39a4d72
--- /dev/null
+++ b/arch/mips/lasat/include/mach/spaces.h
@@ -0,0 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#include <asm/mach-generic/spaces.h>
diff --git a/arch/mips/lasat/include/mach/topology.h b/arch/mips/lasat/include/mach/topology.h
new file mode 100644
index 0000000..86e585b
--- /dev/null
+++ b/arch/mips/lasat/include/mach/topology.h
@@ -0,0 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#include <asm/mach-generic/topology.h>
diff --git a/arch/mips/lasat/include/mach/war.h b/arch/mips/lasat/include/mach/war.h
new file mode 100644
index 0000000..5b0422a
--- /dev/null
+++ b/arch/mips/lasat/include/mach/war.h
@@ -0,0 +1,2 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#include <asm/mach-generic/war.h>
diff --git a/arch/mips/lasat/interrupt.c b/arch/mips/lasat/interrupt.c
index 7965bbd..6d48e33 100644
--- a/arch/mips/lasat/interrupt.c
+++ b/arch/mips/lasat/interrupt.c
@@ -14,7 +14,7 @@
#include <asm/lasat/lasat.h>
#include <asm/lasat/lasatint.h>

-#include <irq.h>
+#include <mach/irq.h>

static volatile int *lasat_int_status;
static volatile int *lasat_int_mask;
diff --git a/arch/mips/pci/pci-lasat.c b/arch/mips/pci/pci-lasat.c
index 47f4ee6..a20a1b9 100644
--- a/arch/mips/pci/pci-lasat.c
+++ b/arch/mips/pci/pci-lasat.c
@@ -12,7 +12,7 @@

#include <asm/lasat/lasat.h>

-#include <irq.h>
+#include <mach/irq.h>

extern struct pci_ops nile4_pci_ops;
extern struct pci_ops gt64xxx_pci0_ops;
--
1.8.3.1

Next message: bibo mao: "[PATCH 25/39] MIPS: pic32: Add header file path prefix"
Previous message: bibo mao: "[PATCH 23/39] MIPS: lantiq: Add header file path prefix"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]