From patchwork Mon Mar 30 08:38:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: bibo mao X-Patchwork-Id: 11464927 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4428592C for ; Mon, 30 Mar 2020 08:38:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2042620774 for ; Mon, 30 Mar 2020 08:38:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729390AbgC3Ii5 (ORCPT ); Mon, 30 Mar 2020 04:38:57 -0400 Received: from mail.loongson.cn ([114.242.206.163]:56720 "EHLO loongson.cn" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726017AbgC3Ii5 (ORCPT ); Mon, 30 Mar 2020 04:38:57 -0400 Received: from kvm-dev1.localdomain (unknown [10.2.5.134]) by mail.loongson.cn (Coremail) with SMTP id AQAAf9Ax1ukZsIFeIJchAA--.7S2; Mon, 30 Mar 2020 16:38:49 +0800 (CST) From: bibo mao To: Thomas Bogendoerfer , Jiaxun Yang , Huacai Chen Cc: linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 01/39] MIPS: Add-mach-header-files-option Date: Mon, 30 Mar 2020 04:38:49 -0400 Message-Id: <1585557529-18194-1-git-send-email-maobibo@loongson.cn> X-Mailer: git-send-email 1.8.3.1 X-CM-TRANSID: AQAAf9Ax1ukZsIFeIJchAA--.7S2 X-Coremail-Antispam: 1UD129KBjvJXoWxuw1UZF4kZw1fCF17XF1rXrb_yoWfXry8pa 1DAa1kGrZ8WryUAFyrAr929r43Jan5GrWY9Fyjga4jv3W2qF1DJrs3Krn8Ary8XFWqq3W0 gFWfWw15Xr4Ivw7anT9S1TB71UUUUUJqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUU9Fb7Iv0xC_Kw4lb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rw A2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6xII jxv20xvEc7CjxVAFwI0_Cr0_Gr1UM28EF7xvwVC2z280aVAFwI0_Gr1j6F4UJwA2z4x0Y4 vEx4A2jsIEc7CjxVAFwI0_Cr1j6rxdM2kKe7AKxVWUXVWUAwAS0I0E0xvYzxvE52x082IY 62kv0487Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWrXVW3AwAv7V C2z280aVAFwI0_Gr0_Cr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JMxkI ecxEwVCm-wCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwCFI7km07C267 AKxVWUXVWUAwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E 67AF67kF1VAFwI0_JF0_Jw1lIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVW7JVWDJw CI42IY6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr1lIxAIcVCF04k26cxKx2IYs7xG6Fyj6rWU JwCI42IY6I8E87Iv67AKxVWxJVW8Jr1lIxAIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcS sGvfC2KfnxnUUI43ZEXa7IUYfR65UUUUU== X-CM-SenderInfo: xpdruxter6z05rqj20fqof0/ Sender: linux-mips-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org Some header files are used without pathname prefix, it will cause confliction if there exists the same filename locally. This patch adds HAVE_MACH_HEAD_FILES option, with this enabled, it will remove header files platform specific from arch/mips/include/asm/mach-xxx to directory arch/mips/mach-xxx/include/mach Signed-off-by: bibo mao --- arch/mips/Kconfig | 4 ++++ arch/mips/Makefile | 2 ++ arch/mips/include/asm/addrspace.h | 4 ++++ arch/mips/include/asm/cache.h | 4 ++++ arch/mips/include/asm/cpu-features.h | 4 ++++ arch/mips/include/asm/fixmap.h | 4 ++++ arch/mips/include/asm/floppy.h | 4 ++++ arch/mips/include/asm/i8259.h | 4 ++++ arch/mips/include/asm/ide.h | 6 ++++++ arch/mips/include/asm/io.h | 5 +++++ arch/mips/include/asm/irq.h | 4 ++++ arch/mips/include/asm/mc146818rtc.h | 4 ++++ arch/mips/include/asm/mmzone.h | 4 ++++ arch/mips/include/asm/page.h | 4 ++++ arch/mips/include/asm/topology.h | 4 ++++ arch/mips/include/asm/war.h | 4 ++++ arch/mips/kernel/head.S | 4 ++++ 17 files changed, 69 insertions(+) diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index a1f973c..12f05bb 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -1117,6 +1117,10 @@ config SCHED_OMIT_FRAME_POINTER bool default y +config HAVE_MACH_HEAD_FILES + bool + default n + # # Select some configuration options automatically based on user selections. # diff --git a/arch/mips/Makefile b/arch/mips/Makefile index e1c44ae..dae3d53 100644 --- a/arch/mips/Makefile +++ b/arch/mips/Makefile @@ -263,7 +263,9 @@ load-y = $(CONFIG_PHYSICAL_START) endif entry-y = $(shell $(objtree)/arch/mips/tools/elf-entry vmlinux) +ifndef CONFIG_HAVE_MACH_HEAD_FILES cflags-y += -I$(srctree)/arch/mips/include/asm/mach-generic +endif drivers-$(CONFIG_PCI) += arch/mips/pci/ # diff --git a/arch/mips/include/asm/addrspace.h b/arch/mips/include/asm/addrspace.h index 59a48c6..9cf7926 100644 --- a/arch/mips/include/asm/addrspace.h +++ b/arch/mips/include/asm/addrspace.h @@ -10,7 +10,11 @@ #ifndef _ASM_ADDRSPACE_H #define _ASM_ADDRSPACE_H +#ifdef CONFIG_HAVE_MACH_HEAD_FILES +#include +#else #include +#endif /* * Configure language diff --git a/arch/mips/include/asm/cache.h b/arch/mips/include/asm/cache.h index 8b14c27..a0867f9 100644 --- a/arch/mips/include/asm/cache.h +++ b/arch/mips/include/asm/cache.h @@ -9,7 +9,11 @@ #ifndef _ASM_CACHE_H #define _ASM_CACHE_H +#ifdef CONFIG_HAVE_MACH_HEAD_FILES +#include +#else #include +#endif #define L1_CACHE_SHIFT CONFIG_MIPS_L1_CACHE_SHIFT #define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT) diff --git a/arch/mips/include/asm/cpu-features.h b/arch/mips/include/asm/cpu-features.h index de44c92..facd189 100644 --- a/arch/mips/include/asm/cpu-features.h +++ b/arch/mips/include/asm/cpu-features.h @@ -12,7 +12,11 @@ #include #include #include +#ifdef CONFIG_HAVE_MACH_HEAD_FILES +#include +#else #include +#endif #define __ase(ase) (cpu_data[0].ases & (ase)) #define __isa(isa) (cpu_data[0].isa_level & (isa)) diff --git a/arch/mips/include/asm/fixmap.h b/arch/mips/include/asm/fixmap.h index 1784d43..1723929 100644 --- a/arch/mips/include/asm/fixmap.h +++ b/arch/mips/include/asm/fixmap.h @@ -14,7 +14,11 @@ #define _ASM_FIXMAP_H #include +#ifdef CONFIG_HAVE_MACH_HEAD_FILES +#include +#else #include +#endif #ifdef CONFIG_HIGHMEM #include #include diff --git a/arch/mips/include/asm/floppy.h b/arch/mips/include/asm/floppy.h index 021d09a..55fb950 100644 --- a/arch/mips/include/asm/floppy.h +++ b/arch/mips/include/asm/floppy.h @@ -51,6 +51,10 @@ static inline void fd_cacheflush(char * addr, long size) #define EXTRA_FLOPPY_PARAMS +#ifdef CONFIG_HAVE_MACH_HEAD_FILES +#include +#else #include +#endif #endif /* _ASM_FLOPPY_H */ diff --git a/arch/mips/include/asm/i8259.h b/arch/mips/include/asm/i8259.h index a54b964..f9b6518 100644 --- a/arch/mips/include/asm/i8259.h +++ b/arch/mips/include/asm/i8259.h @@ -14,7 +14,11 @@ #include #include +#ifdef CONFIG_HAVE_MACH_HEAD_FILES +#include +#else #include +#endif /* i8259A PIC registers */ #define PIC_MASTER_CMD 0x20 diff --git a/arch/mips/include/asm/ide.h b/arch/mips/include/asm/ide.h index bb674c3..1302c7d 100644 --- a/arch/mips/include/asm/ide.h +++ b/arch/mips/include/asm/ide.h @@ -8,6 +8,12 @@ #ifndef __ASM_IDE_H #define __ASM_IDE_H +#ifdef CONFIG_HAVE_MACH_HEAD_FILES +#include +#else #include +#endif #endif /* __ASM_IDE_H */ diff --git a/arch/mips/include/asm/io.h b/arch/mips/include/asm/io.h index cf1f2a4..fe8f4a9 100644 --- a/arch/mips/include/asm/io.h +++ b/arch/mips/include/asm/io.h @@ -31,8 +31,13 @@ #include #include +#ifdef CONFIG_HAVE_MACH_HEAD_FILES +#include +#include +#else #include #include +#endif /* * Raw operations are never swapped in software. OTOH values that raw diff --git a/arch/mips/include/asm/irq.h b/arch/mips/include/asm/irq.h index c5d3517..c8cab02 100644 --- a/arch/mips/include/asm/irq.h +++ b/arch/mips/include/asm/irq.h @@ -15,7 +15,11 @@ #include +#ifdef CONFIG_HAVE_MACH_HEAD_FILES +#include +#else #include +#endif #define IRQ_STACK_SIZE THREAD_SIZE #define IRQ_STACK_START (IRQ_STACK_SIZE - 16) diff --git a/arch/mips/include/asm/mc146818rtc.h b/arch/mips/include/asm/mc146818rtc.h index 68b4da6..a0e1d91 100644 --- a/arch/mips/include/asm/mc146818rtc.h +++ b/arch/mips/include/asm/mc146818rtc.h @@ -11,6 +11,10 @@ #ifndef _ASM_MC146818RTC_H #define _ASM_MC146818RTC_H +#ifdef CONFIG_HAVE_MACH_HEAD_FILES +#include +#else #include +#endif #endif /* _ASM_MC146818RTC_H */ diff --git a/arch/mips/include/asm/mmzone.h b/arch/mips/include/asm/mmzone.h index b826b84..043f88c 100644 --- a/arch/mips/include/asm/mmzone.h +++ b/arch/mips/include/asm/mmzone.h @@ -9,8 +9,12 @@ #include #ifdef CONFIG_NEED_MULTIPLE_NODES +#ifdef CONFIG_HAVE_MACH_HEAD_FILES +#include +#else # include #endif +#endif #ifndef pa_to_nid #define pa_to_nid(addr) 0 diff --git a/arch/mips/include/asm/page.h b/arch/mips/include/asm/page.h index 0ba4ce6..4fb4ee2 100644 --- a/arch/mips/include/asm/page.h +++ b/arch/mips/include/asm/page.h @@ -9,7 +9,11 @@ #ifndef _ASM_PAGE_H #define _ASM_PAGE_H +#ifdef CONFIG_HAVE_MACH_HEAD_FILES +#include +#else #include +#endif #include #include #include diff --git a/arch/mips/include/asm/topology.h b/arch/mips/include/asm/topology.h index 0673d2d..ed955bb 100644 --- a/arch/mips/include/asm/topology.h +++ b/arch/mips/include/asm/topology.h @@ -8,7 +8,11 @@ #ifndef __ASM_TOPOLOGY_H #define __ASM_TOPOLOGY_H +#ifdef CONFIG_HAVE_MACH_HEAD_FILES +#include +#else #include +#endif #include #ifdef CONFIG_SMP diff --git a/arch/mips/include/asm/war.h b/arch/mips/include/asm/war.h index 1eedd59..66264e1 100644 --- a/arch/mips/include/asm/war.h +++ b/arch/mips/include/asm/war.h @@ -9,7 +9,11 @@ #ifndef _ASM_WAR_H #define _ASM_WAR_H +#ifdef CONFIG_HAVE_MACH_HEAD_FILES +#include +#else #include +#endif /* * Work around certain R4000 CPU errata (as implemented by GCC): diff --git a/arch/mips/kernel/head.S b/arch/mips/kernel/head.S index 351d40f..a45cdae 100644 --- a/arch/mips/kernel/head.S +++ b/arch/mips/kernel/head.S @@ -24,7 +24,11 @@ #include #include +#ifdef CONFIG_HAVE_MACH_HEAD_FILES +#include +#else #include +#endif /* * For the moment disable interrupts, mark the kernel mode and From patchwork Mon Mar 30 08:38:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: bibo mao X-Patchwork-Id: 11464945 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7BCEE92C for ; Mon, 30 Mar 2020 08:39:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 50D352073B for ; Mon, 30 Mar 2020 08:39:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729719AbgC3Ii6 (ORCPT ); Mon, 30 Mar 2020 04:38:58 -0400 Received: from mail.loongson.cn ([114.242.206.163]:56736 "EHLO loongson.cn" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728994AbgC3Ii6 (ORCPT ); Mon, 30 Mar 2020 04:38:58 -0400 Received: from kvm-dev1.localdomain (unknown [10.2.5.134]) by mail.loongson.cn (Coremail) with SMTP id AQAAf9DxL2kbsIFeIZchAA--.7S2; Mon, 30 Mar 2020 16:38:51 +0800 (CST) From: bibo mao To: Thomas Bogendoerfer , Jiaxun Yang , Huacai Chen Cc: linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 02/39] MIPS: loongson64: Add header files path prefix Date: Mon, 30 Mar 2020 04:38:51 -0400 Message-Id: <1585557531-18849-1-git-send-email-maobibo@loongson.cn> X-Mailer: git-send-email 1.8.3.1 X-CM-TRANSID: AQAAf9DxL2kbsIFeIZchAA--.7S2 X-Coremail-Antispam: 1UD129KBjvAXoWfCrW3WFW3Cw4kKFy3tr47urg_yoW8ZF4fto Z29FnrKr48WFWUJF4jgFy5A3W8WFnaqr4Fy34fJ3yDJFZIy3sxX3409r12gF18C3Wxtwn3 GrW5urW8Jr4IyFWkn29KB7ZKAUJUUUU5529EdanIXcx71UUUUU7v73VFW2AGmfu7bjvjm3 AaLaJ3UjIYCTnIWjp_UUUY17k0a2IF6w4kM7kC6x804xWl14x267AKxVWUJVW8JwAFc2x0 x2IEx4CE42xK8VAvwI8IcIk0rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2ocxC64kIII0Yj4 1l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26F1j6w1UM28EF7xvwVC0 I7IYx2IY6xkF7I0E14v26F4j6r4UJwA2z4x0Y4vEx4A2jsIE14v26r4UJVWxJr1l84ACjc xK6I8E87Iv6xkF7I0E14v26F4UJVW0owAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40E FcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWrXVW3AwAv7VC2z280aVAFwI0_Gr 0_Cr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JMxkIecxEwVCm-wCF04k2 0xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI 8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2Ij64vIr41l IxAIcVC0I7IYx2IY67AKxVW7JVWDJwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr1lIx AIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26F4j6r4UJwCI42IY6I8E 87Iv6xkF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjxUvxhLDUUUU X-CM-SenderInfo: xpdruxter6z05rqj20fqof0/ Sender: linux-mips-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org Remove header files from arch/mips/include/asm/mach-loongson64 to arch/mips/loongson64/include/mach Signed-off-by: bibo mao --- arch/mips/Kconfig | 1 + arch/mips/loongson64/Platform | 2 +- arch/mips/loongson64/env.c | 8 ++++---- .../asm/mach-loongson64 => loongson64/include/mach}/boot_param.h | 0 .../mach-loongson64 => loongson64/include/mach}/builtin_dtbs.h | 0 .../include/mach}/cpu-feature-overrides.h | 0 arch/mips/loongson64/include/mach/floppy.h | 2 ++ arch/mips/loongson64/include/mach/ide.h | 2 ++ arch/mips/loongson64/include/mach/ioremap.h | 2 ++ .../asm/mach-loongson64 => loongson64/include/mach}/irq.h | 2 +- .../include/mach}/kernel-entry-init.h | 0 arch/mips/loongson64/include/mach/kmalloc.h | 2 ++ .../asm/mach-loongson64 => loongson64/include/mach}/loongson.h | 2 +- .../mach-loongson64 => loongson64/include/mach}/loongson_hwmon.h | 0 .../mach-loongson64 => loongson64/include/mach}/loongson_regs.h | 0 arch/mips/loongson64/include/mach/mangle-port.h | 2 ++ .../asm/mach-loongson64 => loongson64/include/mach}/mc146818rtc.h | 0 .../asm/mach-loongson64 => loongson64/include/mach}/mmzone.h | 2 +- .../asm/mach-loongson64 => loongson64/include/mach}/pci.h | 0 .../asm/mach-loongson64 => loongson64/include/mach}/spaces.h | 0 .../asm/mach-loongson64 => loongson64/include/mach}/topology.h | 0 arch/mips/loongson64/include/mach/war.h | 2 ++ .../asm/mach-loongson64 => loongson64/include/mach}/workarounds.h | 0 arch/mips/loongson64/init.c | 2 +- arch/mips/loongson64/numa.c | 2 +- arch/mips/loongson64/pci.c | 6 +++--- arch/mips/loongson64/platform.c | 6 +++--- arch/mips/loongson64/pm.c | 2 +- arch/mips/loongson64/reset.c | 4 ++-- arch/mips/loongson64/setup.c | 2 +- arch/mips/loongson64/smp.c | 8 ++++---- arch/mips/loongson64/time.c | 2 +- arch/mips/oprofile/op_model_loongson3.c | 4 ++-- arch/mips/pci/fixup-loongson3.c | 2 +- arch/mips/pci/ops-loongson3.c | 2 +- drivers/gpio/gpio-loongson.c | 4 ++++ drivers/irqchip/irq-loongson-liointc.c | 2 +- drivers/platform/mips/cpu_hwmon.c | 8 ++++---- 38 files changed, 51 insertions(+), 34 deletions(-) rename arch/mips/{include/asm/mach-loongson64 => loongson64/include/mach}/boot_param.h (100%) rename arch/mips/{include/asm/mach-loongson64 => loongson64/include/mach}/builtin_dtbs.h (100%) rename arch/mips/{include/asm/mach-loongson64 => loongson64/include/mach}/cpu-feature-overrides.h (100%) create mode 100644 arch/mips/loongson64/include/mach/floppy.h create mode 100644 arch/mips/loongson64/include/mach/ide.h create mode 100644 arch/mips/loongson64/include/mach/ioremap.h rename arch/mips/{include/asm/mach-loongson64 => loongson64/include/mach}/irq.h (89%) rename arch/mips/{include/asm/mach-loongson64 => loongson64/include/mach}/kernel-entry-init.h (100%) create mode 100644 arch/mips/loongson64/include/mach/kmalloc.h rename arch/mips/{include/asm/mach-loongson64 => loongson64/include/mach}/loongson.h (99%) rename arch/mips/{include/asm/mach-loongson64 => loongson64/include/mach}/loongson_hwmon.h (100%) rename arch/mips/{include/asm/mach-loongson64 => loongson64/include/mach}/loongson_regs.h (100%) create mode 100644 arch/mips/loongson64/include/mach/mangle-port.h rename arch/mips/{include/asm/mach-loongson64 => loongson64/include/mach}/mc146818rtc.h (100%) rename arch/mips/{include/asm/mach-loongson64 => loongson64/include/mach}/mmzone.h (96%) rename arch/mips/{include/asm/mach-loongson64 => loongson64/include/mach}/pci.h (100%) rename arch/mips/{include/asm/mach-loongson64 => loongson64/include/mach}/spaces.h (100%) rename arch/mips/{include/asm/mach-loongson64 => loongson64/include/mach}/topology.h (100%) create mode 100644 arch/mips/loongson64/include/mach/war.h rename arch/mips/{include/asm/mach-loongson64 => loongson64/include/mach}/workarounds.h (100%) diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 12f05bb..a7f821d 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -491,6 +491,7 @@ config MACH_LOONGSON64 select COMMON_CLK select USE_OF select BUILTIN_DTB + select HAVE_MACH_HEAD_FILES help This enables the support of Loongson-2/3 family of machines. diff --git a/arch/mips/loongson64/Platform b/arch/mips/loongson64/Platform index d5eb94c..aa0e112 100644 --- a/arch/mips/loongson64/Platform +++ b/arch/mips/loongson64/Platform @@ -56,5 +56,5 @@ cflags-y += $(call cc-option,-mno-loongson-mmi) # platform-$(CONFIG_MACH_LOONGSON64) += loongson64/ -cflags-$(CONFIG_MACH_LOONGSON64) += -I$(srctree)/arch/mips/include/asm/mach-loongson64 -mno-branch-likely +cflags-$(CONFIG_MACH_LOONGSON64) += -I$(srctree)/arch/mips/loongson64/include -mno-branch-likely load-$(CONFIG_CPU_LOONGSON64) += 0xffffffff80200000 diff --git a/arch/mips/loongson64/env.c b/arch/mips/loongson64/env.c index 2554ef1..6c73614 100644 --- a/arch/mips/loongson64/env.c +++ b/arch/mips/loongson64/env.c @@ -15,10 +15,10 @@ */ #include #include -#include -#include -#include -#include +#include +#include +#include +#include u32 cpu_clock_freq; EXPORT_SYMBOL(cpu_clock_freq); diff --git a/arch/mips/include/asm/mach-loongson64/boot_param.h b/arch/mips/loongson64/include/mach/boot_param.h similarity index 100% rename from arch/mips/include/asm/mach-loongson64/boot_param.h rename to arch/mips/loongson64/include/mach/boot_param.h diff --git a/arch/mips/include/asm/mach-loongson64/builtin_dtbs.h b/arch/mips/loongson64/include/mach/builtin_dtbs.h similarity index 100% rename from arch/mips/include/asm/mach-loongson64/builtin_dtbs.h rename to arch/mips/loongson64/include/mach/builtin_dtbs.h diff --git a/arch/mips/include/asm/mach-loongson64/cpu-feature-overrides.h b/arch/mips/loongson64/include/mach/cpu-feature-overrides.h similarity index 100% rename from arch/mips/include/asm/mach-loongson64/cpu-feature-overrides.h rename to arch/mips/loongson64/include/mach/cpu-feature-overrides.h diff --git a/arch/mips/loongson64/include/mach/floppy.h b/arch/mips/loongson64/include/mach/floppy.h new file mode 100644 index 0000000..8e17183 --- /dev/null +++ b/arch/mips/loongson64/include/mach/floppy.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/loongson64/include/mach/ide.h b/arch/mips/loongson64/include/mach/ide.h new file mode 100644 index 0000000..1251c0c --- /dev/null +++ b/arch/mips/loongson64/include/mach/ide.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/loongson64/include/mach/ioremap.h b/arch/mips/loongson64/include/mach/ioremap.h new file mode 100644 index 0000000..2369393 --- /dev/null +++ b/arch/mips/loongson64/include/mach/ioremap.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-loongson64/irq.h b/arch/mips/loongson64/include/mach/irq.h similarity index 89% rename from arch/mips/include/asm/mach-loongson64/irq.h rename to arch/mips/loongson64/include/mach/irq.h index d41dc4a..55bafce 100644 --- a/arch/mips/include/asm/mach-loongson64/irq.h +++ b/arch/mips/loongson64/include/mach/irq.h @@ -2,7 +2,7 @@ #ifndef __ASM_MACH_LOONGSON64_IRQ_H_ #define __ASM_MACH_LOONGSON64_IRQ_H_ -#include +#include /* cpu core interrupt numbers */ #define MIPS_CPU_IRQ_BASE 56 diff --git a/arch/mips/include/asm/mach-loongson64/kernel-entry-init.h b/arch/mips/loongson64/include/mach/kernel-entry-init.h similarity index 100% rename from arch/mips/include/asm/mach-loongson64/kernel-entry-init.h rename to arch/mips/loongson64/include/mach/kernel-entry-init.h diff --git a/arch/mips/loongson64/include/mach/kmalloc.h b/arch/mips/loongson64/include/mach/kmalloc.h new file mode 100644 index 0000000..4f056db --- /dev/null +++ b/arch/mips/loongson64/include/mach/kmalloc.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-loongson64/loongson.h b/arch/mips/loongson64/include/mach/loongson.h similarity index 99% rename from arch/mips/include/asm/mach-loongson64/loongson.h rename to arch/mips/loongson64/include/mach/loongson.h index fde1b75..9d719b9 100644 --- a/arch/mips/include/asm/mach-loongson64/loongson.h +++ b/arch/mips/loongson64/include/mach/loongson.h @@ -10,7 +10,7 @@ #include #include #include -#include +#include /* machine-specific reboot/halt operation */ diff --git a/arch/mips/include/asm/mach-loongson64/loongson_hwmon.h b/arch/mips/loongson64/include/mach/loongson_hwmon.h similarity index 100% rename from arch/mips/include/asm/mach-loongson64/loongson_hwmon.h rename to arch/mips/loongson64/include/mach/loongson_hwmon.h diff --git a/arch/mips/include/asm/mach-loongson64/loongson_regs.h b/arch/mips/loongson64/include/mach/loongson_regs.h similarity index 100% rename from arch/mips/include/asm/mach-loongson64/loongson_regs.h rename to arch/mips/loongson64/include/mach/loongson_regs.h diff --git a/arch/mips/loongson64/include/mach/mangle-port.h b/arch/mips/loongson64/include/mach/mangle-port.h new file mode 100644 index 0000000..b9736e3 --- /dev/null +++ b/arch/mips/loongson64/include/mach/mangle-port.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-loongson64/mc146818rtc.h b/arch/mips/loongson64/include/mach/mc146818rtc.h similarity index 100% rename from arch/mips/include/asm/mach-loongson64/mc146818rtc.h rename to arch/mips/loongson64/include/mach/mc146818rtc.h diff --git a/arch/mips/include/asm/mach-loongson64/mmzone.h b/arch/mips/loongson64/include/mach/mmzone.h similarity index 96% rename from arch/mips/include/asm/mach-loongson64/mmzone.h rename to arch/mips/loongson64/include/mach/mmzone.h index 3a25dbd..57f7375 100644 --- a/arch/mips/include/asm/mach-loongson64/mmzone.h +++ b/arch/mips/loongson64/include/mach/mmzone.h @@ -9,7 +9,7 @@ #ifndef _ASM_MACH_LOONGSON64_MMZONE_H #define _ASM_MACH_LOONGSON64_MMZONE_H -#include +#include #define NODE_ADDRSPACE_SHIFT 44 #define NODE0_ADDRSPACE_OFFSET 0x000000000000UL #define NODE1_ADDRSPACE_OFFSET 0x100000000000UL diff --git a/arch/mips/include/asm/mach-loongson64/pci.h b/arch/mips/loongson64/include/mach/pci.h similarity index 100% rename from arch/mips/include/asm/mach-loongson64/pci.h rename to arch/mips/loongson64/include/mach/pci.h diff --git a/arch/mips/include/asm/mach-loongson64/spaces.h b/arch/mips/loongson64/include/mach/spaces.h similarity index 100% rename from arch/mips/include/asm/mach-loongson64/spaces.h rename to arch/mips/loongson64/include/mach/spaces.h diff --git a/arch/mips/include/asm/mach-loongson64/topology.h b/arch/mips/loongson64/include/mach/topology.h similarity index 100% rename from arch/mips/include/asm/mach-loongson64/topology.h rename to arch/mips/loongson64/include/mach/topology.h diff --git a/arch/mips/loongson64/include/mach/war.h b/arch/mips/loongson64/include/mach/war.h new file mode 100644 index 0000000..5b0422a --- /dev/null +++ b/arch/mips/loongson64/include/mach/war.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-loongson64/workarounds.h b/arch/mips/loongson64/include/mach/workarounds.h similarity index 100% rename from arch/mips/include/asm/mach-loongson64/workarounds.h rename to arch/mips/loongson64/include/mach/workarounds.h diff --git a/arch/mips/loongson64/init.c b/arch/mips/loongson64/init.c index da38944..debbb75 100644 --- a/arch/mips/loongson64/init.c +++ b/arch/mips/loongson64/init.c @@ -12,7 +12,7 @@ #include #include -#include +#include static void __init mips_nmi_setup(void) { diff --git a/arch/mips/loongson64/numa.c b/arch/mips/loongson64/numa.c index 1ae072d..e852535 100644 --- a/arch/mips/loongson64/numa.c +++ b/arch/mips/loongson64/numa.c @@ -24,7 +24,7 @@ #include #include #include -#include +#include static struct pglist_data prealloc__node_data[MAX_NUMNODES]; unsigned char __node_distances[MAX_NUMNODES][MAX_NUMNODES]; diff --git a/arch/mips/loongson64/pci.c b/arch/mips/loongson64/pci.c index e84ae20..7011d88 100644 --- a/arch/mips/loongson64/pci.c +++ b/arch/mips/loongson64/pci.c @@ -5,9 +5,9 @@ */ #include -#include -#include -#include +#include +#include +#include static struct resource loongson_pci_mem_resource = { .name = "pci memory space", diff --git a/arch/mips/loongson64/platform.c b/arch/mips/loongson64/platform.c index 9674ae1..2cd8b9b 100644 --- a/arch/mips/loongson64/platform.c +++ b/arch/mips/loongson64/platform.c @@ -10,9 +10,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include static int __init loongson3_platform_init(void) { diff --git a/arch/mips/loongson64/pm.c b/arch/mips/loongson64/pm.c index 7c8556f..b05c6dd 100644 --- a/arch/mips/loongson64/pm.c +++ b/arch/mips/loongson64/pm.c @@ -12,7 +12,7 @@ #include #include -#include +#include static unsigned int __maybe_unused cached_master_mask; /* i8259A */ static unsigned int __maybe_unused cached_slave_mask; diff --git a/arch/mips/loongson64/reset.c b/arch/mips/loongson64/reset.c index bc76710..0fd1d50 100644 --- a/arch/mips/loongson64/reset.c +++ b/arch/mips/loongson64/reset.c @@ -12,8 +12,8 @@ #include #include -#include -#include +#include +#include static inline void loongson_reboot(void) { diff --git a/arch/mips/loongson64/setup.c b/arch/mips/loongson64/setup.c index 6fe3fff..4e7e3a4 100644 --- a/arch/mips/loongson64/setup.c +++ b/arch/mips/loongson64/setup.c @@ -13,7 +13,7 @@ #include -#include +#include void *loongson_fdt_blob; diff --git a/arch/mips/loongson64/smp.c b/arch/mips/loongson64/smp.c index e1fe8bb..d0fc0fc 100644 --- a/arch/mips/loongson64/smp.c +++ b/arch/mips/loongson64/smp.c @@ -4,7 +4,7 @@ * Author: Chen Huacai, chenhc@lemote.com */ -#include +#include #include #include #include @@ -18,9 +18,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include "smp.h" diff --git a/arch/mips/loongson64/time.c b/arch/mips/loongson64/time.c index 1245f22..4f8fdf8 100644 --- a/arch/mips/loongson64/time.c +++ b/arch/mips/loongson64/time.c @@ -10,7 +10,7 @@ #include #include -#include +#include void __init plat_time_init(void) { diff --git a/arch/mips/oprofile/op_model_loongson3.c b/arch/mips/oprofile/op_model_loongson3.c index 436b1fc..9ca6432 100644 --- a/arch/mips/oprofile/op_model_loongson3.c +++ b/arch/mips/oprofile/op_model_loongson3.c @@ -12,8 +12,8 @@ #include #include #include -#include -#include +#include +#include #include "op_impl.h" #define LOONGSON3_PERFCNT_OVERFLOW (1ULL << 63) diff --git a/arch/mips/pci/fixup-loongson3.c b/arch/mips/pci/fixup-loongson3.c index 8a741c2..6c63c30 100644 --- a/arch/mips/pci/fixup-loongson3.c +++ b/arch/mips/pci/fixup-loongson3.c @@ -24,7 +24,7 @@ */ #include -#include +#include static void print_fixup_info(const struct pci_dev *pdev) { diff --git a/arch/mips/pci/ops-loongson3.c b/arch/mips/pci/ops-loongson3.c index 2f6ad36..f40b805 100644 --- a/arch/mips/pci/ops-loongson3.c +++ b/arch/mips/pci/ops-loongson3.c @@ -5,7 +5,7 @@ #include -#include +#include #define PCI_ACCESS_READ 0 #define PCI_ACCESS_WRITE 1 diff --git a/drivers/gpio/gpio-loongson.c b/drivers/gpio/gpio-loongson.c index a421458..ebcd75a 100644 --- a/drivers/gpio/gpio-loongson.c +++ b/drivers/gpio/gpio-loongson.c @@ -17,7 +17,11 @@ #include #include #include +#ifdef CONFIG_HAVE_MACH_HEAD_FILES +#include +#else #include +#endif #define STLS2F_N_GPIO 4 #define STLS3A_N_GPIO 16 diff --git a/drivers/irqchip/irq-loongson-liointc.c b/drivers/irqchip/irq-loongson-liointc.c index 63b6147..fb23eb1 100644 --- a/drivers/irqchip/irq-loongson-liointc.c +++ b/drivers/irqchip/irq-loongson-liointc.c @@ -16,7 +16,7 @@ #include #include -#include +#include #define LIOINTC_CHIP_IRQ 32 #define LIOINTC_NUM_PARENT 4 diff --git a/drivers/platform/mips/cpu_hwmon.c b/drivers/platform/mips/cpu_hwmon.c index 0d27cb7..4bb71af 100644 --- a/drivers/platform/mips/cpu_hwmon.c +++ b/drivers/platform/mips/cpu_hwmon.c @@ -6,10 +6,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include static int csr_temp_enable = 0; From patchwork Mon Mar 30 08:38:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: bibo mao X-Patchwork-Id: 11464943 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7E00C15AB for ; Mon, 30 Mar 2020 08:39:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4540720757 for ; Mon, 30 Mar 2020 08:39:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729732AbgC3IjA (ORCPT ); Mon, 30 Mar 2020 04:39:00 -0400 Received: from mail.loongson.cn ([114.242.206.163]:56756 "EHLO loongson.cn" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729077AbgC3Ii7 (ORCPT ); Mon, 30 Mar 2020 04:38:59 -0400 Received: from kvm-dev1.localdomain (unknown [10.2.5.134]) by mail.loongson.cn (Coremail) with SMTP id AQAAf9Dxz2gdsIFeI5chAA--.13S2; Mon, 30 Mar 2020 16:38:53 +0800 (CST) From: bibo mao To: Thomas Bogendoerfer , Jiaxun Yang , Huacai Chen Cc: linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 03/39] MIPS: loongson2ef: Add header files path prefix Date: Mon, 30 Mar 2020 04:38:53 -0400 Message-Id: <1585557533-20193-1-git-send-email-maobibo@loongson.cn> X-Mailer: git-send-email 1.8.3.1 X-CM-TRANSID: AQAAf9Dxz2gdsIFeI5chAA--.13S2 X-Coremail-Antispam: 1UD129KBjvAXoWfArykJFW5Ar4UXry5tF4UCFg_yoW5Gw4fKo WIvFnrKr4rWFW7AFy2qFy5Ja4kKFnYqr4Yy34xArZrJ3sIy3srJFW09F17tr1YkF1xt3Z3 G3yF9rW8XFn7Jay8n29KB7ZKAUJUUUU5529EdanIXcx71UUUUU7v73VFW2AGmfu7bjvjm3 AaLaJ3UjIYCTnIWjp_UUUY07k0a2IF6w4kM7kC6x804xWl14x267AKxVWUJVW8JwAFc2x0 x2IEx4CE42xK8VAvwI8IcIk0rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2ocxC64kIII0Yj4 1l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26F1j6w1UM28EF7xvwVC0 I7IYx2IY6xkF7I0E14v26r4UJVWxJr1l84ACjcxK6I8E87Iv67AKxVW8Jr0_Cr1UM28EF7 xvwVC2z280aVCY1x0267AKxVWxJr0_GcWle2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG 64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Wrv_ZF1lYx0Ex4A2jsIE14v26r 4j6F4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCY02Avz4vE-syl42xK 82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGw C20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r1DMIIYrxkI7VAKI48J MIIF0xvE2Ix0cI8IcVAFwI0_Ar0_tr1lIxAIcVC0I7IYx2IY6xkF7I0E14v26F4j6r4UJw CI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Cr0_Gr1UMIIF0xvE x4A2jsIEc7CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x07bI2NNUUUUU= X-CM-SenderInfo: xpdruxter6z05rqj20fqof0/ Sender: linux-mips-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org Remove header files from arch/mips/include/asm/mach-loongson2ef to arch/mips/loongson2ef/include/mach Signed-off-by: bibo mao --- arch/mips/Kconfig | 1 + arch/mips/loongson2ef/Platform | 2 +- arch/mips/loongson2ef/common/bonito-irq.c | 2 +- arch/mips/loongson2ef/common/cs5536/cs5536_acc.c | 4 ++-- arch/mips/loongson2ef/common/cs5536/cs5536_ehci.c | 4 ++-- arch/mips/loongson2ef/common/cs5536/cs5536_ide.c | 4 ++-- arch/mips/loongson2ef/common/cs5536/cs5536_isa.c | 4 ++-- arch/mips/loongson2ef/common/cs5536/cs5536_mfgpt.c | 2 +- arch/mips/loongson2ef/common/cs5536/cs5536_ohci.c | 4 ++-- arch/mips/loongson2ef/common/cs5536/cs5536_pci.c | 4 ++-- arch/mips/loongson2ef/common/env.c | 2 +- arch/mips/loongson2ef/common/init.c | 2 +- arch/mips/loongson2ef/common/irq.c | 2 +- arch/mips/loongson2ef/common/machtype.c | 4 ++-- arch/mips/loongson2ef/common/mem.c | 6 +++--- arch/mips/loongson2ef/common/pci.c | 4 ++-- arch/mips/loongson2ef/common/pm.c | 2 +- arch/mips/loongson2ef/common/reset.c | 2 +- arch/mips/loongson2ef/common/serial.c | 4 ++-- arch/mips/loongson2ef/common/setup.c | 2 +- arch/mips/loongson2ef/common/time.c | 4 ++-- arch/mips/loongson2ef/common/uart_base.c | 2 +- arch/mips/loongson2ef/fuloong-2e/irq.c | 2 +- arch/mips/loongson2ef/fuloong-2e/reset.c | 2 +- .../include/mach}/cpu-feature-overrides.h | 0 .../mach-loongson2ef => loongson2ef/include/mach}/cs5536/cs5536.h | 0 .../include/mach}/cs5536/cs5536_mfgpt.h | 4 ++-- .../include/mach}/cs5536/cs5536_pci.h | 0 .../include/mach}/cs5536/cs5536_vsm.h | 0 arch/mips/loongson2ef/include/mach/ioremap.h | 2 ++ arch/mips/loongson2ef/include/mach/irq.h | 2 ++ arch/mips/loongson2ef/include/mach/kernel-entry-init.h | 2 ++ arch/mips/loongson2ef/include/mach/kmalloc.h | 2 ++ .../asm/mach-loongson2ef => loongson2ef/include/mach}/loongson.h | 0 .../asm/mach-loongson2ef => loongson2ef/include/mach}/machine.h | 0 arch/mips/loongson2ef/include/mach/mangle-port.h | 2 ++ .../asm/mach-loongson2ef => loongson2ef/include/mach}/mc146818rtc.h | 0 .../asm/mach-loongson2ef => loongson2ef/include/mach}/mem.h | 0 .../asm/mach-loongson2ef => loongson2ef/include/mach}/pci.h | 0 .../asm/mach-loongson2ef => loongson2ef/include/mach}/spaces.h | 0 arch/mips/loongson2ef/include/mach/topology.h | 2 ++ arch/mips/loongson2ef/include/mach/war.h | 2 ++ arch/mips/loongson2ef/lemote-2f/clock.c | 2 +- arch/mips/loongson2ef/lemote-2f/irq.c | 4 ++-- arch/mips/loongson2ef/lemote-2f/machtype.c | 2 +- arch/mips/loongson2ef/lemote-2f/pm.c | 4 ++-- arch/mips/loongson2ef/lemote-2f/reset.c | 4 ++-- arch/mips/oprofile/op_model_loongson2.c | 2 +- arch/mips/pci/fixup-lemote2f.c | 6 +++--- arch/mips/pci/ops-loongson2.c | 6 +++--- 50 files changed, 67 insertions(+), 52 deletions(-) rename arch/mips/{include/asm/mach-loongson2ef => loongson2ef/include/mach}/cpu-feature-overrides.h (100%) rename arch/mips/{include/asm/mach-loongson2ef => loongson2ef/include/mach}/cs5536/cs5536.h (100%) rename arch/mips/{include/asm/mach-loongson2ef => loongson2ef/include/mach}/cs5536/cs5536_mfgpt.h (91%) rename arch/mips/{include/asm/mach-loongson2ef => loongson2ef/include/mach}/cs5536/cs5536_pci.h (100%) rename arch/mips/{include/asm/mach-loongson2ef => loongson2ef/include/mach}/cs5536/cs5536_vsm.h (100%) create mode 100644 arch/mips/loongson2ef/include/mach/ioremap.h create mode 100644 arch/mips/loongson2ef/include/mach/irq.h create mode 100644 arch/mips/loongson2ef/include/mach/kernel-entry-init.h create mode 100644 arch/mips/loongson2ef/include/mach/kmalloc.h rename arch/mips/{include/asm/mach-loongson2ef => loongson2ef/include/mach}/loongson.h (100%) rename arch/mips/{include/asm/mach-loongson2ef => loongson2ef/include/mach}/machine.h (100%) create mode 100644 arch/mips/loongson2ef/include/mach/mangle-port.h rename arch/mips/{include/asm/mach-loongson2ef => loongson2ef/include/mach}/mc146818rtc.h (100%) rename arch/mips/{include/asm/mach-loongson2ef => loongson2ef/include/mach}/mem.h (100%) rename arch/mips/{include/asm/mach-loongson2ef => loongson2ef/include/mach}/pci.h (100%) rename arch/mips/{include/asm/mach-loongson2ef => loongson2ef/include/mach}/spaces.h (100%) create mode 100644 arch/mips/loongson2ef/include/mach/topology.h create mode 100644 arch/mips/loongson2ef/include/mach/war.h diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index a7f821d..8645207 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -457,6 +457,7 @@ config MACH_LOONGSON32 config MACH_LOONGSON2EF bool "Loongson-2E/F family of machines" select SYS_SUPPORTS_ZBOOT + select HAVE_MACH_HEAD_FILES help This enables the support of early Loongson-2E/F family of machines. diff --git a/arch/mips/loongson2ef/Platform b/arch/mips/loongson2ef/Platform index 3aca429..7d80671 100644 --- a/arch/mips/loongson2ef/Platform +++ b/arch/mips/loongson2ef/Platform @@ -27,6 +27,6 @@ endif # platform-$(CONFIG_MACH_LOONGSON2EF) += loongson2ef/ -cflags-$(CONFIG_MACH_LOONGSON2EF) += -I$(srctree)/arch/mips/include/asm/mach-loongson2ef -mno-branch-likely +cflags-$(CONFIG_MACH_LOONGSON2EF) += -I$(srctree)/arch/mips/loongson2ef/include -mno-branch-likely load-$(CONFIG_LEMOTE_FULOONG2E) += 0xffffffff80100000 load-$(CONFIG_LEMOTE_MACH2F) += 0xffffffff80200000 diff --git a/arch/mips/loongson2ef/common/bonito-irq.c b/arch/mips/loongson2ef/common/bonito-irq.c index c06ad41..2bb1d61 100644 --- a/arch/mips/loongson2ef/common/bonito-irq.c +++ b/arch/mips/loongson2ef/common/bonito-irq.c @@ -10,7 +10,7 @@ #include #include -#include +#include static inline void bonito_irq_enable(struct irq_data *d) { diff --git a/arch/mips/loongson2ef/common/cs5536/cs5536_acc.c b/arch/mips/loongson2ef/common/cs5536/cs5536_acc.c index ff50aae..242b162 100644 --- a/arch/mips/loongson2ef/common/cs5536/cs5536_acc.c +++ b/arch/mips/loongson2ef/common/cs5536/cs5536_acc.c @@ -9,8 +9,8 @@ * Author: Wu Zhangjin, wuzhangjin@gmail.com */ -#include -#include +#include +#include void pci_acc_write_reg(int reg, u32 value) { diff --git a/arch/mips/loongson2ef/common/cs5536/cs5536_ehci.c b/arch/mips/loongson2ef/common/cs5536/cs5536_ehci.c index bd4c39f..16c9886 100644 --- a/arch/mips/loongson2ef/common/cs5536/cs5536_ehci.c +++ b/arch/mips/loongson2ef/common/cs5536/cs5536_ehci.c @@ -9,8 +9,8 @@ * Author: Wu Zhangjin, wuzhangjin@gmail.com */ -#include -#include +#include +#include void pci_ehci_write_reg(int reg, u32 value) { diff --git a/arch/mips/loongson2ef/common/cs5536/cs5536_ide.c b/arch/mips/loongson2ef/common/cs5536/cs5536_ide.c index bb93329..d6b46e9 100644 --- a/arch/mips/loongson2ef/common/cs5536/cs5536_ide.c +++ b/arch/mips/loongson2ef/common/cs5536/cs5536_ide.c @@ -9,8 +9,8 @@ * Author: Wu Zhangjin, wuzhangjin@gmail.com */ -#include -#include +#include +#include void pci_ide_write_reg(int reg, u32 value) { diff --git a/arch/mips/loongson2ef/common/cs5536/cs5536_isa.c b/arch/mips/loongson2ef/common/cs5536/cs5536_isa.c index 5ad38f8..35cb825 100644 --- a/arch/mips/loongson2ef/common/cs5536/cs5536_isa.c +++ b/arch/mips/loongson2ef/common/cs5536/cs5536_isa.c @@ -10,8 +10,8 @@ */ #include -#include -#include +#include +#include /* common variables for PCI_ISA_READ/WRITE_BAR */ static const u32 divil_msr_reg[6] = { diff --git a/arch/mips/loongson2ef/common/cs5536/cs5536_mfgpt.c b/arch/mips/loongson2ef/common/cs5536/cs5536_mfgpt.c index f21a540..69677d5 100644 --- a/arch/mips/loongson2ef/common/cs5536/cs5536_mfgpt.c +++ b/arch/mips/loongson2ef/common/cs5536/cs5536_mfgpt.c @@ -21,7 +21,7 @@ #include -#include +#include static DEFINE_RAW_SPINLOCK(mfgpt_lock); diff --git a/arch/mips/loongson2ef/common/cs5536/cs5536_ohci.c b/arch/mips/loongson2ef/common/cs5536/cs5536_ohci.c index 71a52b1..c11e380 100644 --- a/arch/mips/loongson2ef/common/cs5536/cs5536_ohci.c +++ b/arch/mips/loongson2ef/common/cs5536/cs5536_ohci.c @@ -9,8 +9,8 @@ * Author: Wu Zhangjin, wuzhangjin@gmail.com */ -#include -#include +#include +#include void pci_ohci_write_reg(int reg, u32 value) { diff --git a/arch/mips/loongson2ef/common/cs5536/cs5536_pci.c b/arch/mips/loongson2ef/common/cs5536/cs5536_pci.c index 202c89b..03b0cf2 100644 --- a/arch/mips/loongson2ef/common/cs5536/cs5536_pci.c +++ b/arch/mips/loongson2ef/common/cs5536/cs5536_pci.c @@ -17,8 +17,8 @@ */ #include -#include -#include +#include +#include enum { CS5536_FUNC_START = -1, diff --git a/arch/mips/loongson2ef/common/env.c b/arch/mips/loongson2ef/common/env.c index 6f20bdf..18231a9 100644 --- a/arch/mips/loongson2ef/common/env.c +++ b/arch/mips/loongson2ef/common/env.c @@ -16,7 +16,7 @@ #include #include #include -#include +#include u32 cpu_clock_freq; EXPORT_SYMBOL(cpu_clock_freq); diff --git a/arch/mips/loongson2ef/common/init.c b/arch/mips/loongson2ef/common/init.c index 4551217..1849abb 100644 --- a/arch/mips/loongson2ef/common/init.c +++ b/arch/mips/loongson2ef/common/init.c @@ -11,7 +11,7 @@ #include #include -#include +#include /* Loongson CPU address windows config space base address */ unsigned long __maybe_unused _loongson_addrwincfg_base; diff --git a/arch/mips/loongson2ef/common/irq.c b/arch/mips/loongson2ef/common/irq.c index 0ea93c1..99be75b 100644 --- a/arch/mips/loongson2ef/common/irq.c +++ b/arch/mips/loongson2ef/common/irq.c @@ -6,7 +6,7 @@ #include #include -#include +#include /* * the first level int-handler will jump here if it is a bonito irq */ diff --git a/arch/mips/loongson2ef/common/machtype.c b/arch/mips/loongson2ef/common/machtype.c index 82f6de4..4a108b9 100644 --- a/arch/mips/loongson2ef/common/machtype.c +++ b/arch/mips/loongson2ef/common/machtype.c @@ -8,8 +8,8 @@ #include #include -#include -#include +#include +#include /* please ensure the length of the machtype string is less than 50 */ #define MACHTYPE_LEN 50 diff --git a/arch/mips/loongson2ef/common/mem.c b/arch/mips/loongson2ef/common/mem.c index ae21f1c..93cb052 100644 --- a/arch/mips/loongson2ef/common/mem.c +++ b/arch/mips/loongson2ef/common/mem.c @@ -8,9 +8,9 @@ #include -#include -#include -#include +#include +#include +#include u32 memsize, highmemsize; diff --git a/arch/mips/loongson2ef/common/pci.c b/arch/mips/loongson2ef/common/pci.c index 2009169..6ce8bf3 100644 --- a/arch/mips/loongson2ef/common/pci.c +++ b/arch/mips/loongson2ef/common/pci.c @@ -5,8 +5,8 @@ */ #include -#include -#include +#include +#include static struct resource loongson_pci_mem_resource = { .name = "pci memory space", diff --git a/arch/mips/loongson2ef/common/pm.c b/arch/mips/loongson2ef/common/pm.c index bcb7ae9..7282017 100644 --- a/arch/mips/loongson2ef/common/pm.c +++ b/arch/mips/loongson2ef/common/pm.c @@ -12,7 +12,7 @@ #include #include -#include +#include static unsigned int __maybe_unused cached_master_mask; /* i8259A */ static unsigned int __maybe_unused cached_slave_mask; diff --git a/arch/mips/loongson2ef/common/reset.c b/arch/mips/loongson2ef/common/reset.c index e49c406..ff9131c 100644 --- a/arch/mips/loongson2ef/common/reset.c +++ b/arch/mips/loongson2ef/common/reset.c @@ -12,7 +12,7 @@ #include #include -#include +#include static inline void loongson_reboot(void) { diff --git a/arch/mips/loongson2ef/common/serial.c b/arch/mips/loongson2ef/common/serial.c index ac4f6e3..7f2a3ea 100644 --- a/arch/mips/loongson2ef/common/serial.c +++ b/arch/mips/loongson2ef/common/serial.c @@ -16,8 +16,8 @@ #include -#include -#include +#include +#include #define PORT(int, clk) \ { \ diff --git a/arch/mips/loongson2ef/common/setup.c b/arch/mips/loongson2ef/common/setup.c index 4fd27f4..6fb9f9f 100644 --- a/arch/mips/loongson2ef/common/setup.c +++ b/arch/mips/loongson2ef/common/setup.c @@ -9,7 +9,7 @@ #include #include -#include +#include static void wbflush_loongson(void) { diff --git a/arch/mips/loongson2ef/common/time.c b/arch/mips/loongson2ef/common/time.c index 585741a..0248eb51 100644 --- a/arch/mips/loongson2ef/common/time.c +++ b/arch/mips/loongson2ef/common/time.c @@ -10,8 +10,8 @@ #include #include -#include -#include +#include +#include void __init plat_time_init(void) { diff --git a/arch/mips/loongson2ef/common/uart_base.c b/arch/mips/loongson2ef/common/uart_base.c index 522bea6..25e8cee 100644 --- a/arch/mips/loongson2ef/common/uart_base.c +++ b/arch/mips/loongson2ef/common/uart_base.c @@ -8,7 +8,7 @@ #include #include -#include +#include /* raw */ unsigned long loongson_uart_base; diff --git a/arch/mips/loongson2ef/fuloong-2e/irq.c b/arch/mips/loongson2ef/fuloong-2e/irq.c index 305aa2e..340acad 100644 --- a/arch/mips/loongson2ef/fuloong-2e/irq.c +++ b/arch/mips/loongson2ef/fuloong-2e/irq.c @@ -8,7 +8,7 @@ #include #include -#include +#include static void i8259_irqdispatch(void) { diff --git a/arch/mips/loongson2ef/fuloong-2e/reset.c b/arch/mips/loongson2ef/fuloong-2e/reset.c index 8273de1..7fb45cb 100644 --- a/arch/mips/loongson2ef/fuloong-2e/reset.c +++ b/arch/mips/loongson2ef/fuloong-2e/reset.c @@ -6,7 +6,7 @@ * Author: Wu Zhangjin, wuzhangjin@gmail.com */ -#include +#include void mach_prepare_reboot(void) { diff --git a/arch/mips/include/asm/mach-loongson2ef/cpu-feature-overrides.h b/arch/mips/loongson2ef/include/mach/cpu-feature-overrides.h similarity index 100% rename from arch/mips/include/asm/mach-loongson2ef/cpu-feature-overrides.h rename to arch/mips/loongson2ef/include/mach/cpu-feature-overrides.h diff --git a/arch/mips/include/asm/mach-loongson2ef/cs5536/cs5536.h b/arch/mips/loongson2ef/include/mach/cs5536/cs5536.h similarity index 100% rename from arch/mips/include/asm/mach-loongson2ef/cs5536/cs5536.h rename to arch/mips/loongson2ef/include/mach/cs5536/cs5536.h diff --git a/arch/mips/include/asm/mach-loongson2ef/cs5536/cs5536_mfgpt.h b/arch/mips/loongson2ef/include/mach/cs5536/cs5536_mfgpt.h similarity index 91% rename from arch/mips/include/asm/mach-loongson2ef/cs5536/cs5536_mfgpt.h rename to arch/mips/loongson2ef/include/mach/cs5536/cs5536_mfgpt.h index 52e8bb0..c8903b2 100644 --- a/arch/mips/include/asm/mach-loongson2ef/cs5536/cs5536_mfgpt.h +++ b/arch/mips/loongson2ef/include/mach/cs5536/cs5536_mfgpt.h @@ -6,8 +6,8 @@ #ifndef _CS5536_MFGPT_H #define _CS5536_MFGPT_H -#include -#include +#include +#include #ifdef CONFIG_CS5536_MFGPT extern void setup_mfgpt0_timer(void); diff --git a/arch/mips/include/asm/mach-loongson2ef/cs5536/cs5536_pci.h b/arch/mips/loongson2ef/include/mach/cs5536/cs5536_pci.h similarity index 100% rename from arch/mips/include/asm/mach-loongson2ef/cs5536/cs5536_pci.h rename to arch/mips/loongson2ef/include/mach/cs5536/cs5536_pci.h diff --git a/arch/mips/include/asm/mach-loongson2ef/cs5536/cs5536_vsm.h b/arch/mips/loongson2ef/include/mach/cs5536/cs5536_vsm.h similarity index 100% rename from arch/mips/include/asm/mach-loongson2ef/cs5536/cs5536_vsm.h rename to arch/mips/loongson2ef/include/mach/cs5536/cs5536_vsm.h diff --git a/arch/mips/loongson2ef/include/mach/ioremap.h b/arch/mips/loongson2ef/include/mach/ioremap.h new file mode 100644 index 0000000..2369393 --- /dev/null +++ b/arch/mips/loongson2ef/include/mach/ioremap.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/loongson2ef/include/mach/irq.h b/arch/mips/loongson2ef/include/mach/irq.h new file mode 100644 index 0000000..bb5ccce --- /dev/null +++ b/arch/mips/loongson2ef/include/mach/irq.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/loongson2ef/include/mach/kernel-entry-init.h b/arch/mips/loongson2ef/include/mach/kernel-entry-init.h new file mode 100644 index 0000000..19b872be --- /dev/null +++ b/arch/mips/loongson2ef/include/mach/kernel-entry-init.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/loongson2ef/include/mach/kmalloc.h b/arch/mips/loongson2ef/include/mach/kmalloc.h new file mode 100644 index 0000000..4f056db --- /dev/null +++ b/arch/mips/loongson2ef/include/mach/kmalloc.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-loongson2ef/loongson.h b/arch/mips/loongson2ef/include/mach/loongson.h similarity index 100% rename from arch/mips/include/asm/mach-loongson2ef/loongson.h rename to arch/mips/loongson2ef/include/mach/loongson.h diff --git a/arch/mips/include/asm/mach-loongson2ef/machine.h b/arch/mips/loongson2ef/include/mach/machine.h similarity index 100% rename from arch/mips/include/asm/mach-loongson2ef/machine.h rename to arch/mips/loongson2ef/include/mach/machine.h diff --git a/arch/mips/loongson2ef/include/mach/mangle-port.h b/arch/mips/loongson2ef/include/mach/mangle-port.h new file mode 100644 index 0000000..b9736e3 --- /dev/null +++ b/arch/mips/loongson2ef/include/mach/mangle-port.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-loongson2ef/mc146818rtc.h b/arch/mips/loongson2ef/include/mach/mc146818rtc.h similarity index 100% rename from arch/mips/include/asm/mach-loongson2ef/mc146818rtc.h rename to arch/mips/loongson2ef/include/mach/mc146818rtc.h diff --git a/arch/mips/include/asm/mach-loongson2ef/mem.h b/arch/mips/loongson2ef/include/mach/mem.h similarity index 100% rename from arch/mips/include/asm/mach-loongson2ef/mem.h rename to arch/mips/loongson2ef/include/mach/mem.h diff --git a/arch/mips/include/asm/mach-loongson2ef/pci.h b/arch/mips/loongson2ef/include/mach/pci.h similarity index 100% rename from arch/mips/include/asm/mach-loongson2ef/pci.h rename to arch/mips/loongson2ef/include/mach/pci.h diff --git a/arch/mips/include/asm/mach-loongson2ef/spaces.h b/arch/mips/loongson2ef/include/mach/spaces.h similarity index 100% rename from arch/mips/include/asm/mach-loongson2ef/spaces.h rename to arch/mips/loongson2ef/include/mach/spaces.h diff --git a/arch/mips/loongson2ef/include/mach/topology.h b/arch/mips/loongson2ef/include/mach/topology.h new file mode 100644 index 0000000..86e585b --- /dev/null +++ b/arch/mips/loongson2ef/include/mach/topology.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/loongson2ef/include/mach/war.h b/arch/mips/loongson2ef/include/mach/war.h new file mode 100644 index 0000000..5b0422a --- /dev/null +++ b/arch/mips/loongson2ef/include/mach/war.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/loongson2ef/lemote-2f/clock.c b/arch/mips/loongson2ef/lemote-2f/clock.c index 414f282..af1978e 100644 --- a/arch/mips/loongson2ef/lemote-2f/clock.c +++ b/arch/mips/loongson2ef/lemote-2f/clock.c @@ -15,7 +15,7 @@ #include #include -#include +#include static LIST_HEAD(clock_list); static DEFINE_SPINLOCK(clock_lock); diff --git a/arch/mips/loongson2ef/lemote-2f/irq.c b/arch/mips/loongson2ef/lemote-2f/irq.c index 6f00579..f13dd71 100644 --- a/arch/mips/loongson2ef/lemote-2f/irq.c +++ b/arch/mips/loongson2ef/lemote-2f/irq.c @@ -12,8 +12,8 @@ #include #include -#include -#include +#include +#include #define LOONGSON_TIMER_IRQ (MIPS_CPU_IRQ_BASE + 7) /* cpu timer */ #define LOONGSON_NORTH_BRIDGE_IRQ (MIPS_CPU_IRQ_BASE + 6) /* bonito */ diff --git a/arch/mips/loongson2ef/lemote-2f/machtype.c b/arch/mips/loongson2ef/lemote-2f/machtype.c index 9462a3a..0948f8f 100644 --- a/arch/mips/loongson2ef/lemote-2f/machtype.c +++ b/arch/mips/loongson2ef/lemote-2f/machtype.c @@ -5,7 +5,7 @@ */ #include -#include +#include void __init mach_prom_init_machtype(void) { diff --git a/arch/mips/loongson2ef/lemote-2f/pm.c b/arch/mips/loongson2ef/lemote-2f/pm.c index 3d00272..91b2c9f 100644 --- a/arch/mips/loongson2ef/lemote-2f/pm.c +++ b/arch/mips/loongson2ef/lemote-2f/pm.c @@ -16,9 +16,9 @@ #include #include -#include +#include -#include +#include #include "ec_kb3310b.h" #define I8042_KBD_IRQ 1 diff --git a/arch/mips/loongson2ef/lemote-2f/reset.c b/arch/mips/loongson2ef/lemote-2f/reset.c index 197dae4..a97ab01 100644 --- a/arch/mips/loongson2ef/lemote-2f/reset.c +++ b/arch/mips/loongson2ef/lemote-2f/reset.c @@ -13,9 +13,9 @@ #include -#include +#include -#include +#include #include "ec_kb3310b.h" static void reset_cpu(void) diff --git a/arch/mips/oprofile/op_model_loongson2.c b/arch/mips/oprofile/op_model_loongson2.c index b249ec0..b8ca331 100644 --- a/arch/mips/oprofile/op_model_loongson2.c +++ b/arch/mips/oprofile/op_model_loongson2.c @@ -13,7 +13,7 @@ #include #include -#include /* LOONGSON2_PERFCNT_IRQ */ +#include /* LOONGSON2_PERFCNT_IRQ */ #include "op_impl.h" #define LOONGSON2_CPU_TYPE "mips/loongson2" diff --git a/arch/mips/pci/fixup-lemote2f.c b/arch/mips/pci/fixup-lemote2f.c index 632ff2d..955dcbc 100644 --- a/arch/mips/pci/fixup-lemote2f.c +++ b/arch/mips/pci/fixup-lemote2f.c @@ -10,9 +10,9 @@ #include #include -#include -#include -#include +#include +#include +#include /* PCI interrupt pins * diff --git a/arch/mips/pci/ops-loongson2.c b/arch/mips/pci/ops-loongson2.c index 0d1b36b..d6f9b15 100644 --- a/arch/mips/pci/ops-loongson2.c +++ b/arch/mips/pci/ops-loongson2.c @@ -13,11 +13,11 @@ #include #include -#include +#include #ifdef CONFIG_CS5536 -#include -#include +#include +#include #endif #define PCI_ACCESS_READ 0 From patchwork Mon Mar 30 08:38:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: bibo mao X-Patchwork-Id: 11464929 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 74B6E92C for ; Mon, 30 Mar 2020 08:39:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3FC892073B for ; Mon, 30 Mar 2020 08:39:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729741AbgC3IjC (ORCPT ); Mon, 30 Mar 2020 04:39:02 -0400 Received: from mail.loongson.cn ([114.242.206.163]:56774 "EHLO loongson.cn" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726017AbgC3IjB (ORCPT ); Mon, 30 Mar 2020 04:39:01 -0400 Received: from kvm-dev1.localdomain (unknown [10.2.5.134]) by mail.loongson.cn (Coremail) with SMTP id AQAAf9Dxr2ofsIFeJZchAA--.18S2; Mon, 30 Mar 2020 16:38:55 +0800 (CST) From: bibo mao To: Thomas Bogendoerfer , Jiaxun Yang , Huacai Chen Cc: linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 04/39] MIPS: loongson32: Add header files path prefix Date: Mon, 30 Mar 2020 04:38:55 -0400 Message-Id: <1585557535-21072-1-git-send-email-maobibo@loongson.cn> X-Mailer: git-send-email 1.8.3.1 X-CM-TRANSID: AQAAf9Dxr2ofsIFeJZchAA--.18S2 X-Coremail-Antispam: 1UD129KBjvAXoW3Kr1rXw17KF1xXr18ZF1rCrg_yoW8AryDto Z2yFnrGr48JFWUJF4jgF45A3yxWFnYqF4ay3yfA398JFZIv3srJFy09rnFqF18Cryxtwnx GrWrurW8Xrs7taykn29KB7ZKAUJUUUU5529EdanIXcx71UUUUU7v73VFW2AGmfu7bjvjm3 AaLaJ3UjIYCTnIWjp_UUUY07k0a2IF6w4xM7kC6x804xWl14x267AKxVWUJVW8JwAFc2x0 x2IEx4CE42xK8VAvwI8IcIk0rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2ocxC64kIII0Yj4 1l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26F1j6w1UM28EF7xvwVC0 I7IYx2IY6xkF7I0E14v26r4UJVWxJr1l84ACjcxK6I8E87Iv67AKxVW8Jr0_Cr1UM28EF7 xvwVC2z280aVCY1x0267AKxVWxJr0_GcWle2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG 64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Wrv_ZF1lYx0Ex4A2jsIE14v26r 4j6F4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCY02Avz4vE-syl42xK 82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGw C20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r1DMIIYrxkI7VAKI48J MIIF0xvE2Ix0cI8IcVAFwI0_Ar0_tr1lIxAIcVC0I7IYx2IY6xkF7I0E14v26F4j6r4UJw CI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Cr0_Gr1UMIIF0xvE x4A2jsIEc7CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x07jDwIDUUUUU= X-CM-SenderInfo: xpdruxter6z05rqj20fqof0/ Sender: linux-mips-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org Remove header files from arch/mips/include/asm/mach-loongson32 to arch/mips/loongson32/include/mach Signed-off-by: bibo mao --- arch/mips/Kconfig | 1 + arch/mips/loongson32/Platform | 2 +- arch/mips/loongson32/common/irq.c | 4 ++-- arch/mips/loongson32/common/platform.c | 10 +++++----- arch/mips/loongson32/common/prom.c | 2 +- arch/mips/loongson32/common/reset.c | 2 +- arch/mips/loongson32/common/time.c | 4 ++-- arch/mips/loongson32/include/mach/cpu-feature-overrides.h | 2 ++ .../asm/mach-loongson32 => loongson32/include/mach}/cpufreq.h | 0 .../asm/mach-loongson32 => loongson32/include/mach}/dma.h | 0 arch/mips/loongson32/include/mach/ioremap.h | 2 ++ .../asm/mach-loongson32 => loongson32/include/mach}/irq.h | 0 arch/mips/loongson32/include/mach/kernel-entry-init.h | 2 ++ arch/mips/loongson32/include/mach/kmalloc.h | 2 ++ .../mach-loongson32 => loongson32/include/mach}/loongson1.h | 10 +++++----- arch/mips/loongson32/include/mach/mangle-port.h | 2 ++ .../asm/mach-loongson32 => loongson32/include/mach}/nand.h | 0 .../asm/mach-loongson32 => loongson32/include/mach}/platform.h | 4 ++-- .../asm/mach-loongson32 => loongson32/include/mach}/regs-clk.h | 0 .../asm/mach-loongson32 => loongson32/include/mach}/regs-mux.h | 0 .../asm/mach-loongson32 => loongson32/include/mach}/regs-pwm.h | 0 .../asm/mach-loongson32 => loongson32/include/mach}/regs-rtc.h | 0 .../asm/mach-loongson32 => loongson32/include/mach}/regs-wdt.h | 0 arch/mips/loongson32/include/mach/spaces.h | 2 ++ arch/mips/loongson32/include/mach/topology.h | 2 ++ arch/mips/loongson32/include/mach/war.h | 2 ++ arch/mips/loongson32/ls1b/board.c | 8 ++++---- arch/mips/loongson32/ls1c/board.c | 2 +- drivers/clk/loongson1/clk-loongson1b.c | 2 +- drivers/clk/loongson1/clk-loongson1c.c | 2 +- drivers/cpufreq/loongson1-cpufreq.c | 4 ++-- drivers/rtc/rtc-ls1x.c | 2 +- drivers/watchdog/loongson1_wdt.c | 2 +- 33 files changed, 47 insertions(+), 30 deletions(-) create mode 100644 arch/mips/loongson32/include/mach/cpu-feature-overrides.h rename arch/mips/{include/asm/mach-loongson32 => loongson32/include/mach}/cpufreq.h (100%) rename arch/mips/{include/asm/mach-loongson32 => loongson32/include/mach}/dma.h (100%) create mode 100644 arch/mips/loongson32/include/mach/ioremap.h rename arch/mips/{include/asm/mach-loongson32 => loongson32/include/mach}/irq.h (100%) create mode 100644 arch/mips/loongson32/include/mach/kernel-entry-init.h create mode 100644 arch/mips/loongson32/include/mach/kmalloc.h rename arch/mips/{include/asm/mach-loongson32 => loongson32/include/mach}/loongson1.h (91%) create mode 100644 arch/mips/loongson32/include/mach/mangle-port.h rename arch/mips/{include/asm/mach-loongson32 => loongson32/include/mach}/nand.h (100%) rename arch/mips/{include/asm/mach-loongson32 => loongson32/include/mach}/platform.h (95%) rename arch/mips/{include/asm/mach-loongson32 => loongson32/include/mach}/regs-clk.h (100%) rename arch/mips/{include/asm/mach-loongson32 => loongson32/include/mach}/regs-mux.h (100%) rename arch/mips/{include/asm/mach-loongson32 => loongson32/include/mach}/regs-pwm.h (100%) rename arch/mips/{include/asm/mach-loongson32 => loongson32/include/mach}/regs-rtc.h (100%) rename arch/mips/{include/asm/mach-loongson32 => loongson32/include/mach}/regs-wdt.h (100%) create mode 100644 arch/mips/loongson32/include/mach/spaces.h create mode 100644 arch/mips/loongson32/include/mach/topology.h create mode 100644 arch/mips/loongson32/include/mach/war.h diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 8645207..3c38202 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -447,6 +447,7 @@ config LASAT config MACH_LOONGSON32 bool "Loongson 32-bit family of machines" select SYS_SUPPORTS_ZBOOT + select HAVE_MACH_HEAD_FILES help This enables support for the Loongson-1 family of machines. diff --git a/arch/mips/loongson32/Platform b/arch/mips/loongson32/Platform index 7f8e342..b3f061a 100644 --- a/arch/mips/loongson32/Platform +++ b/arch/mips/loongson32/Platform @@ -1,4 +1,4 @@ cflags-$(CONFIG_CPU_LOONGSON32) += -march=mips32r2 -Wa,--trap platform-$(CONFIG_MACH_LOONGSON32) += loongson32/ -cflags-$(CONFIG_MACH_LOONGSON32) += -I$(srctree)/arch/mips/include/asm/mach-loongson32 +cflags-$(CONFIG_MACH_LOONGSON32) += -I$(srctree)/arch/mips/loongson32/include load-$(CONFIG_CPU_LOONGSON32) += 0xffffffff80200000 diff --git a/arch/mips/loongson32/common/irq.c b/arch/mips/loongson32/common/irq.c index 9a50070..0e82336 100644 --- a/arch/mips/loongson32/common/irq.c +++ b/arch/mips/loongson32/common/irq.c @@ -7,8 +7,8 @@ #include #include -#include -#include +#include +#include #define LS1X_INTC_REG(n, x) \ ((void __iomem *)KSEG1ADDR(LS1X_INTC_BASE + (n * 0x18) + (x))) diff --git a/arch/mips/loongson32/common/platform.c b/arch/mips/loongson32/common/platform.c index 794c96c..9a783f8 100644 --- a/arch/mips/loongson32/common/platform.c +++ b/arch/mips/loongson32/common/platform.c @@ -13,11 +13,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include /* 8250/16550 compatible UART */ #define LS1X_UART(_id) \ diff --git a/arch/mips/loongson32/common/prom.c b/arch/mips/loongson32/common/prom.c index fd76114..9b7dfc6 100644 --- a/arch/mips/loongson32/common/prom.c +++ b/arch/mips/loongson32/common/prom.c @@ -11,7 +11,7 @@ #include #include -#include +#include unsigned long memsize; diff --git a/arch/mips/loongson32/common/reset.c b/arch/mips/loongson32/common/reset.c index 0c7399b..3e44b7f 100644 --- a/arch/mips/loongson32/common/reset.c +++ b/arch/mips/loongson32/common/reset.c @@ -9,7 +9,7 @@ #include #include -#include +#include static void __iomem *wdt_reg_base; diff --git a/arch/mips/loongson32/common/time.c b/arch/mips/loongson32/common/time.c index 459b15c..7313eaa 100644 --- a/arch/mips/loongson32/common/time.c +++ b/arch/mips/loongson32/common/time.c @@ -8,8 +8,8 @@ #include #include -#include -#include +#include +#include #ifdef CONFIG_CEVT_CSRC_LS1X diff --git a/arch/mips/loongson32/include/mach/cpu-feature-overrides.h b/arch/mips/loongson32/include/mach/cpu-feature-overrides.h new file mode 100644 index 0000000..f3e0e12 --- /dev/null +++ b/arch/mips/loongson32/include/mach/cpu-feature-overrides.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-loongson32/cpufreq.h b/arch/mips/loongson32/include/mach/cpufreq.h similarity index 100% rename from arch/mips/include/asm/mach-loongson32/cpufreq.h rename to arch/mips/loongson32/include/mach/cpufreq.h diff --git a/arch/mips/include/asm/mach-loongson32/dma.h b/arch/mips/loongson32/include/mach/dma.h similarity index 100% rename from arch/mips/include/asm/mach-loongson32/dma.h rename to arch/mips/loongson32/include/mach/dma.h diff --git a/arch/mips/loongson32/include/mach/ioremap.h b/arch/mips/loongson32/include/mach/ioremap.h new file mode 100644 index 0000000..2369393 --- /dev/null +++ b/arch/mips/loongson32/include/mach/ioremap.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-loongson32/irq.h b/arch/mips/loongson32/include/mach/irq.h similarity index 100% rename from arch/mips/include/asm/mach-loongson32/irq.h rename to arch/mips/loongson32/include/mach/irq.h diff --git a/arch/mips/loongson32/include/mach/kernel-entry-init.h b/arch/mips/loongson32/include/mach/kernel-entry-init.h new file mode 100644 index 0000000..19b872be --- /dev/null +++ b/arch/mips/loongson32/include/mach/kernel-entry-init.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/loongson32/include/mach/kmalloc.h b/arch/mips/loongson32/include/mach/kmalloc.h new file mode 100644 index 0000000..4f056db --- /dev/null +++ b/arch/mips/loongson32/include/mach/kmalloc.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-loongson32/loongson1.h b/arch/mips/loongson32/include/mach/loongson1.h similarity index 91% rename from arch/mips/include/asm/mach-loongson32/loongson1.h rename to arch/mips/loongson32/include/mach/loongson1.h index eb3ddbe..8b53f47 100644 --- a/arch/mips/include/asm/mach-loongson32/loongson1.h +++ b/arch/mips/loongson32/include/mach/loongson1.h @@ -45,10 +45,10 @@ #define LS1X_NAND_BASE 0x1fe78000 #define LS1X_CLK_BASE 0x1fe78030 -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #endif /* __ASM_MACH_LOONGSON32_LOONGSON1_H */ diff --git a/arch/mips/loongson32/include/mach/mangle-port.h b/arch/mips/loongson32/include/mach/mangle-port.h new file mode 100644 index 0000000..b9736e3 --- /dev/null +++ b/arch/mips/loongson32/include/mach/mangle-port.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-loongson32/nand.h b/arch/mips/loongson32/include/mach/nand.h similarity index 100% rename from arch/mips/include/asm/mach-loongson32/nand.h rename to arch/mips/loongson32/include/mach/nand.h diff --git a/arch/mips/include/asm/mach-loongson32/platform.h b/arch/mips/loongson32/include/mach/platform.h similarity index 95% rename from arch/mips/include/asm/mach-loongson32/platform.h rename to arch/mips/loongson32/include/mach/platform.h index eb83e27..e2f8ac7 100644 --- a/arch/mips/include/asm/mach-loongson32/platform.h +++ b/arch/mips/loongson32/include/mach/platform.h @@ -8,8 +8,8 @@ #include -#include -#include +#include +#include extern struct platform_device ls1x_uart_pdev; extern struct platform_device ls1x_cpufreq_pdev; diff --git a/arch/mips/include/asm/mach-loongson32/regs-clk.h b/arch/mips/loongson32/include/mach/regs-clk.h similarity index 100% rename from arch/mips/include/asm/mach-loongson32/regs-clk.h rename to arch/mips/loongson32/include/mach/regs-clk.h diff --git a/arch/mips/include/asm/mach-loongson32/regs-mux.h b/arch/mips/loongson32/include/mach/regs-mux.h similarity index 100% rename from arch/mips/include/asm/mach-loongson32/regs-mux.h rename to arch/mips/loongson32/include/mach/regs-mux.h diff --git a/arch/mips/include/asm/mach-loongson32/regs-pwm.h b/arch/mips/loongson32/include/mach/regs-pwm.h similarity index 100% rename from arch/mips/include/asm/mach-loongson32/regs-pwm.h rename to arch/mips/loongson32/include/mach/regs-pwm.h diff --git a/arch/mips/include/asm/mach-loongson32/regs-rtc.h b/arch/mips/loongson32/include/mach/regs-rtc.h similarity index 100% rename from arch/mips/include/asm/mach-loongson32/regs-rtc.h rename to arch/mips/loongson32/include/mach/regs-rtc.h diff --git a/arch/mips/include/asm/mach-loongson32/regs-wdt.h b/arch/mips/loongson32/include/mach/regs-wdt.h similarity index 100% rename from arch/mips/include/asm/mach-loongson32/regs-wdt.h rename to arch/mips/loongson32/include/mach/regs-wdt.h diff --git a/arch/mips/loongson32/include/mach/spaces.h b/arch/mips/loongson32/include/mach/spaces.h new file mode 100644 index 0000000..39a4d72 --- /dev/null +++ b/arch/mips/loongson32/include/mach/spaces.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/loongson32/include/mach/topology.h b/arch/mips/loongson32/include/mach/topology.h new file mode 100644 index 0000000..86e585b --- /dev/null +++ b/arch/mips/loongson32/include/mach/topology.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/loongson32/include/mach/war.h b/arch/mips/loongson32/include/mach/war.h new file mode 100644 index 0000000..5b0422a --- /dev/null +++ b/arch/mips/loongson32/include/mach/war.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/loongson32/ls1b/board.c b/arch/mips/loongson32/ls1b/board.c index 727e067..555449e 100644 --- a/arch/mips/loongson32/ls1b/board.c +++ b/arch/mips/loongson32/ls1b/board.c @@ -7,10 +7,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include static const struct gpio_led ls1x_gpio_leds[] __initconst = { { diff --git a/arch/mips/loongson32/ls1c/board.c b/arch/mips/loongson32/ls1c/board.c index e9de6da..481512b 100644 --- a/arch/mips/loongson32/ls1c/board.c +++ b/arch/mips/loongson32/ls1c/board.c @@ -3,7 +3,7 @@ * Copyright (c) 2016 Yang Ling */ -#include +#include static struct platform_device *ls1c_platform_devices[] __initdata = { &ls1x_uart_pdev, diff --git a/drivers/clk/loongson1/clk-loongson1b.c b/drivers/clk/loongson1/clk-loongson1b.c index 13a2ca2..d590c1e 100644 --- a/drivers/clk/loongson1/clk-loongson1b.c +++ b/drivers/clk/loongson1/clk-loongson1b.c @@ -8,7 +8,7 @@ #include #include -#include +#include #include "clk.h" #define OSC (33 * 1000000) diff --git a/drivers/clk/loongson1/clk-loongson1c.c b/drivers/clk/loongson1/clk-loongson1c.c index 703f876..c58c3ad 100644 --- a/drivers/clk/loongson1/clk-loongson1c.c +++ b/drivers/clk/loongson1/clk-loongson1c.c @@ -7,7 +7,7 @@ #include #include -#include +#include #include "clk.h" #define OSC (24 * 1000000) diff --git a/drivers/cpufreq/loongson1-cpufreq.c b/drivers/cpufreq/loongson1-cpufreq.c index 0ea8877..3de842e 100644 --- a/drivers/cpufreq/loongson1-cpufreq.c +++ b/drivers/cpufreq/loongson1-cpufreq.c @@ -18,8 +18,8 @@ #include #include -#include -#include +#include +#include struct ls1x_cpufreq { struct device *dev; diff --git a/drivers/rtc/rtc-ls1x.c b/drivers/rtc/rtc-ls1x.c index 8bd3405..4d9128b 100644 --- a/drivers/rtc/rtc-ls1x.c +++ b/drivers/rtc/rtc-ls1x.c @@ -13,7 +13,7 @@ #include #include #include -#include +#include #define LS1X_RTC_REG_OFFSET (LS1X_RTC_BASE + 0x20) #define LS1X_RTC_REGS(x) \ diff --git a/drivers/watchdog/loongson1_wdt.c b/drivers/watchdog/loongson1_wdt.c index bb3d075c..fd6ef37 100644 --- a/drivers/watchdog/loongson1_wdt.c +++ b/drivers/watchdog/loongson1_wdt.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #define DEFAULT_HEARTBEAT 30 From patchwork Mon Mar 30 08:38:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: bibo mao X-Patchwork-Id: 11464941 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0E80215AB for ; Mon, 30 Mar 2020 08:39:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D75A220757 for ; Mon, 30 Mar 2020 08:39:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729654AbgC3Ija (ORCPT ); Mon, 30 Mar 2020 04:39:30 -0400 Received: from mail.loongson.cn ([114.242.206.163]:56806 "EHLO loongson.cn" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729731AbgC3IjD (ORCPT ); Mon, 30 Mar 2020 04:39:03 -0400 Received: from kvm-dev1.localdomain (unknown [10.2.5.134]) by mail.loongson.cn (Coremail) with SMTP id AQAAf9Dxf94hsIFeKJchAA--.5S2; Mon, 30 Mar 2020 16:38:57 +0800 (CST) From: bibo mao To: Thomas Bogendoerfer , Jiaxun Yang , Huacai Chen Cc: linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 05/39] MIPS: ar7: Add header files path prefix Date: Mon, 30 Mar 2020 04:38:57 -0400 Message-Id: <1585557537-21355-1-git-send-email-maobibo@loongson.cn> X-Mailer: git-send-email 1.8.3.1 X-CM-TRANSID: AQAAf9Dxf94hsIFeKJchAA--.5S2 X-Coremail-Antispam: 1UD129KBjvJXoWxKw1fCrWxGr1rKrykKw13CFg_yoWDGFy3pa 1DA3WkGr4Uuw1UArWxZF9F9r43tan0grWDKFyUW34UZ3Waq3WUJrs5JrnxAr97JFWkt3WF gFZxXr45Jwsavw7anT9S1TB71UUUUUDqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUkIb7Iv0xC_Kw4lb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rw A2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6xII jxv20xvEc7CjxVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26r4UJVWxJr1l84ACjc xK6I8E87Iv6xkF7I0E14v26F4UJVW0owAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40E FcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWrXVW3AwAv7VC2z280aVAFwI0_Gr 0_Cr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JMxkIecxEwVCm-wCF04k2 0xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI 8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2Ij64vIr41l IxAIcVC0I7IYx2IY67AKxVW7JVWDJwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Cr0_Gr1UMI IF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWxJVW8Jr1lIxAIcVC2 z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7IUYIeHPUUUUU== X-CM-SenderInfo: xpdruxter6z05rqj20fqof0/ Sender: linux-mips-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org Remove header files from arch/mips/include/asm/mach-ar7 to arch/mips/ar7/include/mach Signed-off-by: bibo mao --- arch/mips/Kconfig | 1 + arch/mips/ar7/Platform | 2 +- arch/mips/ar7/clock.c | 2 +- arch/mips/ar7/gpio.c | 2 +- arch/mips/{include/asm/mach-ar7 => ar7/include/mach}/ar7.h | 0 arch/mips/ar7/include/mach/cpu-feature-overrides.h | 2 ++ arch/mips/ar7/include/mach/ioremap.h | 2 ++ arch/mips/{include/asm/mach-ar7 => ar7/include/mach}/irq.h | 0 arch/mips/ar7/include/mach/kernel-entry-init.h | 2 ++ arch/mips/ar7/include/mach/kmalloc.h | 2 ++ arch/mips/ar7/include/mach/mangle-port.h | 2 ++ arch/mips/{include/asm/mach-ar7 => ar7/include/mach}/prom.h | 0 arch/mips/{include/asm/mach-ar7 => ar7/include/mach}/spaces.h | 0 arch/mips/ar7/include/mach/topology.h | 2 ++ arch/mips/ar7/include/mach/war.h | 2 ++ arch/mips/ar7/irq.c | 2 +- arch/mips/ar7/memory.c | 2 +- arch/mips/ar7/platform.c | 4 ++-- arch/mips/ar7/prom.c | 4 ++-- arch/mips/ar7/setup.c | 4 ++-- arch/mips/ar7/time.c | 2 +- drivers/net/ethernet/ti/cpmac.c | 2 +- drivers/watchdog/ar7_wdt.c | 2 +- 23 files changed, 29 insertions(+), 14 deletions(-) rename arch/mips/{include/asm/mach-ar7 => ar7/include/mach}/ar7.h (100%) create mode 100644 arch/mips/ar7/include/mach/cpu-feature-overrides.h create mode 100644 arch/mips/ar7/include/mach/ioremap.h rename arch/mips/{include/asm/mach-ar7 => ar7/include/mach}/irq.h (100%) create mode 100644 arch/mips/ar7/include/mach/kernel-entry-init.h create mode 100644 arch/mips/ar7/include/mach/kmalloc.h create mode 100644 arch/mips/ar7/include/mach/mangle-port.h rename arch/mips/{include/asm/mach-ar7 => ar7/include/mach}/prom.h (100%) rename arch/mips/{include/asm/mach-ar7 => ar7/include/mach}/spaces.h (100%) create mode 100644 arch/mips/ar7/include/mach/topology.h create mode 100644 arch/mips/ar7/include/mach/war.h diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 3c38202..2bb678d 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -182,6 +182,7 @@ config AR7 select GPIOLIB select VLYNQ select HAVE_CLK + select HAVE_MACH_HEAD_FILES help Support for the Texas Instruments AR7 System-on-a-Chip family: TNETD7100, 7200 and 7300. diff --git a/arch/mips/ar7/Platform b/arch/mips/ar7/Platform index 21f9102..1491003 100644 --- a/arch/mips/ar7/Platform +++ b/arch/mips/ar7/Platform @@ -2,5 +2,5 @@ # Texas Instruments AR7 # platform-$(CONFIG_AR7) += ar7/ -cflags-$(CONFIG_AR7) += -I$(srctree)/arch/mips/include/asm/mach-ar7 +cflags-$(CONFIG_AR7) += -I$(srctree)/arch/mips/ar7/include load-$(CONFIG_AR7) += 0xffffffff94100000 diff --git a/arch/mips/ar7/clock.c b/arch/mips/ar7/clock.c index 95def94..2be9dd4 100644 --- a/arch/mips/ar7/clock.c +++ b/arch/mips/ar7/clock.c @@ -16,7 +16,7 @@ #include #include -#include +#include #define BOOT_PLL_SOURCE_MASK 0x3 #define CPU_PLL_SOURCE_SHIFT 16 diff --git a/arch/mips/ar7/gpio.c b/arch/mips/ar7/gpio.c index 8b006ad..b95ae9f 100644 --- a/arch/mips/ar7/gpio.c +++ b/arch/mips/ar7/gpio.c @@ -9,7 +9,7 @@ #include #include -#include +#include #define AR7_GPIO_MAX 32 #define TITAN_GPIO_MAX 51 diff --git a/arch/mips/include/asm/mach-ar7/ar7.h b/arch/mips/ar7/include/mach/ar7.h similarity index 100% rename from arch/mips/include/asm/mach-ar7/ar7.h rename to arch/mips/ar7/include/mach/ar7.h diff --git a/arch/mips/ar7/include/mach/cpu-feature-overrides.h b/arch/mips/ar7/include/mach/cpu-feature-overrides.h new file mode 100644 index 0000000..f3e0e12 --- /dev/null +++ b/arch/mips/ar7/include/mach/cpu-feature-overrides.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/ar7/include/mach/ioremap.h b/arch/mips/ar7/include/mach/ioremap.h new file mode 100644 index 0000000..2369393 --- /dev/null +++ b/arch/mips/ar7/include/mach/ioremap.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-ar7/irq.h b/arch/mips/ar7/include/mach/irq.h similarity index 100% rename from arch/mips/include/asm/mach-ar7/irq.h rename to arch/mips/ar7/include/mach/irq.h diff --git a/arch/mips/ar7/include/mach/kernel-entry-init.h b/arch/mips/ar7/include/mach/kernel-entry-init.h new file mode 100644 index 0000000..19b872be --- /dev/null +++ b/arch/mips/ar7/include/mach/kernel-entry-init.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/ar7/include/mach/kmalloc.h b/arch/mips/ar7/include/mach/kmalloc.h new file mode 100644 index 0000000..4f056db --- /dev/null +++ b/arch/mips/ar7/include/mach/kmalloc.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/ar7/include/mach/mangle-port.h b/arch/mips/ar7/include/mach/mangle-port.h new file mode 100644 index 0000000..b9736e3 --- /dev/null +++ b/arch/mips/ar7/include/mach/mangle-port.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-ar7/prom.h b/arch/mips/ar7/include/mach/prom.h similarity index 100% rename from arch/mips/include/asm/mach-ar7/prom.h rename to arch/mips/ar7/include/mach/prom.h diff --git a/arch/mips/include/asm/mach-ar7/spaces.h b/arch/mips/ar7/include/mach/spaces.h similarity index 100% rename from arch/mips/include/asm/mach-ar7/spaces.h rename to arch/mips/ar7/include/mach/spaces.h diff --git a/arch/mips/ar7/include/mach/topology.h b/arch/mips/ar7/include/mach/topology.h new file mode 100644 index 0000000..86e585b --- /dev/null +++ b/arch/mips/ar7/include/mach/topology.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/ar7/include/mach/war.h b/arch/mips/ar7/include/mach/war.h new file mode 100644 index 0000000..5b0422a --- /dev/null +++ b/arch/mips/ar7/include/mach/war.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/ar7/irq.c b/arch/mips/ar7/irq.c index f0a7942..7b177f0 100644 --- a/arch/mips/ar7/irq.c +++ b/arch/mips/ar7/irq.c @@ -10,7 +10,7 @@ #include #include -#include +#include #define EXCEPT_OFFSET 0x80 #define PACE_OFFSET 0xA0 diff --git a/arch/mips/ar7/memory.c b/arch/mips/ar7/memory.c index ad6efb3..28c3bfc 100644 --- a/arch/mips/ar7/memory.c +++ b/arch/mips/ar7/memory.c @@ -15,7 +15,7 @@ #include #include -#include +#include static int __init memsize(void) { diff --git a/arch/mips/ar7/platform.c b/arch/mips/ar7/platform.c index 215149a..1eb816c 100644 --- a/arch/mips/ar7/platform.c +++ b/arch/mips/ar7/platform.c @@ -24,8 +24,8 @@ #include #include -#include -#include +#include +#include /***************************************************************************** * VLYNQ Bus diff --git a/arch/mips/ar7/prom.c b/arch/mips/ar7/prom.c index 5810d39..7ac39fd 100644 --- a/arch/mips/ar7/prom.c +++ b/arch/mips/ar7/prom.c @@ -15,8 +15,8 @@ #include #include -#include -#include +#include +#include #define MAX_ENTRY 80 diff --git a/arch/mips/ar7/setup.c b/arch/mips/ar7/setup.c index b3ffe7c..3134dfa 100644 --- a/arch/mips/ar7/setup.c +++ b/arch/mips/ar7/setup.c @@ -9,8 +9,8 @@ #include #include -#include -#include +#include +#include static void ar7_machine_restart(char *command) { diff --git a/arch/mips/ar7/time.c b/arch/mips/ar7/time.c index 72aa77d..3f08a79 100644 --- a/arch/mips/ar7/time.c +++ b/arch/mips/ar7/time.c @@ -12,7 +12,7 @@ #include #include -#include +#include void __init plat_time_init(void) { diff --git a/drivers/net/ethernet/ti/cpmac.c b/drivers/net/ethernet/ti/cpmac.c index a530afe..09aec63 100644 --- a/drivers/net/ethernet/ti/cpmac.c +++ b/drivers/net/ethernet/ti/cpmac.c @@ -29,7 +29,7 @@ #include #include -#include +#include MODULE_AUTHOR("Eugene Konev "); MODULE_DESCRIPTION("TI AR7 ethernet driver (CPMAC)"); diff --git a/drivers/watchdog/ar7_wdt.c b/drivers/watchdog/ar7_wdt.c index c087027..d1cb477 100644 --- a/drivers/watchdog/ar7_wdt.c +++ b/drivers/watchdog/ar7_wdt.c @@ -26,7 +26,7 @@ #include #include -#include +#include #define LONGNAME "TI AR7 Watchdog Timer" From patchwork Mon Mar 30 08:38:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: bibo mao X-Patchwork-Id: 11464931 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 00F8C15AB for ; Mon, 30 Mar 2020 08:39:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D4100208E4 for ; Mon, 30 Mar 2020 08:39:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729764AbgC3IjI (ORCPT ); Mon, 30 Mar 2020 04:39:08 -0400 Received: from mail.loongson.cn ([114.242.206.163]:56830 "EHLO loongson.cn" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729754AbgC3IjF (ORCPT ); Mon, 30 Mar 2020 04:39:05 -0400 Received: from kvm-dev1.localdomain (unknown [10.2.5.134]) by mail.loongson.cn (Coremail) with SMTP id AQAAf9DxT2gjsIFeLJchAA--.18S2; Mon, 30 Mar 2020 16:39:00 +0800 (CST) From: bibo mao To: Thomas Bogendoerfer , Jiaxun Yang , Huacai Chen Cc: linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 06/39] MIPS: ath25: Add header files path prefix Date: Mon, 30 Mar 2020 04:38:59 -0400 Message-Id: <1585557539-22068-1-git-send-email-maobibo@loongson.cn> X-Mailer: git-send-email 1.8.3.1 X-CM-TRANSID: AQAAf9DxT2gjsIFeLJchAA--.18S2 X-Coremail-Antispam: 1UD129KBjvJXoW3GrWxWryUAFyUuFWDCr4rKrg_yoW3AFWDpa 1DA3WkCrsrur1jy3sxuFy7tr43Jan8WrWq9FyrW34DZa4aqF18JFs5KryqvFyxJF4DK3Wr Wry3Wr4UJa1vvaUanT9S1TB71UUUUUDqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUkIb7Iv0xC_Kw4lb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rw A2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6xII jxv20xvEc7CjxVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26r4UJVWxJr1l84ACjc xK6I8E87Iv6xkF7I0E14v26F4UJVW0owAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40E FcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWrXVW3AwAv7VC2z280aVAFwI0_Gr 0_Cr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JMxkIecxEwVCm-wCF04k2 0xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI 8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2Ij64vIr41l IxAIcVC0I7IYx2IY67AKxVW7JVWDJwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Cr0_Gr1UMI IF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWxJVW8Jr1lIxAIcVC2 z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7IUYIeHPUUUUU== X-CM-SenderInfo: xpdruxter6z05rqj20fqof0/ Sender: linux-mips-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org Remove header files from arch/mips/include/asm/mach-ath25 to arch/mips/ath25/include/mach Signed-off-by: bibo mao --- arch/mips/Kconfig | 1 + arch/mips/ath25/Platform | 2 +- arch/mips/ath25/ar2315.c | 2 +- arch/mips/ath25/ar5312.c | 2 +- arch/mips/ath25/board.c | 2 +- arch/mips/ath25/devices.c | 2 +- .../{include/asm/mach-ath25 => ath25/include/mach}/ath25_platform.h | 0 .../asm/mach-ath25 => ath25/include/mach}/cpu-feature-overrides.h | 0 arch/mips/ath25/include/mach/ioremap.h | 2 ++ arch/mips/ath25/include/mach/irq.h | 2 ++ arch/mips/ath25/include/mach/kernel-entry-init.h | 2 ++ arch/mips/ath25/include/mach/kmalloc.h | 2 ++ arch/mips/ath25/include/mach/mangle-port.h | 2 ++ arch/mips/ath25/include/mach/spaces.h | 2 ++ arch/mips/ath25/include/mach/topology.h | 2 ++ arch/mips/ath25/include/mach/war.h | 2 ++ drivers/net/wireless/ath/ath5k/ahb.c | 2 +- 17 files changed, 23 insertions(+), 6 deletions(-) rename arch/mips/{include/asm/mach-ath25 => ath25/include/mach}/ath25_platform.h (100%) rename arch/mips/{include/asm/mach-ath25 => ath25/include/mach}/cpu-feature-overrides.h (100%) create mode 100644 arch/mips/ath25/include/mach/ioremap.h create mode 100644 arch/mips/ath25/include/mach/irq.h create mode 100644 arch/mips/ath25/include/mach/kernel-entry-init.h create mode 100644 arch/mips/ath25/include/mach/kmalloc.h create mode 100644 arch/mips/ath25/include/mach/mangle-port.h create mode 100644 arch/mips/ath25/include/mach/spaces.h create mode 100644 arch/mips/ath25/include/mach/topology.h create mode 100644 arch/mips/ath25/include/mach/war.h diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 2bb678d..7fec160 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -198,6 +198,7 @@ config ATH25 select SYS_SUPPORTS_BIG_ENDIAN select SYS_SUPPORTS_32BIT_KERNEL select SYS_HAS_EARLY_PRINTK + select HAVE_MACH_HEAD_FILES help Support for Atheros AR231x and Atheros AR531x based boards diff --git a/arch/mips/ath25/Platform b/arch/mips/ath25/Platform index ef3f81f..a4fddcc 100644 --- a/arch/mips/ath25/Platform +++ b/arch/mips/ath25/Platform @@ -2,5 +2,5 @@ # Atheros AR531X/AR231X WiSoC # platform-$(CONFIG_ATH25) += ath25/ -cflags-$(CONFIG_ATH25) += -I$(srctree)/arch/mips/include/asm/mach-ath25 +cflags-$(CONFIG_ATH25) += -I$(srctree)/arch/mips/ath25/include load-$(CONFIG_ATH25) += 0xffffffff80041000 diff --git a/arch/mips/ath25/ar2315.c b/arch/mips/ath25/ar2315.c index e7b53e3..e435ccc 100644 --- a/arch/mips/ath25/ar2315.c +++ b/arch/mips/ath25/ar2315.c @@ -25,7 +25,7 @@ #include #include -#include +#include #include "devices.h" #include "ar2315.h" diff --git a/arch/mips/ath25/ar5312.c b/arch/mips/ath25/ar5312.c index 42bf2af..2f1a8b1 100644 --- a/arch/mips/ath25/ar5312.c +++ b/arch/mips/ath25/ar5312.c @@ -26,7 +26,7 @@ #include #include -#include +#include #include "devices.h" #include "ar5312.h" diff --git a/arch/mips/ath25/board.c b/arch/mips/ath25/board.c index cb99f97..5ec998b 100644 --- a/arch/mips/ath25/board.c +++ b/arch/mips/ath25/board.c @@ -16,7 +16,7 @@ #include #include -#include +#include #include "devices.h" #include "ar5312.h" #include "ar2315.h" diff --git a/arch/mips/ath25/devices.c b/arch/mips/ath25/devices.c index 301a902..bf5f737 100644 --- a/arch/mips/ath25/devices.c +++ b/arch/mips/ath25/devices.c @@ -5,7 +5,7 @@ #include #include -#include +#include #include "devices.h" #include "ar5312.h" #include "ar2315.h" diff --git a/arch/mips/include/asm/mach-ath25/ath25_platform.h b/arch/mips/ath25/include/mach/ath25_platform.h similarity index 100% rename from arch/mips/include/asm/mach-ath25/ath25_platform.h rename to arch/mips/ath25/include/mach/ath25_platform.h diff --git a/arch/mips/include/asm/mach-ath25/cpu-feature-overrides.h b/arch/mips/ath25/include/mach/cpu-feature-overrides.h similarity index 100% rename from arch/mips/include/asm/mach-ath25/cpu-feature-overrides.h rename to arch/mips/ath25/include/mach/cpu-feature-overrides.h diff --git a/arch/mips/ath25/include/mach/ioremap.h b/arch/mips/ath25/include/mach/ioremap.h new file mode 100644 index 0000000..2369393 --- /dev/null +++ b/arch/mips/ath25/include/mach/ioremap.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/ath25/include/mach/irq.h b/arch/mips/ath25/include/mach/irq.h new file mode 100644 index 0000000..bb5ccce --- /dev/null +++ b/arch/mips/ath25/include/mach/irq.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/ath25/include/mach/kernel-entry-init.h b/arch/mips/ath25/include/mach/kernel-entry-init.h new file mode 100644 index 0000000..19b872be --- /dev/null +++ b/arch/mips/ath25/include/mach/kernel-entry-init.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/ath25/include/mach/kmalloc.h b/arch/mips/ath25/include/mach/kmalloc.h new file mode 100644 index 0000000..4f056db --- /dev/null +++ b/arch/mips/ath25/include/mach/kmalloc.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/ath25/include/mach/mangle-port.h b/arch/mips/ath25/include/mach/mangle-port.h new file mode 100644 index 0000000..b9736e3 --- /dev/null +++ b/arch/mips/ath25/include/mach/mangle-port.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/ath25/include/mach/spaces.h b/arch/mips/ath25/include/mach/spaces.h new file mode 100644 index 0000000..39a4d72 --- /dev/null +++ b/arch/mips/ath25/include/mach/spaces.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/ath25/include/mach/topology.h b/arch/mips/ath25/include/mach/topology.h new file mode 100644 index 0000000..86e585b --- /dev/null +++ b/arch/mips/ath25/include/mach/topology.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/ath25/include/mach/war.h b/arch/mips/ath25/include/mach/war.h new file mode 100644 index 0000000..5b0422a --- /dev/null +++ b/arch/mips/ath25/include/mach/war.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/drivers/net/wireless/ath/ath5k/ahb.c b/drivers/net/wireless/ath/ath5k/ahb.c index 2c9cec8..9281b36 100644 --- a/drivers/net/wireless/ath/ath5k/ahb.c +++ b/drivers/net/wireless/ath/ath5k/ahb.c @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include "ath5k.h" #include "debug.h" #include "base.h" From patchwork Mon Mar 30 08:39:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: bibo mao X-Patchwork-Id: 11464939 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C966592C for ; Mon, 30 Mar 2020 08:39:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9C1D620776 for ; Mon, 30 Mar 2020 08:39:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729774AbgC3IjK (ORCPT ); Mon, 30 Mar 2020 04:39:10 -0400 Received: from mail.loongson.cn ([114.242.206.163]:56858 "EHLO loongson.cn" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729763AbgC3IjK (ORCPT ); Mon, 30 Mar 2020 04:39:10 -0400 Received: from kvm-dev1.localdomain (unknown [10.2.5.134]) by mail.loongson.cn (Coremail) with SMTP id AQAAf9Dxv9smsIFeLZchAA--.9S2; Mon, 30 Mar 2020 16:39:02 +0800 (CST) From: bibo mao To: Thomas Bogendoerfer , Jiaxun Yang , Huacai Chen Cc: linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 07/39] MIPS: ath79: Add header files path prefix Date: Mon, 30 Mar 2020 04:39:02 -0400 Message-Id: <1585557542-23310-1-git-send-email-maobibo@loongson.cn> X-Mailer: git-send-email 1.8.3.1 X-CM-TRANSID: AQAAf9Dxv9smsIFeLZchAA--.9S2 X-Coremail-Antispam: 1UD129KBjvJXoWxtr43ArWkXrWkCw1kXr4ktFb_yoWfurWrpa 1DAa4kGr4UuryUAr13Zry2vr45Xan8uFWj9ry5W347Za4SqF15JFs5K34kAry8tF4DK3Wr WFW3Xr45Jws29aUanT9S1TB71UUUUUDqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUkIb7Iv0xC_Kw4lb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rw A2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6xII jxv20xvEc7CjxVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26r4UJVWxJr1l84ACjc xK6I8E87Iv6xkF7I0E14v26F4UJVW0owAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40E FcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWrXVW3AwAv7VC2z280aVAFwI0_Gr 0_Cr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JMxkIecxEwVCm-wCF04k2 0xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI 8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2Ij64vIr41l IxAIcVC0I7IYx2IY67AKxVW7JVWDJwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Cr0_Gr1UMI IF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWxJVW8Jr1lIxAIcVC2 z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7IUYIeHPUUUUU== X-CM-SenderInfo: xpdruxter6z05rqj20fqof0/ Sender: linux-mips-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org Remove header files from arch/mips/include/asm/mach-ath79 to arch/mips/ath79/include/mach Signed-off-by: bibo mao --- arch/mips/Kconfig | 1 + arch/mips/ath79/Platform | 2 +- arch/mips/ath79/clock.c | 4 ++-- arch/mips/ath79/common.c | 4 ++-- arch/mips/ath79/early_printk.c | 6 +++--- .../{include/asm/mach-ath79 => ath79/include/mach}/ar71xx_regs.h | 0 .../{include/asm/mach-ath79 => ath79/include/mach}/ar933x_uart.h | 0 arch/mips/{include/asm/mach-ath79 => ath79/include/mach}/ath79.h | 0 .../asm/mach-ath79 => ath79/include/mach}/cpu-feature-overrides.h | 0 arch/mips/ath79/include/mach/ioremap.h | 2 ++ arch/mips/{include/asm/mach-ath79 => ath79/include/mach}/irq.h | 0 .../asm/mach-ath79 => ath79/include/mach}/kernel-entry-init.h | 0 arch/mips/ath79/include/mach/kmalloc.h | 2 ++ arch/mips/ath79/include/mach/mangle-port.h | 2 ++ arch/mips/ath79/include/mach/spaces.h | 2 ++ arch/mips/ath79/include/mach/topology.h | 2 ++ arch/mips/ath79/include/mach/war.h | 2 ++ arch/mips/ath79/setup.c | 4 ++-- drivers/irqchip/irq-ath79-cpu.c | 2 +- drivers/tty/serial/ar933x_uart.c | 2 +- 20 files changed, 25 insertions(+), 12 deletions(-) rename arch/mips/{include/asm/mach-ath79 => ath79/include/mach}/ar71xx_regs.h (100%) rename arch/mips/{include/asm/mach-ath79 => ath79/include/mach}/ar933x_uart.h (100%) rename arch/mips/{include/asm/mach-ath79 => ath79/include/mach}/ath79.h (100%) rename arch/mips/{include/asm/mach-ath79 => ath79/include/mach}/cpu-feature-overrides.h (100%) create mode 100644 arch/mips/ath79/include/mach/ioremap.h rename arch/mips/{include/asm/mach-ath79 => ath79/include/mach}/irq.h (100%) rename arch/mips/{include/asm/mach-ath79 => ath79/include/mach}/kernel-entry-init.h (100%) create mode 100644 arch/mips/ath79/include/mach/kmalloc.h create mode 100644 arch/mips/ath79/include/mach/mangle-port.h create mode 100644 arch/mips/ath79/include/mach/spaces.h create mode 100644 arch/mips/ath79/include/mach/topology.h create mode 100644 arch/mips/ath79/include/mach/war.h diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 7fec160..069fa94 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -223,6 +223,7 @@ config ATH79 select SYS_SUPPORTS_ZBOOT_UART_PROM select USE_OF select USB_EHCI_ROOT_HUB_TT if USB_EHCI_HCD_PLATFORM + select HAVE_MACH_HEAD_FILES help Support for the Atheros AR71XX/AR724X/AR913X SoCs. diff --git a/arch/mips/ath79/Platform b/arch/mips/ath79/Platform index 2bd6636..c423827 100644 --- a/arch/mips/ath79/Platform +++ b/arch/mips/ath79/Platform @@ -3,5 +3,5 @@ # platform-$(CONFIG_ATH79) += ath79/ -cflags-$(CONFIG_ATH79) += -I$(srctree)/arch/mips/include/asm/mach-ath79 +cflags-$(CONFIG_ATH79) += -I$(srctree)/arch/mips/ath79/include load-$(CONFIG_ATH79) = 0xffffffff80060000 diff --git a/arch/mips/ath79/clock.c b/arch/mips/ath79/clock.c index 050f655..d84f119 100644 --- a/arch/mips/ath79/clock.c +++ b/arch/mips/ath79/clock.c @@ -21,8 +21,8 @@ #include -#include -#include +#include +#include #include "common.h" #define AR71XX_BASE_FREQ 40000000 diff --git a/arch/mips/ath79/common.c b/arch/mips/ath79/common.c index 137abbc..2fc96a5 100644 --- a/arch/mips/ath79/common.c +++ b/arch/mips/ath79/common.c @@ -14,8 +14,8 @@ #include #include -#include -#include +#include +#include #include "common.h" static DEFINE_SPINLOCK(ath79_device_reset_lock); diff --git a/arch/mips/ath79/early_printk.c b/arch/mips/ath79/early_printk.c index 782732c..f56d23b 100644 --- a/arch/mips/ath79/early_printk.c +++ b/arch/mips/ath79/early_printk.c @@ -12,9 +12,9 @@ #include #include -#include -#include -#include +#include +#include +#include static void (*_prom_putchar)(char); diff --git a/arch/mips/include/asm/mach-ath79/ar71xx_regs.h b/arch/mips/ath79/include/mach/ar71xx_regs.h similarity index 100% rename from arch/mips/include/asm/mach-ath79/ar71xx_regs.h rename to arch/mips/ath79/include/mach/ar71xx_regs.h diff --git a/arch/mips/include/asm/mach-ath79/ar933x_uart.h b/arch/mips/ath79/include/mach/ar933x_uart.h similarity index 100% rename from arch/mips/include/asm/mach-ath79/ar933x_uart.h rename to arch/mips/ath79/include/mach/ar933x_uart.h diff --git a/arch/mips/include/asm/mach-ath79/ath79.h b/arch/mips/ath79/include/mach/ath79.h similarity index 100% rename from arch/mips/include/asm/mach-ath79/ath79.h rename to arch/mips/ath79/include/mach/ath79.h diff --git a/arch/mips/include/asm/mach-ath79/cpu-feature-overrides.h b/arch/mips/ath79/include/mach/cpu-feature-overrides.h similarity index 100% rename from arch/mips/include/asm/mach-ath79/cpu-feature-overrides.h rename to arch/mips/ath79/include/mach/cpu-feature-overrides.h diff --git a/arch/mips/ath79/include/mach/ioremap.h b/arch/mips/ath79/include/mach/ioremap.h new file mode 100644 index 0000000..2369393 --- /dev/null +++ b/arch/mips/ath79/include/mach/ioremap.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-ath79/irq.h b/arch/mips/ath79/include/mach/irq.h similarity index 100% rename from arch/mips/include/asm/mach-ath79/irq.h rename to arch/mips/ath79/include/mach/irq.h diff --git a/arch/mips/include/asm/mach-ath79/kernel-entry-init.h b/arch/mips/ath79/include/mach/kernel-entry-init.h similarity index 100% rename from arch/mips/include/asm/mach-ath79/kernel-entry-init.h rename to arch/mips/ath79/include/mach/kernel-entry-init.h diff --git a/arch/mips/ath79/include/mach/kmalloc.h b/arch/mips/ath79/include/mach/kmalloc.h new file mode 100644 index 0000000..4f056db --- /dev/null +++ b/arch/mips/ath79/include/mach/kmalloc.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/ath79/include/mach/mangle-port.h b/arch/mips/ath79/include/mach/mangle-port.h new file mode 100644 index 0000000..b9736e3 --- /dev/null +++ b/arch/mips/ath79/include/mach/mangle-port.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/ath79/include/mach/spaces.h b/arch/mips/ath79/include/mach/spaces.h new file mode 100644 index 0000000..39a4d72 --- /dev/null +++ b/arch/mips/ath79/include/mach/spaces.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/ath79/include/mach/topology.h b/arch/mips/ath79/include/mach/topology.h new file mode 100644 index 0000000..86e585b --- /dev/null +++ b/arch/mips/ath79/include/mach/topology.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/ath79/include/mach/war.h b/arch/mips/ath79/include/mach/war.h new file mode 100644 index 0000000..5b0422a --- /dev/null +++ b/arch/mips/ath79/include/mach/war.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/ath79/setup.c b/arch/mips/ath79/setup.c index acb4fd6..1b2226c 100644 --- a/arch/mips/ath79/setup.c +++ b/arch/mips/ath79/setup.c @@ -27,8 +27,8 @@ #include #include -#include -#include +#include +#include #include "common.h" #define ATH79_SYS_TYPE_LEN 64 diff --git a/drivers/irqchip/irq-ath79-cpu.c b/drivers/irqchip/irq-ath79-cpu.c index 923e4bb..8f4ffcb 100644 --- a/drivers/irqchip/irq-ath79-cpu.c +++ b/drivers/irqchip/irq-ath79-cpu.c @@ -15,7 +15,7 @@ #include #include -#include +#include /* * The IP2/IP3 lines are tied to a PCI/WMAC/USB device. Drivers for diff --git a/drivers/tty/serial/ar933x_uart.c b/drivers/tty/serial/ar933x_uart.c index 3bdd56a..5147f8e 100644 --- a/drivers/tty/serial/ar933x_uart.c +++ b/drivers/tty/serial/ar933x_uart.c @@ -27,7 +27,7 @@ #include -#include +#include #define DRIVER_NAME "ar933x-uart" From patchwork Mon Mar 30 08:39:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: bibo mao X-Patchwork-Id: 11464935 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 111D392C for ; Mon, 30 Mar 2020 08:39:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D10D0207FF for ; Mon, 30 Mar 2020 08:39:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729752AbgC3IjM (ORCPT ); Mon, 30 Mar 2020 04:39:12 -0400 Received: from mail.loongson.cn ([114.242.206.163]:56874 "EHLO loongson.cn" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729743AbgC3IjL (ORCPT ); Mon, 30 Mar 2020 04:39:11 -0400 Received: from kvm-dev1.localdomain (unknown [10.2.5.134]) by mail.loongson.cn (Coremail) with SMTP id AQAAf9DxT2gosIFeLpchAA--.19S2; Mon, 30 Mar 2020 16:39:04 +0800 (CST) From: bibo mao To: Thomas Bogendoerfer , Jiaxun Yang , Huacai Chen Cc: linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 08/39] MIPS: alchemy: Add header files path prefix Date: Mon, 30 Mar 2020 04:39:04 -0400 Message-Id: <1585557544-25442-1-git-send-email-maobibo@loongson.cn> X-Mailer: git-send-email 1.8.3.1 X-CM-TRANSID: AQAAf9DxT2gosIFeLpchAA--.19S2 X-Coremail-Antispam: 1UD129KBjvAXoWftF4fuw1kJF1Dtw4UJw1DKFg_yoWrXF1fWo WxtFn7KryrtFW5GF18GFyjka4xXrn2qa13Jwn5JFZxAasrA347ArW09w1UKa43Gr1xtwnx C3yrZryDJr1vgFykn29KB7ZKAUJUUUU5529EdanIXcx71UUUUU7v73VFW2AGmfu7bjvjm3 AaLaJ3UjIYCTnIWjp_UUUY07k0a2IF6w4kM7kC6x804xWl14x267AKxVWUJVW8JwAFc2x0 x2IEx4CE42xK8VAvwI8IcIk0rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2ocxC64kIII0Yj4 1l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26F1j6w1UM28EF7xvwVC0 I7IYx2IY6xkF7I0E14v26r4UJVWxJr1l84ACjcxK6I8E87Iv67AKxVW8Jr0_Cr1UM28EF7 xvwVC2z280aVCY1x0267AKxVWxJr0_GcWle2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG 64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Wrv_ZF1lYx0Ex4A2jsIE14v26r 4j6F4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCY02Avz4vE-syl42xK 82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGw C20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r1DMIIYrxkI7VAKI48J MIIF0xvE2Ix0cI8IcVAFwI0_Ar0_tr1lIxAIcVC0I7IYx2IY6xkF7I0E14v26F4j6r4UJw CI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Cr0_Gr1UMIIF0xvE x4A2jsIEc7CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x07bI2NNUUUUU= X-CM-SenderInfo: xpdruxter6z05rqj20fqof0/ Sender: linux-mips-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org Remove header files from arch/mips/include/asm/mach-au1x00 to arch/mips/alchemy/common/include/mach Signed-off-by: bibo mao --- arch/mips/Kconfig | 1 + arch/mips/alchemy/Platform | 3 +-- arch/mips/alchemy/board-gpr.c | 6 +++--- arch/mips/alchemy/board-mtx1.c | 8 ++++---- arch/mips/alchemy/board-xxs1500.c | 4 ++-- arch/mips/alchemy/common/clock.c | 2 +- arch/mips/alchemy/common/dbdma.c | 4 ++-- arch/mips/alchemy/common/dma.c | 4 ++-- arch/mips/alchemy/common/gpiolib.c | 4 ++-- arch/mips/alchemy/common/irq.c | 4 ++-- arch/mips/alchemy/common/platform.c | 10 +++++----- arch/mips/alchemy/common/power.c | 2 +- arch/mips/alchemy/common/setup.c | 2 +- arch/mips/alchemy/common/time.c | 2 +- arch/mips/alchemy/common/usb.c | 2 +- arch/mips/alchemy/common/vss.c | 2 +- arch/mips/alchemy/devboards/bcsr.c | 2 +- arch/mips/alchemy/devboards/db1000.c | 12 ++++++------ arch/mips/alchemy/devboards/db1200.c | 14 +++++++------- arch/mips/alchemy/devboards/db1300.c | 16 ++++++++-------- arch/mips/alchemy/devboards/db1550.c | 18 +++++++++--------- arch/mips/alchemy/devboards/db1xxx.c | 4 ++-- arch/mips/alchemy/devboards/platform.c | 6 +++--- arch/mips/alchemy/devboards/pm.c | 6 +++--- .../asm/mach-au1x00 => alchemy/include/mach}/au1000.h | 0 .../mach-au1x00 => alchemy/include/mach}/au1000_dma.h | 0 .../mach-au1x00 => alchemy/include/mach}/au1100_mmc.h | 0 .../mach-au1x00 => alchemy/include/mach}/au1200fb.h | 0 .../mach-au1x00 => alchemy/include/mach}/au1550_spi.h | 0 .../mach-au1x00 => alchemy/include/mach}/au1550nd.h | 0 .../include/mach}/au1xxx_dbdma.h | 0 .../mach-au1x00 => alchemy/include/mach}/au1xxx_eth.h | 0 .../mach-au1x00 => alchemy/include/mach}/au1xxx_psc.h | 0 .../include/mach}/cpu-feature-overrides.h | 0 .../mach-db1x00 => alchemy/include/mach/db1x00}/bcsr.h | 0 .../mach-db1x00 => alchemy/include/mach/db1x00}/irq.h | 0 arch/mips/alchemy/include/mach/floppy.h | 2 ++ .../mach-au1x00 => alchemy/include/mach}/gpio-au1000.h | 2 +- .../mach-au1x00 => alchemy/include/mach}/gpio-au1300.h | 2 +- arch/mips/alchemy/include/mach/ide.h | 2 ++ .../asm/mach-au1x00 => alchemy/include/mach}/ioremap.h | 0 arch/mips/alchemy/include/mach/irq.h | 6 ++++++ arch/mips/alchemy/include/mach/kernel-entry-init.h | 2 ++ arch/mips/alchemy/include/mach/kmalloc.h | 2 ++ arch/mips/alchemy/include/mach/mangle-port.h | 2 ++ arch/mips/alchemy/include/mach/mc146818rtc.h | 2 ++ .../asm/mach-au1x00 => alchemy/include/mach}/prom.h | 0 arch/mips/alchemy/include/mach/spaces.h | 2 ++ arch/mips/alchemy/include/mach/topology.h | 2 ++ arch/mips/alchemy/include/mach/war.h | 2 ++ arch/mips/boot/compressed/uart-alchemy.c | 2 +- arch/mips/pci/pci-alchemy.c | 2 +- drivers/i2c/busses/i2c-au1550.c | 4 ++-- drivers/mmc/host/au1xmmc.c | 6 +++--- drivers/mtd/nand/raw/au1550nd.c | 4 ++-- drivers/net/ethernet/amd/au1000_eth.c | 6 +++--- drivers/pcmcia/db1xxx_ss.c | 4 ++-- drivers/pcmcia/xxs1500_ss.c | 2 +- drivers/rtc/rtc-au1xxx.c | 2 +- drivers/spi/spi-au1550.c | 8 ++++---- drivers/video/fbdev/au1100fb.c | 2 +- drivers/video/fbdev/au1100fb.h | 2 +- drivers/video/fbdev/au1200fb.c | 4 ++-- drivers/watchdog/mtx-1_wdt.c | 2 +- sound/soc/au1x/ac97c.c | 2 +- sound/soc/au1x/db1000.c | 4 ++-- sound/soc/au1x/db1200.c | 8 ++++---- sound/soc/au1x/dbdma2.c | 6 +++--- sound/soc/au1x/dma.c | 4 ++-- sound/soc/au1x/i2sc.c | 2 +- sound/soc/au1x/psc-ac97.c | 4 ++-- sound/soc/au1x/psc-i2s.c | 4 ++-- 72 files changed, 137 insertions(+), 113 deletions(-) rename arch/mips/{include/asm/mach-au1x00 => alchemy/include/mach}/au1000.h (100%) rename arch/mips/{include/asm/mach-au1x00 => alchemy/include/mach}/au1000_dma.h (100%) rename arch/mips/{include/asm/mach-au1x00 => alchemy/include/mach}/au1100_mmc.h (100%) rename arch/mips/{include/asm/mach-au1x00 => alchemy/include/mach}/au1200fb.h (100%) rename arch/mips/{include/asm/mach-au1x00 => alchemy/include/mach}/au1550_spi.h (100%) rename arch/mips/{include/asm/mach-au1x00 => alchemy/include/mach}/au1550nd.h (100%) rename arch/mips/{include/asm/mach-au1x00 => alchemy/include/mach}/au1xxx_dbdma.h (100%) rename arch/mips/{include/asm/mach-au1x00 => alchemy/include/mach}/au1xxx_eth.h (100%) rename arch/mips/{include/asm/mach-au1x00 => alchemy/include/mach}/au1xxx_psc.h (100%) rename arch/mips/{include/asm/mach-au1x00 => alchemy/include/mach}/cpu-feature-overrides.h (100%) rename arch/mips/{include/asm/mach-db1x00 => alchemy/include/mach/db1x00}/bcsr.h (100%) rename arch/mips/{include/asm/mach-db1x00 => alchemy/include/mach/db1x00}/irq.h (100%) create mode 100644 arch/mips/alchemy/include/mach/floppy.h rename arch/mips/{include/asm/mach-au1x00 => alchemy/include/mach}/gpio-au1000.h (99%) rename arch/mips/{include/asm/mach-au1x00 => alchemy/include/mach}/gpio-au1300.h (99%) create mode 100644 arch/mips/alchemy/include/mach/ide.h rename arch/mips/{include/asm/mach-au1x00 => alchemy/include/mach}/ioremap.h (100%) create mode 100644 arch/mips/alchemy/include/mach/irq.h create mode 100644 arch/mips/alchemy/include/mach/kernel-entry-init.h create mode 100644 arch/mips/alchemy/include/mach/kmalloc.h create mode 100644 arch/mips/alchemy/include/mach/mangle-port.h create mode 100644 arch/mips/alchemy/include/mach/mc146818rtc.h rename arch/mips/{include/asm/mach-au1x00 => alchemy/include/mach}/prom.h (100%) create mode 100644 arch/mips/alchemy/include/mach/spaces.h create mode 100644 arch/mips/alchemy/include/mach/topology.h create mode 100644 arch/mips/alchemy/include/mach/war.h diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 069fa94..6915e97 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -163,6 +163,7 @@ config MIPS_ALCHEMY select GPIOLIB select SYS_SUPPORTS_ZBOOT select COMMON_CLK + select HAVE_MACH_HEAD_FILES config AR7 bool "Texas Instruments AR7" diff --git a/arch/mips/alchemy/Platform b/arch/mips/alchemy/Platform index 33c9da3..c70eb25 100644 --- a/arch/mips/alchemy/Platform +++ b/arch/mips/alchemy/Platform @@ -9,7 +9,6 @@ platform-$(CONFIG_MIPS_ALCHEMY) += alchemy/common/ # Db1550/Pb1550/Db1200/Pb1200/Db1300 # platform-$(CONFIG_MIPS_DB1XXX) += alchemy/devboards/ -cflags-$(CONFIG_MIPS_DB1XXX) += -I$(srctree)/arch/mips/include/asm/mach-db1x00 load-$(CONFIG_MIPS_DB1XXX) += 0xffffffff80100000 # @@ -35,4 +34,4 @@ load-$(CONFIG_MIPS_GPR) += 0xffffffff80100000 # compiler picks the board one. If they don't, it will make sure # the alchemy generic gpio header is picked up. -cflags-$(CONFIG_MIPS_ALCHEMY) += -I$(srctree)/arch/mips/include/asm/mach-au1x00 +cflags-$(CONFIG_MIPS_ALCHEMY) += -I$(srctree)/arch/mips/alchemy/include diff --git a/arch/mips/alchemy/board-gpr.c b/arch/mips/alchemy/board-gpr.c index 6c47318..663bcaa9 100644 --- a/arch/mips/alchemy/board-gpr.c +++ b/arch/mips/alchemy/board-gpr.c @@ -22,9 +22,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include const char *get_system_type(void) { diff --git a/arch/mips/alchemy/board-mtx1.c b/arch/mips/alchemy/board-mtx1.c index 2309353..c5c89a3 100644 --- a/arch/mips/alchemy/board-mtx1.c +++ b/arch/mips/alchemy/board-mtx1.c @@ -20,10 +20,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include const char *get_system_type(void) { diff --git a/arch/mips/alchemy/board-xxs1500.c b/arch/mips/alchemy/board-xxs1500.c index c67dfe1..e0f1f5d 100644 --- a/arch/mips/alchemy/board-xxs1500.c +++ b/arch/mips/alchemy/board-xxs1500.c @@ -17,8 +17,8 @@ #include #include #include -#include -#include +#include +#include const char *get_system_type(void) { diff --git a/arch/mips/alchemy/common/clock.c b/arch/mips/alchemy/common/clock.c index a95a894..5d51ce9 100644 --- a/arch/mips/alchemy/common/clock.c +++ b/arch/mips/alchemy/common/clock.c @@ -42,7 +42,7 @@ #include #include #include -#include +#include /* Base clock: 12MHz is the default in all databooks, and I haven't * found any board yet which uses a different rate. diff --git a/arch/mips/alchemy/common/dbdma.c b/arch/mips/alchemy/common/dbdma.c index 4ca2c28..28c40ad 100644 --- a/arch/mips/alchemy/common/dbdma.c +++ b/arch/mips/alchemy/common/dbdma.c @@ -37,8 +37,8 @@ #include #include #include -#include -#include +#include +#include /* * The Descriptor Based DMA supports up to 16 channels. diff --git a/arch/mips/alchemy/common/dma.c b/arch/mips/alchemy/common/dma.c index 973049b..f71a4df 100644 --- a/arch/mips/alchemy/common/dma.c +++ b/arch/mips/alchemy/common/dma.c @@ -37,8 +37,8 @@ #include #include -#include -#include +#include +#include /* * A note on resource allocation: diff --git a/arch/mips/alchemy/common/gpiolib.c b/arch/mips/alchemy/common/gpiolib.c index 7d5da5e..7eb525d 100644 --- a/arch/mips/alchemy/common/gpiolib.c +++ b/arch/mips/alchemy/common/gpiolib.c @@ -34,8 +34,8 @@ #include #include #include -#include -#include +#include +#include static int gpio2_get(struct gpio_chip *chip, unsigned offset) { diff --git a/arch/mips/alchemy/common/irq.c b/arch/mips/alchemy/common/irq.c index da9f922..16cc3fe 100644 --- a/arch/mips/alchemy/common/irq.c +++ b/arch/mips/alchemy/common/irq.c @@ -32,8 +32,8 @@ #include #include -#include -#include +#include +#include /* Interrupt Controller register offsets */ #define IC_CFG0RD 0x40 diff --git a/arch/mips/alchemy/common/platform.c b/arch/mips/alchemy/common/platform.c index b8f3397..b7f5d0f 100644 --- a/arch/mips/alchemy/common/platform.c +++ b/arch/mips/alchemy/common/platform.c @@ -21,12 +21,12 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include -#include +#include static void alchemy_8250_pm(struct uart_port *port, unsigned int state, unsigned int old_state) diff --git a/arch/mips/alchemy/common/power.c b/arch/mips/alchemy/common/power.c index 303257b..93afa0f 100644 --- a/arch/mips/alchemy/common/power.c +++ b/arch/mips/alchemy/common/power.c @@ -34,7 +34,7 @@ #include #include -#include +#include /* * We need to save/restore a bunch of core registers that are diff --git a/arch/mips/alchemy/common/setup.c b/arch/mips/alchemy/common/setup.c index 7faaa6d..f7b47ff 100644 --- a/arch/mips/alchemy/common/setup.c +++ b/arch/mips/alchemy/common/setup.c @@ -31,7 +31,7 @@ #include #include -#include +#include extern void __init board_setup(void); extern void __init alchemy_set_lpj(void); diff --git a/arch/mips/alchemy/common/time.c b/arch/mips/alchemy/common/time.c index d794ffb..478a2ad 100644 --- a/arch/mips/alchemy/common/time.c +++ b/arch/mips/alchemy/common/time.c @@ -27,7 +27,7 @@ #include #include #include -#include +#include /* 32kHz clock enabled and detected */ #define CNTR_OK (SYS_CNTRL_E0 | SYS_CNTRL_32S) diff --git a/arch/mips/alchemy/common/usb.c b/arch/mips/alchemy/common/usb.c index 5d61854..a223695 100644 --- a/arch/mips/alchemy/common/usb.c +++ b/arch/mips/alchemy/common/usb.c @@ -17,7 +17,7 @@ #include #include #include -#include +#include /* control register offsets */ #define AU1000_OHCICFG 0x7fffc diff --git a/arch/mips/alchemy/common/vss.c b/arch/mips/alchemy/common/vss.c index 3d0d468..cf3cf12 100644 --- a/arch/mips/alchemy/common/vss.c +++ b/arch/mips/alchemy/common/vss.c @@ -9,7 +9,7 @@ #include #include -#include +#include #define VSS_GATE 0x00 /* gate wait timers */ #define VSS_CLKRST 0x04 /* clock/block control */ diff --git a/arch/mips/alchemy/devboards/bcsr.c b/arch/mips/alchemy/devboards/bcsr.c index 8df0ccd..b654950 100644 --- a/arch/mips/alchemy/devboards/bcsr.c +++ b/arch/mips/alchemy/devboards/bcsr.c @@ -16,7 +16,7 @@ #include #include #include -#include +#include static struct bcsr_reg { void __iomem *raddr; diff --git a/arch/mips/alchemy/devboards/db1000.c b/arch/mips/alchemy/devboards/db1000.c index 2c52ee2..0b84a76 100644 --- a/arch/mips/alchemy/devboards/db1000.c +++ b/arch/mips/alchemy/devboards/db1000.c @@ -20,13 +20,13 @@ #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include -#include +#include #include "platform.h" #define F_SWAPPED (bcsr_read(BCSR_STATUS) & BCSR_STATUS_DB1000_SWAPBOOT) diff --git a/arch/mips/alchemy/devboards/db1200.c b/arch/mips/alchemy/devboards/db1200.c index 421d651..80cd4dd 100644 --- a/arch/mips/alchemy/devboards/db1200.c +++ b/arch/mips/alchemy/devboards/db1200.c @@ -23,13 +23,13 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include "platform.h" diff --git a/arch/mips/alchemy/devboards/db1300.c b/arch/mips/alchemy/devboards/db1300.c index 8ac1f56..b548d80 100644 --- a/arch/mips/alchemy/devboards/db1300.c +++ b/arch/mips/alchemy/devboards/db1300.c @@ -24,14 +24,14 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include "platform.h" diff --git a/arch/mips/alchemy/devboards/db1550.c b/arch/mips/alchemy/devboards/db1550.c index 3e0c75c..5cbd7c2 100644 --- a/arch/mips/alchemy/devboards/db1550.c +++ b/arch/mips/alchemy/devboards/db1550.c @@ -19,15 +19,15 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "platform.h" static void __init db1550_hw_setup(void) diff --git a/arch/mips/alchemy/devboards/db1xxx.c b/arch/mips/alchemy/devboards/db1xxx.c index e6d25aa..7921fb2 100644 --- a/arch/mips/alchemy/devboards/db1xxx.c +++ b/arch/mips/alchemy/devboards/db1xxx.c @@ -4,8 +4,8 @@ */ #include -#include -#include +#include +#include int __init db1000_board_setup(void); int __init db1000_dev_setup(void); diff --git a/arch/mips/alchemy/devboards/platform.c b/arch/mips/alchemy/devboards/platform.c index 8d4b65c..683c329 100644 --- a/arch/mips/alchemy/devboards/platform.c +++ b/arch/mips/alchemy/devboards/platform.c @@ -15,10 +15,10 @@ #include #include #include -#include -#include +#include +#include -#include +#include void __init prom_init(void) { diff --git a/arch/mips/alchemy/devboards/pm.c b/arch/mips/alchemy/devboards/pm.c index 73c7781..2199128 100644 --- a/arch/mips/alchemy/devboards/pm.c +++ b/arch/mips/alchemy/devboards/pm.c @@ -9,9 +9,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include /* * Generic suspend userspace interface for Alchemy development boards. diff --git a/arch/mips/include/asm/mach-au1x00/au1000.h b/arch/mips/alchemy/include/mach/au1000.h similarity index 100% rename from arch/mips/include/asm/mach-au1x00/au1000.h rename to arch/mips/alchemy/include/mach/au1000.h diff --git a/arch/mips/include/asm/mach-au1x00/au1000_dma.h b/arch/mips/alchemy/include/mach/au1000_dma.h similarity index 100% rename from arch/mips/include/asm/mach-au1x00/au1000_dma.h rename to arch/mips/alchemy/include/mach/au1000_dma.h diff --git a/arch/mips/include/asm/mach-au1x00/au1100_mmc.h b/arch/mips/alchemy/include/mach/au1100_mmc.h similarity index 100% rename from arch/mips/include/asm/mach-au1x00/au1100_mmc.h rename to arch/mips/alchemy/include/mach/au1100_mmc.h diff --git a/arch/mips/include/asm/mach-au1x00/au1200fb.h b/arch/mips/alchemy/include/mach/au1200fb.h similarity index 100% rename from arch/mips/include/asm/mach-au1x00/au1200fb.h rename to arch/mips/alchemy/include/mach/au1200fb.h diff --git a/arch/mips/include/asm/mach-au1x00/au1550_spi.h b/arch/mips/alchemy/include/mach/au1550_spi.h similarity index 100% rename from arch/mips/include/asm/mach-au1x00/au1550_spi.h rename to arch/mips/alchemy/include/mach/au1550_spi.h diff --git a/arch/mips/include/asm/mach-au1x00/au1550nd.h b/arch/mips/alchemy/include/mach/au1550nd.h similarity index 100% rename from arch/mips/include/asm/mach-au1x00/au1550nd.h rename to arch/mips/alchemy/include/mach/au1550nd.h diff --git a/arch/mips/include/asm/mach-au1x00/au1xxx_dbdma.h b/arch/mips/alchemy/include/mach/au1xxx_dbdma.h similarity index 100% rename from arch/mips/include/asm/mach-au1x00/au1xxx_dbdma.h rename to arch/mips/alchemy/include/mach/au1xxx_dbdma.h diff --git a/arch/mips/include/asm/mach-au1x00/au1xxx_eth.h b/arch/mips/alchemy/include/mach/au1xxx_eth.h similarity index 100% rename from arch/mips/include/asm/mach-au1x00/au1xxx_eth.h rename to arch/mips/alchemy/include/mach/au1xxx_eth.h diff --git a/arch/mips/include/asm/mach-au1x00/au1xxx_psc.h b/arch/mips/alchemy/include/mach/au1xxx_psc.h similarity index 100% rename from arch/mips/include/asm/mach-au1x00/au1xxx_psc.h rename to arch/mips/alchemy/include/mach/au1xxx_psc.h diff --git a/arch/mips/include/asm/mach-au1x00/cpu-feature-overrides.h b/arch/mips/alchemy/include/mach/cpu-feature-overrides.h similarity index 100% rename from arch/mips/include/asm/mach-au1x00/cpu-feature-overrides.h rename to arch/mips/alchemy/include/mach/cpu-feature-overrides.h diff --git a/arch/mips/include/asm/mach-db1x00/bcsr.h b/arch/mips/alchemy/include/mach/db1x00/bcsr.h similarity index 100% rename from arch/mips/include/asm/mach-db1x00/bcsr.h rename to arch/mips/alchemy/include/mach/db1x00/bcsr.h diff --git a/arch/mips/include/asm/mach-db1x00/irq.h b/arch/mips/alchemy/include/mach/db1x00/irq.h similarity index 100% rename from arch/mips/include/asm/mach-db1x00/irq.h rename to arch/mips/alchemy/include/mach/db1x00/irq.h diff --git a/arch/mips/alchemy/include/mach/floppy.h b/arch/mips/alchemy/include/mach/floppy.h new file mode 100644 index 0000000..8e17183 --- /dev/null +++ b/arch/mips/alchemy/include/mach/floppy.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-au1x00/gpio-au1000.h b/arch/mips/alchemy/include/mach/gpio-au1000.h similarity index 99% rename from arch/mips/include/asm/mach-au1x00/gpio-au1000.h rename to arch/mips/alchemy/include/mach/gpio-au1000.h index adde1fa..5f33432 100644 --- a/arch/mips/include/asm/mach-au1x00/gpio-au1000.h +++ b/arch/mips/alchemy/include/mach/gpio-au1000.h @@ -9,7 +9,7 @@ #ifndef _ALCHEMY_GPIO_AU1000_H_ #define _ALCHEMY_GPIO_AU1000_H_ -#include +#include /* The default GPIO numberspace as documented in the Alchemy manuals. * GPIO0-31 from GPIO1 block, GPIO200-215 from GPIO2 block. diff --git a/arch/mips/include/asm/mach-au1x00/gpio-au1300.h b/arch/mips/alchemy/include/mach/gpio-au1300.h similarity index 99% rename from arch/mips/include/asm/mach-au1x00/gpio-au1300.h rename to arch/mips/alchemy/include/mach/gpio-au1300.h index d25846a..f491e1c 100644 --- a/arch/mips/include/asm/mach-au1x00/gpio-au1300.h +++ b/arch/mips/alchemy/include/mach/gpio-au1300.h @@ -10,7 +10,7 @@ #include #include -#include +#include struct gpio; struct gpio_chip; diff --git a/arch/mips/alchemy/include/mach/ide.h b/arch/mips/alchemy/include/mach/ide.h new file mode 100644 index 0000000..1251c0c --- /dev/null +++ b/arch/mips/alchemy/include/mach/ide.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-au1x00/ioremap.h b/arch/mips/alchemy/include/mach/ioremap.h similarity index 100% rename from arch/mips/include/asm/mach-au1x00/ioremap.h rename to arch/mips/alchemy/include/mach/ioremap.h diff --git a/arch/mips/alchemy/include/mach/irq.h b/arch/mips/alchemy/include/mach/irq.h new file mode 100644 index 0000000..abd4433 --- /dev/null +++ b/arch/mips/alchemy/include/mach/irq.h @@ -0,0 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifdef CONFIG_MIPS_DB1XXX +#include +#else +#include +#endif diff --git a/arch/mips/alchemy/include/mach/kernel-entry-init.h b/arch/mips/alchemy/include/mach/kernel-entry-init.h new file mode 100644 index 0000000..19b872be --- /dev/null +++ b/arch/mips/alchemy/include/mach/kernel-entry-init.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/alchemy/include/mach/kmalloc.h b/arch/mips/alchemy/include/mach/kmalloc.h new file mode 100644 index 0000000..4f056db --- /dev/null +++ b/arch/mips/alchemy/include/mach/kmalloc.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/alchemy/include/mach/mangle-port.h b/arch/mips/alchemy/include/mach/mangle-port.h new file mode 100644 index 0000000..b9736e3 --- /dev/null +++ b/arch/mips/alchemy/include/mach/mangle-port.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/alchemy/include/mach/mc146818rtc.h b/arch/mips/alchemy/include/mach/mc146818rtc.h new file mode 100644 index 0000000..7284af8 --- /dev/null +++ b/arch/mips/alchemy/include/mach/mc146818rtc.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-au1x00/prom.h b/arch/mips/alchemy/include/mach/prom.h similarity index 100% rename from arch/mips/include/asm/mach-au1x00/prom.h rename to arch/mips/alchemy/include/mach/prom.h diff --git a/arch/mips/alchemy/include/mach/spaces.h b/arch/mips/alchemy/include/mach/spaces.h new file mode 100644 index 0000000..39a4d72 --- /dev/null +++ b/arch/mips/alchemy/include/mach/spaces.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/alchemy/include/mach/topology.h b/arch/mips/alchemy/include/mach/topology.h new file mode 100644 index 0000000..86e585b --- /dev/null +++ b/arch/mips/alchemy/include/mach/topology.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/alchemy/include/mach/war.h b/arch/mips/alchemy/include/mach/war.h new file mode 100644 index 0000000..5b0422a --- /dev/null +++ b/arch/mips/alchemy/include/mach/war.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/boot/compressed/uart-alchemy.c b/arch/mips/boot/compressed/uart-alchemy.c index 8ec63011e..2535e69 100644 --- a/arch/mips/boot/compressed/uart-alchemy.c +++ b/arch/mips/boot/compressed/uart-alchemy.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 -#include +#include void putc(char c) { diff --git a/arch/mips/pci/pci-alchemy.c b/arch/mips/pci/pci-alchemy.c index 01a2af8..8e7a7ec 100644 --- a/arch/mips/pci/pci-alchemy.c +++ b/arch/mips/pci/pci-alchemy.c @@ -19,7 +19,7 @@ #include #include -#include +#include #include #ifdef CONFIG_PCI_DEBUG diff --git a/drivers/i2c/busses/i2c-au1550.c b/drivers/i2c/busses/i2c-au1550.c index 22aed92..4376ee6 100644 --- a/drivers/i2c/busses/i2c-au1550.c +++ b/drivers/i2c/busses/i2c-au1550.c @@ -22,8 +22,8 @@ #include #include -#include -#include +#include +#include #define PSC_SEL 0x00 #define PSC_CTRL 0x04 diff --git a/drivers/mmc/host/au1xmmc.c b/drivers/mmc/host/au1xmmc.c index 8823680..7579860 100644 --- a/drivers/mmc/host/au1xmmc.c +++ b/drivers/mmc/host/au1xmmc.c @@ -44,9 +44,9 @@ #include #include -#include -#include -#include +#include +#include +#include #define DRIVER_NAME "au1xxx-mmc" diff --git a/drivers/mtd/nand/raw/au1550nd.c b/drivers/mtd/nand/raw/au1550nd.c index 75eb3e9..f7d5aa3 100644 --- a/drivers/mtd/nand/raw/au1550nd.c +++ b/drivers/mtd/nand/raw/au1550nd.c @@ -11,8 +11,8 @@ #include #include #include -#include -#include +#include +#include struct au1550nd_ctx { diff --git a/drivers/net/ethernet/amd/au1000_eth.c b/drivers/net/ethernet/amd/au1000_eth.c index 089a4fb..904eafa 100644 --- a/drivers/net/ethernet/amd/au1000_eth.c +++ b/drivers/net/ethernet/amd/au1000_eth.c @@ -46,9 +46,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include "au1000_eth.h" diff --git a/drivers/pcmcia/db1xxx_ss.c b/drivers/pcmcia/db1xxx_ss.c index 590e594..78fb089 100644 --- a/drivers/pcmcia/db1xxx_ss.c +++ b/drivers/pcmcia/db1xxx_ss.c @@ -34,8 +34,8 @@ #include -#include -#include +#include +#include #define MEM_MAP_SIZE 0x400000 #define IO_MAP_SIZE 0x1000 diff --git a/drivers/pcmcia/xxs1500_ss.c b/drivers/pcmcia/xxs1500_ss.c index b11c7ab..82b8404 100644 --- a/drivers/pcmcia/xxs1500_ss.c +++ b/drivers/pcmcia/xxs1500_ss.c @@ -23,7 +23,7 @@ #include #include -#include +#include #define MEM_MAP_SIZE 0x400000 #define IO_MAP_SIZE 0x1000 diff --git a/drivers/rtc/rtc-au1xxx.c b/drivers/rtc/rtc-au1xxx.c index 7c5530c..a3ed8d5 100644 --- a/drivers/rtc/rtc-au1xxx.c +++ b/drivers/rtc/rtc-au1xxx.c @@ -23,7 +23,7 @@ #include #include #include -#include +#include /* 32kHz clock enabled and detected */ #define CNTR_OK (SYS_CNTRL_E0 | SYS_CNTRL_32S) diff --git a/drivers/spi/spi-au1550.c b/drivers/spi/spi-au1550.c index dfb7196f..746bbd0 100644 --- a/drivers/spi/spi-au1550.c +++ b/drivers/spi/spi-au1550.c @@ -20,11 +20,11 @@ #include #include #include -#include -#include -#include +#include +#include +#include -#include +#include static unsigned usedma = 1; module_param(usedma, uint, 0644); diff --git a/drivers/video/fbdev/au1100fb.c b/drivers/video/fbdev/au1100fb.c index 37a6512..d60e55d 100644 --- a/drivers/video/fbdev/au1100fb.c +++ b/drivers/video/fbdev/au1100fb.c @@ -55,7 +55,7 @@ #include #include -#include +#include #define DEBUG 0 diff --git a/drivers/video/fbdev/au1100fb.h b/drivers/video/fbdev/au1100fb.h index e7239bc..079cf90 100644 --- a/drivers/video/fbdev/au1100fb.h +++ b/drivers/video/fbdev/au1100fb.h @@ -30,7 +30,7 @@ #ifndef _AU1100LCD_H #define _AU1100LCD_H -#include +#include #define print_err(f, arg...) printk(KERN_ERR DRIVER_NAME ": " f "\n", ## arg) #define print_warn(f, arg...) printk(KERN_WARNING DRIVER_NAME ": " f "\n", ## arg) diff --git a/drivers/video/fbdev/au1200fb.c b/drivers/video/fbdev/au1200fb.c index c00e01a..a1aaec1 100644 --- a/drivers/video/fbdev/au1200fb.c +++ b/drivers/video/fbdev/au1200fb.c @@ -45,8 +45,8 @@ #include #include -#include -#include /* platform_data */ +#include +#include /* platform_data */ #include "au1200fb.h" #define DRIVER_NAME "au1200fb" diff --git a/drivers/watchdog/mtx-1_wdt.c b/drivers/watchdog/mtx-1_wdt.c index 8aa1cb4a..927c051 100644 --- a/drivers/watchdog/mtx-1_wdt.c +++ b/drivers/watchdog/mtx-1_wdt.c @@ -41,7 +41,7 @@ #include #include -#include +#include #define MTX1_WDT_INTERVAL (5 * HZ) diff --git a/sound/soc/au1x/ac97c.c b/sound/soc/au1x/ac97c.c index 3b1700e..2a7fa5c 100644 --- a/sound/soc/au1x/ac97c.c +++ b/sound/soc/au1x/ac97c.c @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include "psc.h" diff --git a/sound/soc/au1x/db1000.c b/sound/soc/au1x/db1000.c index c0e105a..e2a726d 100644 --- a/sound/soc/au1x/db1000.c +++ b/sound/soc/au1x/db1000.c @@ -14,8 +14,8 @@ #include #include #include -#include -#include +#include +#include #include "psc.h" diff --git a/sound/soc/au1x/db1200.c b/sound/soc/au1x/db1200.c index d6b692f..0eb8418 100644 --- a/sound/soc/au1x/db1200.c +++ b/sound/soc/au1x/db1200.c @@ -14,10 +14,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "../codecs/wm8731.h" #include "psc.h" diff --git a/sound/soc/au1x/dbdma2.c b/sound/soc/au1x/dbdma2.c index 8f855644..3099972 100644 --- a/sound/soc/au1x/dbdma2.c +++ b/sound/soc/au1x/dbdma2.c @@ -20,9 +20,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include "psc.h" diff --git a/sound/soc/au1x/dma.c b/sound/soc/au1x/dma.c index c9a038a..f5364f4 100644 --- a/sound/soc/au1x/dma.c +++ b/sound/soc/au1x/dma.c @@ -17,8 +17,8 @@ #include #include #include -#include -#include +#include +#include #include "psc.h" diff --git a/sound/soc/au1x/i2sc.c b/sound/soc/au1x/i2sc.c index 7fd08fa..f3d4e28 100644 --- a/sound/soc/au1x/i2sc.c +++ b/sound/soc/au1x/i2sc.c @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include "psc.h" diff --git a/sound/soc/au1x/psc-ac97.c b/sound/soc/au1x/psc-ac97.c index 0227993..f7427aa 100644 --- a/sound/soc/au1x/psc-ac97.c +++ b/sound/soc/au1x/psc-ac97.c @@ -19,8 +19,8 @@ #include #include #include -#include -#include +#include +#include #include "psc.h" diff --git a/sound/soc/au1x/psc-i2s.c b/sound/soc/au1x/psc-i2s.c index 767ce95..ab11900 100644 --- a/sound/soc/au1x/psc-i2s.c +++ b/sound/soc/au1x/psc-i2s.c @@ -18,8 +18,8 @@ #include #include #include -#include -#include +#include +#include #include "psc.h" From patchwork Mon Mar 30 08:39:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: bibo mao X-Patchwork-Id: 11464933 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5C2CC15AB for ; Mon, 30 Mar 2020 08:39:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 31CAF207FF for ; Mon, 30 Mar 2020 08:39:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729782AbgC3IjN (ORCPT ); Mon, 30 Mar 2020 04:39:13 -0400 Received: from mail.loongson.cn ([114.242.206.163]:56894 "EHLO loongson.cn" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729769AbgC3IjM (ORCPT ); Mon, 30 Mar 2020 04:39:12 -0400 Received: from kvm-dev1.localdomain (unknown [10.2.5.134]) by mail.loongson.cn (Coremail) with SMTP id AQAAf9Dx_94rsIFeMJchAA--.24S2; Mon, 30 Mar 2020 16:39:07 +0800 (CST) From: bibo mao To: Thomas Bogendoerfer , Jiaxun Yang , Huacai Chen Cc: linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 09/39] MIPS: bcm47xx: Add header files path prefix Date: Mon, 30 Mar 2020 04:39:07 -0400 Message-Id: <1585557547-27640-1-git-send-email-maobibo@loongson.cn> X-Mailer: git-send-email 1.8.3.1 X-CM-TRANSID: AQAAf9Dx_94rsIFeMJchAA--.24S2 X-Coremail-Antispam: 1UD129KBjvJXoW3uF1DCF13urWkAFy5Ww1kuFg_yoWkAF4fpa nrA3Z5Ka1DuryUJFy5ZFyIvr43Ja98KrWqqa4jga4UZ3W2g3WxJrZakr90y348XF4vq3Wf WrWfuw15Xr4vvw7anT9S1TB71UUUUUDqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUkSb7Iv0xC_Kw4lb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rw A2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6xII jxv20xvEc7CjxVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26r4UJVWxJr1l84ACjc xK6I8E87Iv6xkF7I0E14v26F4UJVW0owAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40E FcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWrXVW3AwAv7VC2z280aVAFwI0_Cr 0_Gr1UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCY02Avz4vE-syl42xK 82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGw C20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r1DMIIYrxkI7VAKI48J MIIF0xvE2Ix0cI8IcVAFwI0_Ar0_tr1lIxAIcVC0I7IYx2IY6xkF7I0E14v26F4j6r4UJw CI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Cr0_Gr1UMIIF0xvE x4A2jsIEc7CjxVAFwI0_Gr1j6F4UJbIYCTnIWIevJa73UjIFyTuYvjxUyEfoUUUUU X-CM-SenderInfo: xpdruxter6z05rqj20fqof0/ Sender: linux-mips-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org Remove header files from arch/mips/include/asm/mach-bcm47xx to arch/mips/bcm47xx/include/mach Signed-off-by: bibo mao --- arch/mips/Kconfig | 1 + arch/mips/bcm47xx/Platform | 2 +- arch/mips/bcm47xx/board.c | 4 ++-- arch/mips/bcm47xx/buttons.c | 4 ++-- .../mips/{include/asm/mach-bcm47xx => bcm47xx/include/mach}/bcm47xx.h | 0 .../asm/mach-bcm47xx => bcm47xx/include/mach}/bcm47xx_board.h | 0 .../asm/mach-bcm47xx => bcm47xx/include/mach}/cpu-feature-overrides.h | 0 arch/mips/bcm47xx/include/mach/ioremap.h | 2 ++ arch/mips/bcm47xx/include/mach/irq.h | 2 ++ arch/mips/bcm47xx/include/mach/kernel-entry-init.h | 2 ++ arch/mips/bcm47xx/include/mach/kmalloc.h | 2 ++ arch/mips/bcm47xx/include/mach/mangle-port.h | 2 ++ arch/mips/bcm47xx/include/mach/spaces.h | 2 ++ arch/mips/bcm47xx/include/mach/topology.h | 2 ++ arch/mips/bcm47xx/include/mach/war.h | 2 ++ arch/mips/bcm47xx/irq.c | 2 +- arch/mips/bcm47xx/leds.c | 2 +- arch/mips/bcm47xx/prom.c | 4 ++-- arch/mips/bcm47xx/serial.c | 2 +- arch/mips/bcm47xx/setup.c | 4 ++-- arch/mips/bcm47xx/time.c | 4 ++-- arch/mips/bcm47xx/workarounds.c | 4 ++-- arch/mips/pci/pci-bcm47xx.c | 2 +- drivers/net/wireless/broadcom/b43/bus.c | 2 +- 24 files changed, 35 insertions(+), 18 deletions(-) rename arch/mips/{include/asm/mach-bcm47xx => bcm47xx/include/mach}/bcm47xx.h (100%) rename arch/mips/{include/asm/mach-bcm47xx => bcm47xx/include/mach}/bcm47xx_board.h (100%) rename arch/mips/{include/asm/mach-bcm47xx => bcm47xx/include/mach}/cpu-feature-overrides.h (100%) create mode 100644 arch/mips/bcm47xx/include/mach/ioremap.h create mode 100644 arch/mips/bcm47xx/include/mach/irq.h create mode 100644 arch/mips/bcm47xx/include/mach/kernel-entry-init.h create mode 100644 arch/mips/bcm47xx/include/mach/kmalloc.h create mode 100644 arch/mips/bcm47xx/include/mach/mangle-port.h create mode 100644 arch/mips/bcm47xx/include/mach/spaces.h create mode 100644 arch/mips/bcm47xx/include/mach/topology.h create mode 100644 arch/mips/bcm47xx/include/mach/war.h diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 6915e97..aced6d4 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -286,6 +286,7 @@ config BCM47XX select BCM47XX_NVRAM select BCM47XX_SPROM select BCM47XX_SSB if !BCM47XX_BCMA + select HAVE_MACH_HEAD_FILES help Support for BCM47XX based boards diff --git a/arch/mips/bcm47xx/Platform b/arch/mips/bcm47xx/Platform index 70783b7..6298638 100644 --- a/arch/mips/bcm47xx/Platform +++ b/arch/mips/bcm47xx/Platform @@ -3,6 +3,6 @@ # platform-$(CONFIG_BCM47XX) += bcm47xx/ cflags-$(CONFIG_BCM47XX) += \ - -I$(srctree)/arch/mips/include/asm/mach-bcm47xx + -I$(srctree)/arch/mips/bcm47xx/include load-$(CONFIG_BCM47XX) := 0xffffffff80001000 zload-$(CONFIG_BCM47XX) += 0xffffffff80400000 diff --git a/arch/mips/bcm47xx/board.c b/arch/mips/bcm47xx/board.c index 35266a7..25a9b09 100644 --- a/arch/mips/bcm47xx/board.c +++ b/arch/mips/bcm47xx/board.c @@ -2,8 +2,8 @@ #include #include #include -#include -#include +#include +#include struct bcm47xx_board_type { const enum bcm47xx_board board; diff --git a/arch/mips/bcm47xx/buttons.c b/arch/mips/bcm47xx/buttons.c index 535d84a..6be4f28 100644 --- a/arch/mips/bcm47xx/buttons.c +++ b/arch/mips/bcm47xx/buttons.c @@ -4,8 +4,8 @@ #include #include #include -#include -#include +#include +#include /************************************************** * Database diff --git a/arch/mips/include/asm/mach-bcm47xx/bcm47xx.h b/arch/mips/bcm47xx/include/mach/bcm47xx.h similarity index 100% rename from arch/mips/include/asm/mach-bcm47xx/bcm47xx.h rename to arch/mips/bcm47xx/include/mach/bcm47xx.h diff --git a/arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h b/arch/mips/bcm47xx/include/mach/bcm47xx_board.h similarity index 100% rename from arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h rename to arch/mips/bcm47xx/include/mach/bcm47xx_board.h diff --git a/arch/mips/include/asm/mach-bcm47xx/cpu-feature-overrides.h b/arch/mips/bcm47xx/include/mach/cpu-feature-overrides.h similarity index 100% rename from arch/mips/include/asm/mach-bcm47xx/cpu-feature-overrides.h rename to arch/mips/bcm47xx/include/mach/cpu-feature-overrides.h diff --git a/arch/mips/bcm47xx/include/mach/ioremap.h b/arch/mips/bcm47xx/include/mach/ioremap.h new file mode 100644 index 0000000..2369393 --- /dev/null +++ b/arch/mips/bcm47xx/include/mach/ioremap.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/bcm47xx/include/mach/irq.h b/arch/mips/bcm47xx/include/mach/irq.h new file mode 100644 index 0000000..bb5ccce --- /dev/null +++ b/arch/mips/bcm47xx/include/mach/irq.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/bcm47xx/include/mach/kernel-entry-init.h b/arch/mips/bcm47xx/include/mach/kernel-entry-init.h new file mode 100644 index 0000000..19b872be --- /dev/null +++ b/arch/mips/bcm47xx/include/mach/kernel-entry-init.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/bcm47xx/include/mach/kmalloc.h b/arch/mips/bcm47xx/include/mach/kmalloc.h new file mode 100644 index 0000000..4f056db --- /dev/null +++ b/arch/mips/bcm47xx/include/mach/kmalloc.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/bcm47xx/include/mach/mangle-port.h b/arch/mips/bcm47xx/include/mach/mangle-port.h new file mode 100644 index 0000000..b9736e3 --- /dev/null +++ b/arch/mips/bcm47xx/include/mach/mangle-port.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/bcm47xx/include/mach/spaces.h b/arch/mips/bcm47xx/include/mach/spaces.h new file mode 100644 index 0000000..39a4d72 --- /dev/null +++ b/arch/mips/bcm47xx/include/mach/spaces.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/bcm47xx/include/mach/topology.h b/arch/mips/bcm47xx/include/mach/topology.h new file mode 100644 index 0000000..86e585b --- /dev/null +++ b/arch/mips/bcm47xx/include/mach/topology.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/bcm47xx/include/mach/war.h b/arch/mips/bcm47xx/include/mach/war.h new file mode 100644 index 0000000..5b0422a --- /dev/null +++ b/arch/mips/bcm47xx/include/mach/war.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/bcm47xx/irq.c b/arch/mips/bcm47xx/irq.c index 21b4497..80fb752 100644 --- a/arch/mips/bcm47xx/irq.c +++ b/arch/mips/bcm47xx/irq.c @@ -29,7 +29,7 @@ #include #include #include -#include +#include asmlinkage void plat_irq_dispatch(void) { diff --git a/arch/mips/bcm47xx/leds.c b/arch/mips/bcm47xx/leds.c index 167c42c..e7cce2a 100644 --- a/arch/mips/bcm47xx/leds.c +++ b/arch/mips/bcm47xx/leds.c @@ -2,7 +2,7 @@ #include "bcm47xx_private.h" #include -#include +#include /************************************************** * Database diff --git a/arch/mips/bcm47xx/prom.c b/arch/mips/bcm47xx/prom.c index 135a540..1afecfb 100644 --- a/arch/mips/bcm47xx/prom.c +++ b/arch/mips/bcm47xx/prom.c @@ -32,8 +32,8 @@ #include #include #include -#include -#include +#include +#include static char bcm47xx_system_type[20] = "Broadcom BCM47XX"; diff --git a/arch/mips/bcm47xx/serial.c b/arch/mips/bcm47xx/serial.c index e3c9872..6179486 100644 --- a/arch/mips/bcm47xx/serial.c +++ b/arch/mips/bcm47xx/serial.c @@ -13,7 +13,7 @@ #include #include #include -#include +#include static struct plat_serial8250_port uart8250_data[5]; diff --git a/arch/mips/bcm47xx/setup.c b/arch/mips/bcm47xx/setup.c index 82627c2..f5b29b5 100644 --- a/arch/mips/bcm47xx/setup.c +++ b/arch/mips/bcm47xx/setup.c @@ -42,8 +42,8 @@ #include #include #include -#include -#include +#include +#include union bcm47xx_bus bcm47xx_bus; EXPORT_SYMBOL(bcm47xx_bus); diff --git a/arch/mips/bcm47xx/time.c b/arch/mips/bcm47xx/time.c index 74224cf..ae6e38e 100644 --- a/arch/mips/bcm47xx/time.c +++ b/arch/mips/bcm47xx/time.c @@ -25,8 +25,8 @@ #include #include #include -#include -#include +#include +#include void __init plat_time_init(void) { diff --git a/arch/mips/bcm47xx/workarounds.c b/arch/mips/bcm47xx/workarounds.c index 0ab95dd..3daa37c 100644 --- a/arch/mips/bcm47xx/workarounds.c +++ b/arch/mips/bcm47xx/workarounds.c @@ -2,8 +2,8 @@ #include "bcm47xx_private.h" #include -#include -#include +#include +#include static void __init bcm47xx_workarounds_enable_usb_power(int usb_power) { diff --git a/arch/mips/pci/pci-bcm47xx.c b/arch/mips/pci/pci-bcm47xx.c index 230d7dd..0fb8572 100644 --- a/arch/mips/pci/pci-bcm47xx.c +++ b/arch/mips/pci/pci-bcm47xx.c @@ -26,7 +26,7 @@ #include #include #include -#include +#include int pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) { diff --git a/drivers/net/wireless/broadcom/b43/bus.c b/drivers/net/wireless/broadcom/b43/bus.c index fdb1c82..c1442148 100644 --- a/drivers/net/wireless/broadcom/b43/bus.c +++ b/drivers/net/wireless/broadcom/b43/bus.c @@ -10,7 +10,7 @@ */ #ifdef CONFIG_BCM47XX_BCMA -#include +#include #endif #include "b43.h" From patchwork Mon Mar 30 08:39:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: bibo mao X-Patchwork-Id: 11464937 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6E58915AB for ; Mon, 30 Mar 2020 08:39:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 38170207FF for ; Mon, 30 Mar 2020 08:39:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729798AbgC3IjS (ORCPT ); Mon, 30 Mar 2020 04:39:18 -0400 Received: from mail.loongson.cn ([114.242.206.163]:56912 "EHLO loongson.cn" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729785AbgC3IjR (ORCPT ); Mon, 30 Mar 2020 04:39:17 -0400 Received: from kvm-dev1.localdomain (unknown [10.2.5.134]) by mail.loongson.cn (Coremail) with SMTP id AQAAf9Dxf94tsIFeMZchAA--.6S2; Mon, 30 Mar 2020 16:39:09 +0800 (CST) From: bibo mao To: Thomas Bogendoerfer , Jiaxun Yang , Huacai Chen Cc: linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 10/39] MIPS: bcm63xx: Add header file path prefix Date: Mon, 30 Mar 2020 04:39:09 -0400 Message-Id: <1585557549-29555-1-git-send-email-maobibo@loongson.cn> X-Mailer: git-send-email 1.8.3.1 X-CM-TRANSID: AQAAf9Dxf94tsIFeMZchAA--.6S2 X-Coremail-Antispam: 1UD129KBjvAXoWfuF4DCryftr13Zr48GryrXrb_yoW5KrW3Xo Z7tFnrGw10gFWrAF17WFnxCa10yF1qqws5Gw43GrWDGF9rA347Cr1Fgr4FkFyUWw1fta47 WrWrZFyDGr18JFykn29KB7ZKAUJUUUU5529EdanIXcx71UUUUU7v73VFW2AGmfu7bjvjm3 AaLaJ3UjIYCTnIWjp_UUUYe7k0a2IF6w4kM7kC6x804xWl14x267AKxVWUJVW8JwAFc2x0 x2IEx4CE42xK8VAvwI8IcIk0rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2ocxC64kIII0Yj4 1l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26F1j6w1UM28EF7xvwVC0 I7IYx2IY6xkF7I0E14v26r4UJVWxJr1l84ACjcxK6I8E87Iv67AKxVW8Jr0_Cr1UM28EF7 xvwVC2z280aVCY1x0267AKxVWxJr0_GcWle2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG 64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Wrv_ZF1lYx0Ex4A2jsIE14v26F 4j6r4UJwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lc2xSY4AK6svPMxAI w28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr 4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAVWUtwCIc40Y0x0EwIxG rwCI42IY6xIIjxv20xvE14v26F1j6w1UMIIF0xvE2Ix0cI8IcVCY1x0267AKxVWxJVW8Jr 1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26F4j6r4UJwCI42IY 6I8E87Iv6xkF7I0E14v26r4UJVWxJrUvcSsGvfC2KfnxnUUI43ZEXa7IU5RVbJUUUUU== X-CM-SenderInfo: xpdruxter6z05rqj20fqof0/ Sender: linux-mips-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org Remove header files from arch/mips/include/asm/mach-bcm63xx to arch/mips/bcm63xx/include/mach Signed-off-by: bibo mao --- arch/mips/Kconfig | 1 + arch/mips/bcm63xx/Platform | 2 +- arch/mips/bcm63xx/boards/board_bcm963xx.c | 28 +++++++++++----------- arch/mips/bcm63xx/clk.c | 8 +++---- arch/mips/bcm63xx/cpu.c | 8 +++---- arch/mips/bcm63xx/cs.c | 8 +++---- arch/mips/bcm63xx/dev-enet.c | 6 ++--- arch/mips/bcm63xx/dev-flash.c | 8 +++---- arch/mips/bcm63xx/dev-hsspi.c | 6 ++--- arch/mips/bcm63xx/dev-pcmcia.c | 10 ++++---- arch/mips/bcm63xx/dev-rng.c | 2 +- arch/mips/bcm63xx/dev-spi.c | 6 ++--- arch/mips/bcm63xx/dev-uart.c | 2 +- arch/mips/bcm63xx/dev-usb-usbd.c | 4 ++-- arch/mips/bcm63xx/dev-wdt.c | 2 +- arch/mips/bcm63xx/early_printk.c | 2 +- arch/mips/bcm63xx/gpio.c | 8 +++---- .../include/mach}/bcm63xx_board.h | 0 .../include/mach}/bcm63xx_cpu.h | 0 .../include/mach}/bcm63xx_cs.h | 0 .../include/mach}/bcm63xx_dev_enet.h | 2 +- .../include/mach}/bcm63xx_dev_flash.h | 0 .../include/mach}/bcm63xx_dev_hsspi.h | 0 .../include/mach}/bcm63xx_dev_pci.h | 0 .../include/mach}/bcm63xx_dev_pcmcia.h | 0 .../include/mach}/bcm63xx_dev_spi.h | 4 ++-- .../include/mach}/bcm63xx_dev_uart.h | 0 .../include/mach}/bcm63xx_dev_usb_usbd.h | 0 .../include/mach}/bcm63xx_gpio.h | 2 +- .../include/mach}/bcm63xx_io.h | 2 +- .../include/mach}/bcm63xx_irq.h | 2 +- .../include/mach}/bcm63xx_iudma.h | 0 .../include/mach}/bcm63xx_nvram.h | 0 .../include/mach}/bcm63xx_regs.h | 0 .../include/mach}/bcm63xx_reset.h | 0 .../include/mach}/bcm63xx_timer.h | 0 .../include/mach}/board_bcm963xx.h | 4 ++-- .../include/mach}/cpu-feature-overrides.h | 2 +- .../include/mach}/ioremap.h | 2 +- .../mach-bcm63xx => bcm63xx/include/mach}/irq.h | 0 arch/mips/bcm63xx/include/mach/kernel-entry-init.h | 2 ++ arch/mips/bcm63xx/include/mach/kmalloc.h | 2 ++ arch/mips/bcm63xx/include/mach/mangle-port.h | 2 ++ .../mach-bcm63xx => bcm63xx/include/mach}/spaces.h | 0 arch/mips/bcm63xx/include/mach/topology.h | 2 ++ arch/mips/bcm63xx/include/mach/war.h | 2 ++ arch/mips/bcm63xx/irq.c | 8 +++---- arch/mips/bcm63xx/nvram.c | 2 +- arch/mips/bcm63xx/prom.c | 8 +++---- arch/mips/bcm63xx/reset.c | 8 +++---- arch/mips/bcm63xx/setup.c | 10 ++++---- arch/mips/bcm63xx/timer.c | 8 +++---- arch/mips/pci/fixup-bcm63xx.c | 2 +- arch/mips/pci/pci-bcm63xx.c | 2 +- arch/mips/pci/pci-bcm63xx.h | 8 +++---- drivers/net/ethernet/broadcom/bcm63xx_enet.c | 2 +- drivers/net/ethernet/broadcom/bcm63xx_enet.h | 6 ++--- drivers/pcmcia/bcm63xx_pcmcia.c | 4 ++-- drivers/pcmcia/bcm63xx_pcmcia.h | 2 +- drivers/usb/gadget/udc/bcm63xx_udc.c | 10 ++++---- drivers/watchdog/bcm63xx_wdt.c | 8 +++---- 61 files changed, 120 insertions(+), 109 deletions(-) rename arch/mips/{include/asm/mach-bcm63xx => bcm63xx/include/mach}/bcm63xx_board.h (100%) rename arch/mips/{include/asm/mach-bcm63xx => bcm63xx/include/mach}/bcm63xx_cpu.h (100%) rename arch/mips/{include/asm/mach-bcm63xx => bcm63xx/include/mach}/bcm63xx_cs.h (100%) rename arch/mips/{include/asm/mach-bcm63xx => bcm63xx/include/mach}/bcm63xx_dev_enet.h (98%) rename arch/mips/{include/asm/mach-bcm63xx => bcm63xx/include/mach}/bcm63xx_dev_flash.h (100%) rename arch/mips/{include/asm/mach-bcm63xx => bcm63xx/include/mach}/bcm63xx_dev_hsspi.h (100%) rename arch/mips/{include/asm/mach-bcm63xx => bcm63xx/include/mach}/bcm63xx_dev_pci.h (100%) rename arch/mips/{include/asm/mach-bcm63xx => bcm63xx/include/mach}/bcm63xx_dev_pcmcia.h (100%) rename arch/mips/{include/asm/mach-bcm63xx => bcm63xx/include/mach}/bcm63xx_dev_spi.h (75%) rename arch/mips/{include/asm/mach-bcm63xx => bcm63xx/include/mach}/bcm63xx_dev_uart.h (100%) rename arch/mips/{include/asm/mach-bcm63xx => bcm63xx/include/mach}/bcm63xx_dev_usb_usbd.h (100%) rename arch/mips/{include/asm/mach-bcm63xx => bcm63xx/include/mach}/bcm63xx_gpio.h (95%) rename arch/mips/{include/asm/mach-bcm63xx => bcm63xx/include/mach}/bcm63xx_io.h (99%) rename arch/mips/{include/asm/mach-bcm63xx => bcm63xx/include/mach}/bcm63xx_irq.h (92%) rename arch/mips/{include/asm/mach-bcm63xx => bcm63xx/include/mach}/bcm63xx_iudma.h (100%) rename arch/mips/{include/asm/mach-bcm63xx => bcm63xx/include/mach}/bcm63xx_nvram.h (100%) rename arch/mips/{include/asm/mach-bcm63xx => bcm63xx/include/mach}/bcm63xx_regs.h (100%) rename arch/mips/{include/asm/mach-bcm63xx => bcm63xx/include/mach}/bcm63xx_reset.h (100%) rename arch/mips/{include/asm/mach-bcm63xx => bcm63xx/include/mach}/bcm63xx_timer.h (100%) rename arch/mips/{include/asm/mach-bcm63xx => bcm63xx/include/mach}/board_bcm963xx.h (93%) rename arch/mips/{include/asm/mach-bcm63xx => bcm63xx/include/mach}/cpu-feature-overrides.h (97%) rename arch/mips/{include/asm/mach-bcm63xx => bcm63xx/include/mach}/ioremap.h (97%) rename arch/mips/{include/asm/mach-bcm63xx => bcm63xx/include/mach}/irq.h (100%) create mode 100644 arch/mips/bcm63xx/include/mach/kernel-entry-init.h create mode 100644 arch/mips/bcm63xx/include/mach/kmalloc.h create mode 100644 arch/mips/bcm63xx/include/mach/mangle-port.h rename arch/mips/{include/asm/mach-bcm63xx => bcm63xx/include/mach}/spaces.h (100%) create mode 100644 arch/mips/bcm63xx/include/mach/topology.h create mode 100644 arch/mips/bcm63xx/include/mach/war.h diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index aced6d4..e8e6f2b 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -306,6 +306,7 @@ config BCM63XX select HAVE_CLK select MIPS_L1_CACHE_SHIFT_4 select CLKDEV_LOOKUP + select HAVE_MACH_HEAD_FILES help Support for BCM63XX based boards diff --git a/arch/mips/bcm63xx/Platform b/arch/mips/bcm63xx/Platform index 5f86b2f..03d2452 100644 --- a/arch/mips/bcm63xx/Platform +++ b/arch/mips/bcm63xx/Platform @@ -3,5 +3,5 @@ # platform-$(CONFIG_BCM63XX) += bcm63xx/ cflags-$(CONFIG_BCM63XX) += \ - -I$(srctree)/arch/mips/include/asm/mach-bcm63xx/ + -I$(srctree)/arch/mips/bcm63xx/include load-$(CONFIG_BCM63XX) := 0xffffffff80010000 diff --git a/arch/mips/bcm63xx/boards/board_bcm963xx.c b/arch/mips/bcm63xx/boards/board_bcm963xx.c index 36ec3dc..d0e131f 100644 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c @@ -15,20 +15,20 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include diff --git a/arch/mips/bcm63xx/clk.c b/arch/mips/bcm63xx/clk.c index 1641159..57be153 100644 --- a/arch/mips/bcm63xx/clk.c +++ b/arch/mips/bcm63xx/clk.c @@ -13,10 +13,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include struct clk { void (*set)(struct clk *, int); diff --git a/arch/mips/bcm63xx/cpu.c b/arch/mips/bcm63xx/cpu.c index f61c16f..7af12d2 100644 --- a/arch/mips/bcm63xx/cpu.c +++ b/arch/mips/bcm63xx/cpu.c @@ -13,10 +13,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include const unsigned long *bcm63xx_regs_base; EXPORT_SYMBOL(bcm63xx_regs_base); diff --git a/arch/mips/bcm63xx/cs.c b/arch/mips/bcm63xx/cs.c index 29205ba..8e20fa6 100644 --- a/arch/mips/bcm63xx/cs.c +++ b/arch/mips/bcm63xx/cs.c @@ -11,10 +11,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include static DEFINE_SPINLOCK(bcm63xx_cs_lock); diff --git a/arch/mips/bcm63xx/dev-enet.c b/arch/mips/bcm63xx/dev-enet.c index 8e73d65..19ad2d8 100644 --- a/arch/mips/bcm63xx/dev-enet.c +++ b/arch/mips/bcm63xx/dev-enet.c @@ -10,9 +10,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include static const unsigned long bcm6348_regs_enetdmac[] = { [ENETDMAC_CHANCFG] = ENETDMAC_CHANCFG_REG, diff --git a/arch/mips/bcm63xx/dev-flash.c b/arch/mips/bcm63xx/dev-flash.c index a109393..fbef9e7 100644 --- a/arch/mips/bcm63xx/dev-flash.c +++ b/arch/mips/bcm63xx/dev-flash.c @@ -17,10 +17,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include static struct mtd_partition mtd_partitions[] = { { diff --git a/arch/mips/bcm63xx/dev-hsspi.c b/arch/mips/bcm63xx/dev-hsspi.c index 696abc4..4e30e08 100644 --- a/arch/mips/bcm63xx/dev-hsspi.c +++ b/arch/mips/bcm63xx/dev-hsspi.c @@ -10,9 +10,9 @@ #include #include -#include -#include -#include +#include +#include +#include static struct resource spi_resources[] = { { diff --git a/arch/mips/bcm63xx/dev-pcmcia.c b/arch/mips/bcm63xx/dev-pcmcia.c index 9496cd2..031ad1c 100644 --- a/arch/mips/bcm63xx/dev-pcmcia.c +++ b/arch/mips/bcm63xx/dev-pcmcia.c @@ -10,11 +10,11 @@ #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include static struct resource pcmcia_resources[] = { /* pcmcia registers */ diff --git a/arch/mips/bcm63xx/dev-rng.c b/arch/mips/bcm63xx/dev-rng.c index d277b4d..5aced04 100644 --- a/arch/mips/bcm63xx/dev-rng.c +++ b/arch/mips/bcm63xx/dev-rng.c @@ -9,7 +9,7 @@ #include #include #include -#include +#include static struct resource rng_resources[] = { { diff --git a/arch/mips/bcm63xx/dev-spi.c b/arch/mips/bcm63xx/dev-spi.c index 2323854..d0af4ec 100644 --- a/arch/mips/bcm63xx/dev-spi.c +++ b/arch/mips/bcm63xx/dev-spi.c @@ -14,9 +14,9 @@ #include #include -#include -#include -#include +#include +#include +#include static struct resource spi_resources[] = { { diff --git a/arch/mips/bcm63xx/dev-uart.c b/arch/mips/bcm63xx/dev-uart.c index 3bc7f3b..106b8d2 100644 --- a/arch/mips/bcm63xx/dev-uart.c +++ b/arch/mips/bcm63xx/dev-uart.c @@ -9,7 +9,7 @@ #include #include #include -#include +#include static struct resource uart0_resources[] = { { diff --git a/arch/mips/bcm63xx/dev-usb-usbd.c b/arch/mips/bcm63xx/dev-usb-usbd.c index 508bd9d..42e9ae9 100644 --- a/arch/mips/bcm63xx/dev-usb-usbd.c +++ b/arch/mips/bcm63xx/dev-usb-usbd.c @@ -12,8 +12,8 @@ #include #include #include -#include -#include +#include +#include #define NUM_MMIO 2 #define NUM_IRQ 7 diff --git a/arch/mips/bcm63xx/dev-wdt.c b/arch/mips/bcm63xx/dev-wdt.c index 2a2346a..33c752ca 100644 --- a/arch/mips/bcm63xx/dev-wdt.c +++ b/arch/mips/bcm63xx/dev-wdt.c @@ -9,7 +9,7 @@ #include #include #include -#include +#include static struct resource wdt_resources[] = { { diff --git a/arch/mips/bcm63xx/early_printk.c b/arch/mips/bcm63xx/early_printk.c index 9e9ec27..82cdf21 100644 --- a/arch/mips/bcm63xx/early_printk.c +++ b/arch/mips/bcm63xx/early_printk.c @@ -6,7 +6,7 @@ * Copyright (C) 2008 Maxime Bizon */ -#include +#include #include #include diff --git a/arch/mips/bcm63xx/gpio.c b/arch/mips/bcm63xx/gpio.c index 16f353a..36cbb5e 100644 --- a/arch/mips/bcm63xx/gpio.c +++ b/arch/mips/bcm63xx/gpio.c @@ -13,10 +13,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include static u32 gpio_out_low_reg; diff --git a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_board.h b/arch/mips/bcm63xx/include/mach/bcm63xx_board.h similarity index 100% rename from arch/mips/include/asm/mach-bcm63xx/bcm63xx_board.h rename to arch/mips/bcm63xx/include/mach/bcm63xx_board.h diff --git a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h b/arch/mips/bcm63xx/include/mach/bcm63xx_cpu.h similarity index 100% rename from arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h rename to arch/mips/bcm63xx/include/mach/bcm63xx_cpu.h diff --git a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cs.h b/arch/mips/bcm63xx/include/mach/bcm63xx_cs.h similarity index 100% rename from arch/mips/include/asm/mach-bcm63xx/bcm63xx_cs.h rename to arch/mips/bcm63xx/include/mach/bcm63xx_cs.h diff --git a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_enet.h b/arch/mips/bcm63xx/include/mach/bcm63xx_dev_enet.h similarity index 98% rename from arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_enet.h rename to arch/mips/bcm63xx/include/mach/bcm63xx_dev_enet.h index da39e4d..fc91b33 100644 --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_enet.h +++ b/arch/mips/bcm63xx/include/mach/bcm63xx_dev_enet.h @@ -5,7 +5,7 @@ #include #include -#include +#include /* * on board ethernet platform data diff --git a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_flash.h b/arch/mips/bcm63xx/include/mach/bcm63xx_dev_flash.h similarity index 100% rename from arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_flash.h rename to arch/mips/bcm63xx/include/mach/bcm63xx_dev_flash.h diff --git a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_hsspi.h b/arch/mips/bcm63xx/include/mach/bcm63xx_dev_hsspi.h similarity index 100% rename from arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_hsspi.h rename to arch/mips/bcm63xx/include/mach/bcm63xx_dev_hsspi.h diff --git a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_pci.h b/arch/mips/bcm63xx/include/mach/bcm63xx_dev_pci.h similarity index 100% rename from arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_pci.h rename to arch/mips/bcm63xx/include/mach/bcm63xx_dev_pci.h diff --git a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_pcmcia.h b/arch/mips/bcm63xx/include/mach/bcm63xx_dev_pcmcia.h similarity index 100% rename from arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_pcmcia.h rename to arch/mips/bcm63xx/include/mach/bcm63xx_dev_pcmcia.h diff --git a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_spi.h b/arch/mips/bcm63xx/include/mach/bcm63xx_dev_spi.h similarity index 75% rename from arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_spi.h rename to arch/mips/bcm63xx/include/mach/bcm63xx_dev_spi.h index 0ab7505..2ff8a54 100644 --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_spi.h +++ b/arch/mips/bcm63xx/include/mach/bcm63xx_dev_spi.h @@ -3,8 +3,8 @@ #define BCM63XX_DEV_SPI_H #include -#include -#include +#include +#include int __init bcm63xx_spi_register(void); diff --git a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_uart.h b/arch/mips/bcm63xx/include/mach/bcm63xx_dev_uart.h similarity index 100% rename from arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_uart.h rename to arch/mips/bcm63xx/include/mach/bcm63xx_dev_uart.h diff --git a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_usb_usbd.h b/arch/mips/bcm63xx/include/mach/bcm63xx_dev_usb_usbd.h similarity index 100% rename from arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_usb_usbd.h rename to arch/mips/bcm63xx/include/mach/bcm63xx_dev_usb_usbd.h diff --git a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h b/arch/mips/bcm63xx/include/mach/bcm63xx_gpio.h similarity index 95% rename from arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h rename to arch/mips/bcm63xx/include/mach/bcm63xx_gpio.h index 8fe88c2..c4632a5 100644 --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h +++ b/arch/mips/bcm63xx/include/mach/bcm63xx_gpio.h @@ -3,7 +3,7 @@ #define BCM63XX_GPIO_H #include -#include +#include int __init bcm63xx_gpio_init(void); diff --git a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_io.h b/arch/mips/bcm63xx/include/mach/bcm63xx_io.h similarity index 99% rename from arch/mips/include/asm/mach-bcm63xx/bcm63xx_io.h rename to arch/mips/bcm63xx/include/mach/bcm63xx_io.h index 31c6924..5086a6e 100644 --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_io.h +++ b/arch/mips/bcm63xx/include/mach/bcm63xx_io.h @@ -2,7 +2,7 @@ #ifndef BCM63XX_IO_H_ #define BCM63XX_IO_H_ -#include +#include /* * Physical memory map, RAM is mapped at 0x0. diff --git a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_irq.h b/arch/mips/bcm63xx/include/mach/bcm63xx_irq.h similarity index 92% rename from arch/mips/include/asm/mach-bcm63xx/bcm63xx_irq.h rename to arch/mips/bcm63xx/include/mach/bcm63xx_irq.h index 7887bc6..2da3cc3 100644 --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_irq.h +++ b/arch/mips/bcm63xx/include/mach/bcm63xx_irq.h @@ -2,7 +2,7 @@ #ifndef BCM63XX_IRQ_H_ #define BCM63XX_IRQ_H_ -#include +#include #define IRQ_INTERNAL_BASE 8 #define IRQ_EXTERNAL_BASE 100 diff --git a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_iudma.h b/arch/mips/bcm63xx/include/mach/bcm63xx_iudma.h similarity index 100% rename from arch/mips/include/asm/mach-bcm63xx/bcm63xx_iudma.h rename to arch/mips/bcm63xx/include/mach/bcm63xx_iudma.h diff --git a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_nvram.h b/arch/mips/bcm63xx/include/mach/bcm63xx_nvram.h similarity index 100% rename from arch/mips/include/asm/mach-bcm63xx/bcm63xx_nvram.h rename to arch/mips/bcm63xx/include/mach/bcm63xx_nvram.h diff --git a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h b/arch/mips/bcm63xx/include/mach/bcm63xx_regs.h similarity index 100% rename from arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h rename to arch/mips/bcm63xx/include/mach/bcm63xx_regs.h diff --git a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_reset.h b/arch/mips/bcm63xx/include/mach/bcm63xx_reset.h similarity index 100% rename from arch/mips/include/asm/mach-bcm63xx/bcm63xx_reset.h rename to arch/mips/bcm63xx/include/mach/bcm63xx_reset.h diff --git a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_timer.h b/arch/mips/bcm63xx/include/mach/bcm63xx_timer.h similarity index 100% rename from arch/mips/include/asm/mach-bcm63xx/bcm63xx_timer.h rename to arch/mips/bcm63xx/include/mach/bcm63xx_timer.h diff --git a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h b/arch/mips/bcm63xx/include/mach/board_bcm963xx.h similarity index 93% rename from arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h rename to arch/mips/bcm63xx/include/mach/board_bcm963xx.h index 830f53f..8cb92fb 100644 --- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h +++ b/arch/mips/bcm63xx/include/mach/board_bcm963xx.h @@ -5,8 +5,8 @@ #include #include #include -#include -#include +#include +#include /* * flash mapping diff --git a/arch/mips/include/asm/mach-bcm63xx/cpu-feature-overrides.h b/arch/mips/bcm63xx/include/mach/cpu-feature-overrides.h similarity index 97% rename from arch/mips/include/asm/mach-bcm63xx/cpu-feature-overrides.h rename to arch/mips/bcm63xx/include/mach/cpu-feature-overrides.h index 0ebecbd..d84d8c2 100644 --- a/arch/mips/include/asm/mach-bcm63xx/cpu-feature-overrides.h +++ b/arch/mips/bcm63xx/include/mach/cpu-feature-overrides.h @@ -2,7 +2,7 @@ #ifndef __ASM_MACH_BCM963XX_CPU_FEATURE_OVERRIDES_H #define __ASM_MACH_BCM963XX_CPU_FEATURE_OVERRIDES_H -#include +#include #define cpu_has_tlb 1 #define cpu_has_4kex 1 diff --git a/arch/mips/include/asm/mach-bcm63xx/ioremap.h b/arch/mips/bcm63xx/include/mach/ioremap.h similarity index 97% rename from arch/mips/include/asm/mach-bcm63xx/ioremap.h rename to arch/mips/bcm63xx/include/mach/ioremap.h index 8cd261e..82d60da 100644 --- a/arch/mips/include/asm/mach-bcm63xx/ioremap.h +++ b/arch/mips/bcm63xx/include/mach/ioremap.h @@ -2,7 +2,7 @@ #ifndef BCM63XX_IOREMAP_H_ #define BCM63XX_IOREMAP_H_ -#include +#include static inline phys_addr_t fixup_bigphys_addr(phys_addr_t phys_addr, phys_addr_t size) { diff --git a/arch/mips/include/asm/mach-bcm63xx/irq.h b/arch/mips/bcm63xx/include/mach/irq.h similarity index 100% rename from arch/mips/include/asm/mach-bcm63xx/irq.h rename to arch/mips/bcm63xx/include/mach/irq.h diff --git a/arch/mips/bcm63xx/include/mach/kernel-entry-init.h b/arch/mips/bcm63xx/include/mach/kernel-entry-init.h new file mode 100644 index 0000000..19b872be --- /dev/null +++ b/arch/mips/bcm63xx/include/mach/kernel-entry-init.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/bcm63xx/include/mach/kmalloc.h b/arch/mips/bcm63xx/include/mach/kmalloc.h new file mode 100644 index 0000000..4f056db --- /dev/null +++ b/arch/mips/bcm63xx/include/mach/kmalloc.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/bcm63xx/include/mach/mangle-port.h b/arch/mips/bcm63xx/include/mach/mangle-port.h new file mode 100644 index 0000000..b9736e3 --- /dev/null +++ b/arch/mips/bcm63xx/include/mach/mangle-port.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-bcm63xx/spaces.h b/arch/mips/bcm63xx/include/mach/spaces.h similarity index 100% rename from arch/mips/include/asm/mach-bcm63xx/spaces.h rename to arch/mips/bcm63xx/include/mach/spaces.h diff --git a/arch/mips/bcm63xx/include/mach/topology.h b/arch/mips/bcm63xx/include/mach/topology.h new file mode 100644 index 0000000..86e585b --- /dev/null +++ b/arch/mips/bcm63xx/include/mach/topology.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/bcm63xx/include/mach/war.h b/arch/mips/bcm63xx/include/mach/war.h new file mode 100644 index 0000000..5b0422a --- /dev/null +++ b/arch/mips/bcm63xx/include/mach/war.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/bcm63xx/irq.c b/arch/mips/bcm63xx/irq.c index 2548013..b73cf80 100644 --- a/arch/mips/bcm63xx/irq.c +++ b/arch/mips/bcm63xx/irq.c @@ -14,10 +14,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include static DEFINE_SPINLOCK(ipic_lock); diff --git a/arch/mips/bcm63xx/nvram.c b/arch/mips/bcm63xx/nvram.c index 05757ae..1f8ce18 100644 --- a/arch/mips/bcm63xx/nvram.c +++ b/arch/mips/bcm63xx/nvram.c @@ -17,7 +17,7 @@ #include #include -#include +#include #define BCM63XX_DEFAULT_PSI_SIZE 64 diff --git a/arch/mips/bcm63xx/prom.c b/arch/mips/bcm63xx/prom.c index df69eaa..1d8869c 100644 --- a/arch/mips/bcm63xx/prom.c +++ b/arch/mips/bcm63xx/prom.c @@ -13,10 +13,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include void __init prom_init(void) { diff --git a/arch/mips/bcm63xx/reset.c b/arch/mips/bcm63xx/reset.c index 64574e7..28f0834 100644 --- a/arch/mips/bcm63xx/reset.c +++ b/arch/mips/bcm63xx/reset.c @@ -12,10 +12,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #define __GEN_RESET_BITS_TABLE(__cpu) \ [BCM63XX_RESET_SPI] = BCM## __cpu ##_RESET_SPI, \ diff --git a/arch/mips/bcm63xx/setup.c b/arch/mips/bcm63xx/setup.c index e28ee9a..fd30e17 100644 --- a/arch/mips/bcm63xx/setup.c +++ b/arch/mips/bcm63xx/setup.c @@ -16,11 +16,11 @@ #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include void bcm63xx_machine_halt(void) { diff --git a/arch/mips/bcm63xx/timer.c b/arch/mips/bcm63xx/timer.c index a860658..f633ef5 100644 --- a/arch/mips/bcm63xx/timer.c +++ b/arch/mips/bcm63xx/timer.c @@ -13,10 +13,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include static DEFINE_RAW_SPINLOCK(timer_reg_lock); static DEFINE_RAW_SPINLOCK(timer_data_lock); diff --git a/arch/mips/pci/fixup-bcm63xx.c b/arch/mips/pci/fixup-bcm63xx.c index 3408630..f997274 100644 --- a/arch/mips/pci/fixup-bcm63xx.c +++ b/arch/mips/pci/fixup-bcm63xx.c @@ -8,7 +8,7 @@ #include #include -#include +#include int pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) { diff --git a/arch/mips/pci/pci-bcm63xx.c b/arch/mips/pci/pci-bcm63xx.c index 5548365..8e40aca 100644 --- a/arch/mips/pci/pci-bcm63xx.c +++ b/arch/mips/pci/pci-bcm63xx.c @@ -14,7 +14,7 @@ #include #include -#include +#include #include "pci-bcm63xx.h" diff --git a/arch/mips/pci/pci-bcm63xx.h b/arch/mips/pci/pci-bcm63xx.h index 214def1..47bbbe9 100644 --- a/arch/mips/pci/pci-bcm63xx.h +++ b/arch/mips/pci/pci-bcm63xx.h @@ -2,10 +2,10 @@ #ifndef PCI_BCM63XX_H_ #define PCI_BCM63XX_H_ -#include -#include -#include -#include +#include +#include +#include +#include /* * Cardbus shares the PCI bus, but has no IDSEL, so a special id is diff --git a/drivers/net/ethernet/broadcom/bcm63xx_enet.c b/drivers/net/ethernet/broadcom/bcm63xx_enet.c index 620cd3f..f5aa8bc 100644 --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c @@ -18,7 +18,7 @@ #include #include -#include +#include #include "bcm63xx_enet.h" static char bcm_enet_driver_name[] = "bcm63xx_enet"; diff --git a/drivers/net/ethernet/broadcom/bcm63xx_enet.h b/drivers/net/ethernet/broadcom/bcm63xx_enet.h index 1d3c917..72c00f7 100644 --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.h +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.h @@ -8,9 +8,9 @@ #include #include -#include -#include -#include +#include +#include +#include /* default number of descriptor */ #define BCMENET_DEF_RX_DESC 64 diff --git a/drivers/pcmcia/bcm63xx_pcmcia.c b/drivers/pcmcia/bcm63xx_pcmcia.c index 16f5731..463a1dc 100644 --- a/drivers/pcmcia/bcm63xx_pcmcia.c +++ b/drivers/pcmcia/bcm63xx_pcmcia.c @@ -16,8 +16,8 @@ #include #include -#include -#include +#include +#include #include "bcm63xx_pcmcia.h" #define PFX "bcm63xx_pcmcia: " diff --git a/drivers/pcmcia/bcm63xx_pcmcia.h b/drivers/pcmcia/bcm63xx_pcmcia.h index 2122c59..2b7e1a5 100644 --- a/drivers/pcmcia/bcm63xx_pcmcia.h +++ b/drivers/pcmcia/bcm63xx_pcmcia.h @@ -5,7 +5,7 @@ #include #include #include -#include +#include /* socket polling rate in ms */ #define BCM63XX_PCMCIA_POLL_RATE 500 diff --git a/drivers/usb/gadget/udc/bcm63xx_udc.c b/drivers/usb/gadget/udc/bcm63xx_udc.c index 5450181..dc2654a 100644 --- a/drivers/usb/gadget/udc/bcm63xx_udc.c +++ b/drivers/usb/gadget/udc/bcm63xx_udc.c @@ -30,11 +30,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #define DRV_MODULE_NAME "bcm63xx_udc" diff --git a/drivers/watchdog/bcm63xx_wdt.c b/drivers/watchdog/bcm63xx_wdt.c index 7cdb2536..7cf0545 100644 --- a/drivers/watchdog/bcm63xx_wdt.c +++ b/drivers/watchdog/bcm63xx_wdt.c @@ -27,10 +27,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #define PFX KBUILD_MODNAME