diff mbox series

[12/39] MIPS: cavium-octeon: Add header file path prefix

Message ID 1585558373-1897-1-git-send-email-maobibo@loongson.cn (mailing list archive)
State Rejected
Headers show
Series None | expand

Commit Message

Bibo Mao March 30, 2020, 8:52 a.m. UTC 
Remove header files from arch/mips/include/asm/mach-cavium-octeon
to arch/mips/cavium-octeon/include/mach

Signed-off-by: bibo mao <maobibo@loongson.cn>
---
 arch/mips/Kconfig                                                       | 1 +
 arch/mips/cavium-octeon/Platform                                        | 2 +-
 .../include/mach}/cpu-feature-overrides.h                               | 0
 arch/mips/cavium-octeon/include/mach/ioremap.h                          | 2 ++
 .../asm/mach-cavium-octeon => cavium-octeon/include/mach}/irq.h         | 0
 .../include/mach}/kernel-entry-init.h                                   | 0
 arch/mips/cavium-octeon/include/mach/kmalloc.h                          | 2 ++
 .../asm/mach-cavium-octeon => cavium-octeon/include/mach}/mangle-port.h | 0
 .../asm/mach-cavium-octeon => cavium-octeon/include/mach}/spaces.h      | 0
 arch/mips/cavium-octeon/include/mach/topology.h                         | 2 ++
 .../asm/mach-cavium-octeon => cavium-octeon/include/mach}/war.h         | 0
 11 files changed, 8 insertions(+), 1 deletion(-)
 rename arch/mips/{include/asm/mach-cavium-octeon => cavium-octeon/include/mach}/cpu-feature-overrides.h (100%)
 create mode 100644 arch/mips/cavium-octeon/include/mach/ioremap.h
 rename arch/mips/{include/asm/mach-cavium-octeon => cavium-octeon/include/mach}/irq.h (100%)
 rename arch/mips/{include/asm/mach-cavium-octeon => cavium-octeon/include/mach}/kernel-entry-init.h (100%)
 create mode 100644 arch/mips/cavium-octeon/include/mach/kmalloc.h
 rename arch/mips/{include/asm/mach-cavium-octeon => cavium-octeon/include/mach}/mangle-port.h (100%)
 rename arch/mips/{include/asm/mach-cavium-octeon => cavium-octeon/include/mach}/spaces.h (100%)
 create mode 100644 arch/mips/cavium-octeon/include/mach/topology.h
 rename arch/mips/{include/asm/mach-cavium-octeon => cavium-octeon/include/mach}/war.h (100%)
diff mbox series

Patch

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 1ee88a2..f31ff10 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1782,6 +1782,7 @@  config CPU_CAVIUM_OCTEON
 	select USB_OHCI_BIG_ENDIAN_MMIO if CPU_BIG_ENDIAN
 	select MIPS_L1_CACHE_SHIFT_7
 	select HAVE_KVM
+	select HAVE_MACH_HEAD_FILES
 	help
 	  The Cavium Octeon processor is a highly integrated chip containing
 	  many ethernet hardware widgets for networking tasks. The processor
diff --git a/arch/mips/cavium-octeon/Platform b/arch/mips/cavium-octeon/Platform
index 45be853..cb9ae89 100644
--- a/arch/mips/cavium-octeon/Platform
+++ b/arch/mips/cavium-octeon/Platform
@@ -3,5 +3,5 @@ 
 #
 platform-$(CONFIG_CAVIUM_OCTEON_SOC)	+= cavium-octeon/
 cflags-$(CONFIG_CAVIUM_OCTEON_SOC)	+=				\
-		-I$(srctree)/arch/mips/include/asm/mach-cavium-octeon
+		-I$(srctree)/arch/mips/cavium-octeon/include
 load-$(CONFIG_CAVIUM_OCTEON_SOC)	+= 0xffffffff81100000
diff --git a/arch/mips/include/asm/mach-cavium-octeon/cpu-feature-overrides.h b/arch/mips/cavium-octeon/include/mach/cpu-feature-overrides.h
similarity index 100%
rename from arch/mips/include/asm/mach-cavium-octeon/cpu-feature-overrides.h
rename to arch/mips/cavium-octeon/include/mach/cpu-feature-overrides.h
diff --git a/arch/mips/cavium-octeon/include/mach/ioremap.h b/arch/mips/cavium-octeon/include/mach/ioremap.h
new file mode 100644
index 0000000..2369393
--- /dev/null
+++ b/arch/mips/cavium-octeon/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-cavium-octeon/irq.h b/arch/mips/cavium-octeon/include/mach/irq.h
similarity index 100%
rename from arch/mips/include/asm/mach-cavium-octeon/irq.h
rename to arch/mips/cavium-octeon/include/mach/irq.h
diff --git a/arch/mips/include/asm/mach-cavium-octeon/kernel-entry-init.h b/arch/mips/cavium-octeon/include/mach/kernel-entry-init.h
similarity index 100%
rename from arch/mips/include/asm/mach-cavium-octeon/kernel-entry-init.h
rename to arch/mips/cavium-octeon/include/mach/kernel-entry-init.h
diff --git a/arch/mips/cavium-octeon/include/mach/kmalloc.h b/arch/mips/cavium-octeon/include/mach/kmalloc.h
new file mode 100644
index 0000000..4f056db
--- /dev/null
+++ b/arch/mips/cavium-octeon/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-cavium-octeon/mangle-port.h b/arch/mips/cavium-octeon/include/mach/mangle-port.h
similarity index 100%
rename from arch/mips/include/asm/mach-cavium-octeon/mangle-port.h
rename to arch/mips/cavium-octeon/include/mach/mangle-port.h
diff --git a/arch/mips/include/asm/mach-cavium-octeon/spaces.h b/arch/mips/cavium-octeon/include/mach/spaces.h
similarity index 100%
rename from arch/mips/include/asm/mach-cavium-octeon/spaces.h
rename to arch/mips/cavium-octeon/include/mach/spaces.h
diff --git a/arch/mips/cavium-octeon/include/mach/topology.h b/arch/mips/cavium-octeon/include/mach/topology.h
new file mode 100644
index 0000000..86e585b
--- /dev/null
+++ b/arch/mips/cavium-octeon/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/include/asm/mach-cavium-octeon/war.h b/arch/mips/cavium-octeon/include/mach/war.h
similarity index 100%
rename from arch/mips/include/asm/mach-cavium-octeon/war.h
rename to arch/mips/cavium-octeon/include/mach/war.h