[13/39] MIPS: cobalt: Add header file path prefix

Message ID	1585558385-2974-1-git-send-email-maobibo@loongson.cn (mailing list archive)
State	Rejected
Headers	show Return-Path: <SRS0=buZM=5P=vger.kernel.org=linux-mips-owner@kernel.org> From: bibo mao <maobibo@loongson.cn> To: Thomas Bogendoerfer <tsbogend@alpha.franken.de>, Jiaxun Yang <jiaxun.yang@flygoat.com>, Huacai Chen <chenhc@lemote.com> Cc: linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 13/39] MIPS: cobalt: Add header file path prefix Date: Mon, 30 Mar 2020 04:53:05 -0400 Message-Id: <1585558385-2974-1-git-send-email-maobibo@loongson.cn> Sender: linux-mips-owner@vger.kernel.org Precedence: bulk
Series	None \| expand [11/39] MIPS: bmips: Add header file path prefix [12/39] MIPS: cavium-octeon: Add header file path prefix [13/39] MIPS: cobalt: Add header file path prefix [14/39] MIPS: dec: Add header file path prefix [15/39] MIPS: emma: Add header file path prefix [16/39] MIPS: ip22: Add header file path prefix [17/39] MIPS: ip28: Add header file path prefix [18/39] MIPS: ip27: Add header file path prefix [19/39] MIPS: ip30: Add header file path prefix [20/39] MIPS: ip32: Add header file path prefix [21/39] MIPS: jazz: Add header file path prefix [22/39] MIPS: jz4740: Add header file path prefix [23/39] MIPS: lantiq: Add header file path prefix [24/39] MIPS: lasat: Add header file path prefix [25/39] MIPS: pic32: Add header file path prefix [26/39] MIPS: pistachio: Add header file path prefix [27/39] MIPS: pmcs-msp71xx: Add header file path prefix [28/39] MIPS: pnx833x: Add header file path prefix [29/39] MIPS: vr41xx: Add header file path prefix [30/39] MIPS: txx9: Add header file path prefix [31/39] MIPS: sibyte: Add header file path prefix [32/39] MIPS: rb532: Add header file path prefix [33/39] MIPS: ralink: Add header file path prefix [34/39] MIPS: sni: Add header file path prefix [35/39] MIPS: paravirt: Add header file path prefix [36/39] MIPS: netlogic: Add header file path prefix [37/39] MIPS: malta: Add header file path prefix [38/39] MIPS: generic: Add header file path prefix [39/39] MIPS: Remove HAVE_MACH_HEAD_FILES option

Message ID

1585558385-2974-1-git-send-email-maobibo@loongson.cn (mailing list archive)

State

Rejected

Headers

From: bibo mao <maobibo@loongson.cn>
To: Thomas Bogendoerfer <tsbogend@alpha.franken.de>,
        Jiaxun Yang <jiaxun.yang@flygoat.com>,
        Huacai Chen <chenhc@lemote.com>
Cc: linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 13/39] MIPS: cobalt: Add header file path prefix
Date: Mon, 30 Mar 2020 04:53:05 -0400
Message-Id: <1585558385-2974-1-git-send-email-maobibo@loongson.cn>
Sender: linux-mips-owner@vger.kernel.org
Precedence: bulk

Series

None | expand

Commit Message

Bibo Mao March 30, 2020, 8:53 a.m. UTC

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

Signed-off-by: bibo mao <maobibo@loongson.cn>
---
 arch/mips/Kconfig                                                     | 1 +
 arch/mips/cobalt/Platform                                             | 2 +-
 arch/mips/{include/asm/mach-cobalt => cobalt/include/mach}/cobalt.h   | 0
 .../asm/mach-cobalt => cobalt/include/mach}/cpu-feature-overrides.h   | 0
 arch/mips/cobalt/include/mach/ioremap.h                               | 2 ++
 arch/mips/{include/asm/mach-cobalt => cobalt/include/mach}/irq.h      | 0
 arch/mips/cobalt/include/mach/kernel-entry-init.h                     | 2 ++
 arch/mips/cobalt/include/mach/kmalloc.h                               | 2 ++
 .../{include/asm/mach-cobalt => cobalt/include/mach}/mach-gt64120.h   | 0
 arch/mips/cobalt/include/mach/mangle-port.h                           | 2 ++
 arch/mips/cobalt/include/mach/mc146818rtc.h                           | 2 ++
 arch/mips/cobalt/include/mach/spaces.h                                | 2 ++
 arch/mips/cobalt/include/mach/topology.h                              | 2 ++
 arch/mips/cobalt/include/mach/war.h                                   | 2 ++
 arch/mips/cobalt/irq.c                                                | 2 +-
 arch/mips/cobalt/led.c                                                | 2 +-
 arch/mips/cobalt/reset.c                                              | 2 +-
 arch/mips/cobalt/serial.c                                             | 4 ++--
 arch/mips/cobalt/setup.c                                              | 2 +-
 arch/mips/include/asm/gt64120.h                                       | 2 +-
 arch/mips/pci/fixup-cobalt.c                                          | 4 ++--
 21 files changed, 27 insertions(+), 10 deletions(-)
 rename arch/mips/{include/asm/mach-cobalt => cobalt/include/mach}/cobalt.h (100%)
 rename arch/mips/{include/asm/mach-cobalt => cobalt/include/mach}/cpu-feature-overrides.h (100%)
 create mode 100644 arch/mips/cobalt/include/mach/ioremap.h
 rename arch/mips/{include/asm/mach-cobalt => cobalt/include/mach}/irq.h (100%)
 create mode 100644 arch/mips/cobalt/include/mach/kernel-entry-init.h
 create mode 100644 arch/mips/cobalt/include/mach/kmalloc.h
 rename arch/mips/{include/asm/mach-cobalt => cobalt/include/mach}/mach-gt64120.h (100%)
 create mode 100644 arch/mips/cobalt/include/mach/mangle-port.h
 create mode 100644 arch/mips/cobalt/include/mach/mc146818rtc.h
 create mode 100644 arch/mips/cobalt/include/mach/spaces.h
 create mode 100644 arch/mips/cobalt/include/mach/topology.h
 create mode 100644 arch/mips/cobalt/include/mach/war.h

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index f31ff10..ba7e065 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -329,6 +329,7 @@  config MIPS_COBALT
 	select SYS_SUPPORTS_64BIT_KERNEL
 	select SYS_SUPPORTS_LITTLE_ENDIAN
 	select USE_GENERIC_EARLY_PRINTK_8250
+	select HAVE_MACH_HEAD_FILES
 
 config MACH_DECSTATION
 	bool "DECstations"
diff --git a/arch/mips/cobalt/Platform b/arch/mips/cobalt/Platform
index 34123ef..db48e5b 100644
--- a/arch/mips/cobalt/Platform
+++ b/arch/mips/cobalt/Platform
@@ -2,5 +2,5 @@ 
 # Cobalt Server
 #
 platform-$(CONFIG_MIPS_COBALT)	+= cobalt/
-cflags-$(CONFIG_MIPS_COBALT)	+= -I$(srctree)/arch/mips/include/asm/mach-cobalt
+cflags-$(CONFIG_MIPS_COBALT)	+= -I$(srctree)/arch/mips/cobalt/include
 load-$(CONFIG_MIPS_COBALT)	+= 0xffffffff80080000
diff --git a/arch/mips/include/asm/mach-cobalt/cobalt.h b/arch/mips/cobalt/include/mach/cobalt.h
similarity index 100%
rename from arch/mips/include/asm/mach-cobalt/cobalt.h
rename to arch/mips/cobalt/include/mach/cobalt.h
diff --git a/arch/mips/include/asm/mach-cobalt/cpu-feature-overrides.h b/arch/mips/cobalt/include/mach/cpu-feature-overrides.h
similarity index 100%
rename from arch/mips/include/asm/mach-cobalt/cpu-feature-overrides.h
rename to arch/mips/cobalt/include/mach/cpu-feature-overrides.h
diff --git a/arch/mips/cobalt/include/mach/ioremap.h b/arch/mips/cobalt/include/mach/ioremap.h
new file mode 100644
index 0000000..2369393
--- /dev/null
+++ b/arch/mips/cobalt/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-cobalt/irq.h b/arch/mips/cobalt/include/mach/irq.h
similarity index 100%
rename from arch/mips/include/asm/mach-cobalt/irq.h
rename to arch/mips/cobalt/include/mach/irq.h
diff --git a/arch/mips/cobalt/include/mach/kernel-entry-init.h b/arch/mips/cobalt/include/mach/kernel-entry-init.h
new file mode 100644
index 0000000..19b872be
--- /dev/null
+++ b/arch/mips/cobalt/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/cobalt/include/mach/kmalloc.h b/arch/mips/cobalt/include/mach/kmalloc.h
new file mode 100644
index 0000000..4f056db
--- /dev/null
+++ b/arch/mips/cobalt/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-cobalt/mach-gt64120.h b/arch/mips/cobalt/include/mach/mach-gt64120.h
similarity index 100%
rename from arch/mips/include/asm/mach-cobalt/mach-gt64120.h
rename to arch/mips/cobalt/include/mach/mach-gt64120.h
diff --git a/arch/mips/cobalt/include/mach/mangle-port.h b/arch/mips/cobalt/include/mach/mangle-port.h
new file mode 100644
index 0000000..b9736e3
--- /dev/null
+++ b/arch/mips/cobalt/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/cobalt/include/mach/mc146818rtc.h b/arch/mips/cobalt/include/mach/mc146818rtc.h
new file mode 100644
index 0000000..7284af8
--- /dev/null
+++ b/arch/mips/cobalt/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/cobalt/include/mach/spaces.h b/arch/mips/cobalt/include/mach/spaces.h
new file mode 100644
index 0000000..39a4d72
--- /dev/null
+++ b/arch/mips/cobalt/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/cobalt/include/mach/topology.h b/arch/mips/cobalt/include/mach/topology.h
new file mode 100644
index 0000000..86e585b
--- /dev/null
+++ b/arch/mips/cobalt/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/cobalt/include/mach/war.h b/arch/mips/cobalt/include/mach/war.h
new file mode 100644
index 0000000..5b0422a
--- /dev/null
+++ b/arch/mips/cobalt/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/cobalt/irq.c b/arch/mips/cobalt/irq.c
index ead5ae4..f490116 100644
--- a/arch/mips/cobalt/irq.c
+++ b/arch/mips/cobalt/irq.c
@@ -18,7 +18,7 @@ 
 #include <asm/irq_gt641xx.h>
 #include <asm/gt64120.h>
 
-#include <irq.h>
+#include <mach/irq.h>
 
 asmlinkage void plat_irq_dispatch(void)
 {
diff --git a/arch/mips/cobalt/led.c b/arch/mips/cobalt/led.c
index 196660c..191d5c6 100644
--- a/arch/mips/cobalt/led.c
+++ b/arch/mips/cobalt/led.c
@@ -9,7 +9,7 @@ 
 #include <linux/ioport.h>
 #include <linux/platform_device.h>
 
-#include <cobalt.h>
+#include <mach/cobalt.h>
 
 static struct resource cobalt_led_resource __initdata = {
 	.start	= 0x1c000000,
diff --git a/arch/mips/cobalt/reset.c b/arch/mips/cobalt/reset.c
index 4eedd48..9333e56 100644
--- a/arch/mips/cobalt/reset.c
+++ b/arch/mips/cobalt/reset.c
@@ -15,7 +15,7 @@ 
 #include <asm/idle.h>
 #include <asm/processor.h>
 
-#include <cobalt.h>
+#include <mach/cobalt.h>
 
 #define RESET_PORT	((void __iomem *)CKSEG1ADDR(0x1c000000))
 #define RESET		0x0f
diff --git a/arch/mips/cobalt/serial.c b/arch/mips/cobalt/serial.c
index 5fb6767..56a6532 100644
--- a/arch/mips/cobalt/serial.c
+++ b/arch/mips/cobalt/serial.c
@@ -10,8 +10,8 @@ 
 #include <linux/platform_device.h>
 #include <linux/serial_8250.h>
 
-#include <cobalt.h>
-#include <irq.h>
+#include <mach/cobalt.h>
+#include <mach/irq.h>
 
 static struct resource cobalt_uart_resource[] __initdata = {
 	{
diff --git a/arch/mips/cobalt/setup.c b/arch/mips/cobalt/setup.c
index c136a18..ab4d587 100644
--- a/arch/mips/cobalt/setup.c
+++ b/arch/mips/cobalt/setup.c
@@ -20,7 +20,7 @@ 
 #include <asm/setup.h>
 #include <asm/gt64120.h>
 
-#include <cobalt.h>
+#include <mach/cobalt.h>
 
 extern void cobalt_machine_restart(char *command);
 extern void cobalt_machine_halt(void);
diff --git a/arch/mips/include/asm/gt64120.h b/arch/mips/include/asm/gt64120.h
index 5d68d72..953ab1a 100644
--- a/arch/mips/include/asm/gt64120.h
+++ b/arch/mips/include/asm/gt64120.h
@@ -547,7 +547,7 @@ 
  *		  full gt64120 cascade interrupt support is in place
  */
 
-#include <mach-gt64120.h>
+#include <mach/mach-gt64120.h>
 
 /*
  * Because of an error/peculiarity in the Galileo chip, we need to swap the
diff --git a/arch/mips/pci/fixup-cobalt.c b/arch/mips/pci/fixup-cobalt.c
index 44be65c..96badb1 100644
--- a/arch/mips/pci/fixup-cobalt.c
+++ b/arch/mips/pci/fixup-cobalt.c
@@ -16,8 +16,8 @@ 
 #include <asm/io.h>
 #include <asm/gt64120.h>
 
-#include <cobalt.h>
-#include <irq.h>
+#include <mach/cobalt.h>
+#include <mach/irq.h>
 
 /*
  * PCI slot numbers

[13/39] MIPS: cobalt: Add header file path prefix

Commit Message

Patch