diff mbox series

[28/39] MIPS: pnx833x: Add header file path prefix

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

Commit Message

Bibo Mao March 30, 2020, 9 a.m. UTC
Remove header files from arch/mips/include/asm/mach-pnx833x
to arch/mips/pnx833x/include/mach

Signed-off-by: bibo mao <maobibo@loongson.cn>
---
 arch/mips/Kconfig                                                   | 1 +
 arch/mips/pnx833x/Platform                                          | 2 +-
 arch/mips/pnx833x/common/interrupts.c                               | 6 +++---
 arch/mips/pnx833x/common/platform.c                                 | 6 +++---
 arch/mips/pnx833x/common/reset.c                                    | 2 +-
 arch/mips/pnx833x/common/setup.c                                    | 4 ++--
 arch/mips/pnx833x/include/mach/cpu-feature-overrides.h              | 2 ++
 arch/mips/{include/asm/mach-pnx833x => pnx833x/include/mach}/gpio.h | 2 +-
 arch/mips/pnx833x/include/mach/ioremap.h                            | 2 ++
 .../asm/mach-pnx833x => pnx833x/include/mach}/irq-mapping.h         | 2 +-
 arch/mips/{include/asm/mach-pnx833x => pnx833x/include/mach}/irq.h  | 0
 arch/mips/pnx833x/include/mach/kernel-entry-init.h                  | 2 ++
 arch/mips/pnx833x/include/mach/kmalloc.h                            | 2 ++
 arch/mips/pnx833x/include/mach/mangle-port.h                        | 2 ++
 arch/mips/pnx833x/include/mach/mc146818rtc.h                        | 2 ++
 .../{include/asm/mach-pnx833x => pnx833x/include/mach}/pnx833x.h    | 0
 arch/mips/pnx833x/include/mach/spaces.h                             | 2 ++
 arch/mips/pnx833x/include/mach/topology.h                           | 2 ++
 arch/mips/pnx833x/include/mach/war.h                                | 2 ++
 arch/mips/pnx833x/stb22x/board.c                                    | 4 ++--
 drivers/watchdog/pnx833x_wdt.c                                      | 2 +-
 21 files changed, 34 insertions(+), 15 deletions(-)
 create mode 100644 arch/mips/pnx833x/include/mach/cpu-feature-overrides.h
 rename arch/mips/{include/asm/mach-pnx833x => pnx833x/include/mach}/gpio.h (99%)
 create mode 100644 arch/mips/pnx833x/include/mach/ioremap.h
 rename arch/mips/{include/asm/mach-pnx833x => pnx833x/include/mach}/irq-mapping.h (99%)
 rename arch/mips/{include/asm/mach-pnx833x => pnx833x/include/mach}/irq.h (100%)
 create mode 100644 arch/mips/pnx833x/include/mach/kernel-entry-init.h
 create mode 100644 arch/mips/pnx833x/include/mach/kmalloc.h
 create mode 100644 arch/mips/pnx833x/include/mach/mangle-port.h
 create mode 100644 arch/mips/pnx833x/include/mach/mc146818rtc.h
 rename arch/mips/{include/asm/mach-pnx833x => pnx833x/include/mach}/pnx833x.h (100%)
 create mode 100644 arch/mips/pnx833x/include/mach/spaces.h
 create mode 100644 arch/mips/pnx833x/include/mach/topology.h
 create mode 100644 arch/mips/pnx833x/include/mach/war.h
diff mbox series

Patch

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 56d6519..9a149e7 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1386,6 +1386,7 @@  config SOC_PNX833X
 	select SYS_SUPPORTS_BIG_ENDIAN
 	select SYS_SUPPORTS_MIPS16
 	select CPU_MIPSR2_IRQ_VI
+	select HAVE_MACH_HEAD_FILES
 
 config SOC_PNX8335
 	bool
diff --git a/arch/mips/pnx833x/Platform b/arch/mips/pnx833x/Platform
index 2872606..47b905e 100644
--- a/arch/mips/pnx833x/Platform
+++ b/arch/mips/pnx833x/Platform
@@ -1,5 +1,5 @@ 
 # NXP STB225
 platform-$(CONFIG_SOC_PNX833X)	+= pnx833x/
-cflags-$(CONFIG_SOC_PNX833X)	+= -I$(srctree)/arch/mips/include/asm/mach-pnx833x
+cflags-$(CONFIG_SOC_PNX833X)	+= -I$(srctree)/arch/mips/pnx833x/include
 load-$(CONFIG_NXP_STB220)	+= 0xffffffff80001000
 load-$(CONFIG_NXP_STB225)	+= 0xffffffff80001000
diff --git a/arch/mips/pnx833x/common/interrupts.c b/arch/mips/pnx833x/common/interrupts.c
index 2fbbabc..66f3a03 100644
--- a/arch/mips/pnx833x/common/interrupts.c
+++ b/arch/mips/pnx833x/common/interrupts.c
@@ -13,9 +13,9 @@ 
 #include <asm/mipsregs.h>
 #include <asm/irq_cpu.h>
 #include <asm/setup.h>
-#include <irq.h>
-#include <irq-mapping.h>
-#include <gpio.h>
+#include <mach/irq.h>
+#include <mach/irq-mapping.h>
+#include <mach/gpio.h>
 
 static int mips_cpu_timer_irq;
 
diff --git a/arch/mips/pnx833x/common/platform.c b/arch/mips/pnx833x/common/platform.c
index 5fa0373..fbaf109 100644
--- a/arch/mips/pnx833x/common/platform.c
+++ b/arch/mips/pnx833x/common/platform.c
@@ -19,9 +19,9 @@ 
 #include <linux/serial_pnx8xxx.h>
 #include <linux/mtd/platnand.h>
 
-#include <irq.h>
-#include <irq-mapping.h>
-#include <pnx833x.h>
+#include <mach/irq.h>
+#include <mach/irq-mapping.h>
+#include <mach/pnx833x.h>
 
 static u64 uart_dmamask	    = DMA_BIT_MASK(32);
 
diff --git a/arch/mips/pnx833x/common/reset.c b/arch/mips/pnx833x/common/reset.c
index b48e83b..9bd5b2a 100644
--- a/arch/mips/pnx833x/common/reset.c
+++ b/arch/mips/pnx833x/common/reset.c
@@ -10,7 +10,7 @@ 
  *	Nikita Youshchenko <yoush@debian.org>, based on PNX8550 code.
  */
 #include <linux/reboot.h>
-#include <pnx833x.h>
+#include <mach/pnx833x.h>
 
 void pnx833x_machine_restart(char *command)
 {
diff --git a/arch/mips/pnx833x/common/setup.c b/arch/mips/pnx833x/common/setup.c
index abf68d9..b188c66 100644
--- a/arch/mips/pnx833x/common/setup.c
+++ b/arch/mips/pnx833x/common/setup.c
@@ -15,8 +15,8 @@ 
 #include <linux/io.h>
 #include <linux/pci.h>
 #include <asm/reboot.h>
-#include <pnx833x.h>
-#include <gpio.h>
+#include <mach/pnx833x.h>
+#include <mach/gpio.h>
 
 extern void pnx833x_board_setup(void);
 extern void pnx833x_machine_restart(char *);
diff --git a/arch/mips/pnx833x/include/mach/cpu-feature-overrides.h b/arch/mips/pnx833x/include/mach/cpu-feature-overrides.h
new file mode 100644
index 0000000..f3e0e12
--- /dev/null
+++ b/arch/mips/pnx833x/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/include/asm/mach-pnx833x/gpio.h b/arch/mips/pnx833x/include/mach/gpio.h
similarity index 99%
rename from arch/mips/include/asm/mach-pnx833x/gpio.h
rename to arch/mips/pnx833x/include/mach/gpio.h
index 85b5b8e..c60decb0 100644
--- a/arch/mips/include/asm/mach-pnx833x/gpio.h
+++ b/arch/mips/pnx833x/include/mach/gpio.h
@@ -17,7 +17,7 @@ 
    - including locking between different uses
 */
 
-#include <asm/mach-pnx833x/pnx833x.h>
+#include <mach/pnx833x.h>
 
 #define SET_REG_BIT(reg, bit)		do { (reg |= (1 << (bit))); } while (0)
 #define CLEAR_REG_BIT(reg, bit)		do { (reg &= ~(1 << (bit))); } while (0)
diff --git a/arch/mips/pnx833x/include/mach/ioremap.h b/arch/mips/pnx833x/include/mach/ioremap.h
new file mode 100644
index 0000000..2369393
--- /dev/null
+++ b/arch/mips/pnx833x/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-pnx833x/irq-mapping.h b/arch/mips/pnx833x/include/mach/irq-mapping.h
similarity index 99%
rename from arch/mips/include/asm/mach-pnx833x/irq-mapping.h
rename to arch/mips/pnx833x/include/mach/irq-mapping.h
index 32d8063..ebb2d66 100644
--- a/arch/mips/include/asm/mach-pnx833x/irq-mapping.h
+++ b/arch/mips/pnx833x/include/mach/irq-mapping.h
@@ -24,7 +24,7 @@ 
  * numbers 65..80 for (virtual) GPIO interrupts.
  *
  */
-#include <irq.h>
+#include <mach/irq.h>
 
 #define PNX833X_TIMER_IRQ				(MIPS_CPU_IRQ_BASE + 7)
 
diff --git a/arch/mips/include/asm/mach-pnx833x/irq.h b/arch/mips/pnx833x/include/mach/irq.h
similarity index 100%
rename from arch/mips/include/asm/mach-pnx833x/irq.h
rename to arch/mips/pnx833x/include/mach/irq.h
diff --git a/arch/mips/pnx833x/include/mach/kernel-entry-init.h b/arch/mips/pnx833x/include/mach/kernel-entry-init.h
new file mode 100644
index 0000000..19b872be
--- /dev/null
+++ b/arch/mips/pnx833x/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/pnx833x/include/mach/kmalloc.h b/arch/mips/pnx833x/include/mach/kmalloc.h
new file mode 100644
index 0000000..4f056db
--- /dev/null
+++ b/arch/mips/pnx833x/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/pnx833x/include/mach/mangle-port.h b/arch/mips/pnx833x/include/mach/mangle-port.h
new file mode 100644
index 0000000..b9736e3
--- /dev/null
+++ b/arch/mips/pnx833x/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/pnx833x/include/mach/mc146818rtc.h b/arch/mips/pnx833x/include/mach/mc146818rtc.h
new file mode 100644
index 0000000..7284af8
--- /dev/null
+++ b/arch/mips/pnx833x/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/include/asm/mach-pnx833x/pnx833x.h b/arch/mips/pnx833x/include/mach/pnx833x.h
similarity index 100%
rename from arch/mips/include/asm/mach-pnx833x/pnx833x.h
rename to arch/mips/pnx833x/include/mach/pnx833x.h
diff --git a/arch/mips/pnx833x/include/mach/spaces.h b/arch/mips/pnx833x/include/mach/spaces.h
new file mode 100644
index 0000000..39a4d72
--- /dev/null
+++ b/arch/mips/pnx833x/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/pnx833x/include/mach/topology.h b/arch/mips/pnx833x/include/mach/topology.h
new file mode 100644
index 0000000..86e585b
--- /dev/null
+++ b/arch/mips/pnx833x/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/pnx833x/include/mach/war.h b/arch/mips/pnx833x/include/mach/war.h
new file mode 100644
index 0000000..5b0422a
--- /dev/null
+++ b/arch/mips/pnx833x/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/pnx833x/stb22x/board.c b/arch/mips/pnx833x/stb22x/board.c
index 93d8e7b..14c333c 100644
--- a/arch/mips/pnx833x/stb22x/board.c
+++ b/arch/mips/pnx833x/stb22x/board.c
@@ -12,8 +12,8 @@ 
 #include <linux/init.h>
 #include <asm/bootinfo.h>
 #include <linux/mm.h>
-#include <pnx833x.h>
-#include <gpio.h>
+#include <mach/pnx833x.h>
+#include <mach/gpio.h>
 
 /* endianess twiddlers */
 #define PNX8335_DEBUG0 0x4400
diff --git a/drivers/watchdog/pnx833x_wdt.c b/drivers/watchdog/pnx833x_wdt.c
index 4097d07..18bb8a5 100644
--- a/drivers/watchdog/pnx833x_wdt.c
+++ b/drivers/watchdog/pnx833x_wdt.c
@@ -26,7 +26,7 @@ 
 #include <linux/notifier.h>
 #include <linux/reboot.h>
 #include <linux/init.h>
-#include <asm/mach-pnx833x/pnx833x.h>
+#include <mach/pnx833x.h>
 
 #define WATCHDOG_TIMEOUT 30		/* 30 sec Maximum timeout */
 #define WATCHDOG_COUNT_FREQUENCY 68000000U /* Watchdog counts at 68MHZ. */