From patchwork Mon Mar 30 08:52:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bibo Mao X-Patchwork-Id: 11464955 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 5675692C for ; Mon, 30 Mar 2020 08:52:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 34D2620757 for ; Mon, 30 Mar 2020 08:52:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729731AbgC3Iwk (ORCPT ); Mon, 30 Mar 2020 04:52:40 -0400 Received: from mail.loongson.cn ([114.242.206.163]:60066 "EHLO loongson.cn" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728759AbgC3Iwk (ORCPT ); Mon, 30 Mar 2020 04:52:40 -0400 Received: from kvm-dev1.localdomain (unknown [10.2.5.134]) by mail.loongson.cn (Coremail) with SMTP id AQAAf9Dx72pSs4Fek5ghAA--.15S2; Mon, 30 Mar 2020 16:52:34 +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 11/39] MIPS: bmips: Add header file path prefix Date: Mon, 30 Mar 2020 04:52:33 -0400 Message-Id: <1585558353-13665-1-git-send-email-maobibo@loongson.cn> X-Mailer: git-send-email 1.8.3.1 X-CM-TRANSID: AQAAf9Dx72pSs4Fek5ghAA--.15S2 X-Coremail-Antispam: 1UD129KBjvJXoW3Aw17Xr1ruF1UJry8XFW3GFg_yoW7WrWfpa 1DA3Z5Kr4j9ryUAFy5ZFyxKr43Ja1DGrWqkFWYgw17Z3WaqF1UJrs3trs8AryxJF4qy3WF grWfXr4Utrsavw7anT9S1TB71UUUUUDqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUkvb7Iv0xC_Kw4lb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rw A2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Xr0_Ar1l84ACjcxK6xII jxv20xvEc7CjxVAFwI0_Cr0_Gr1UM28EF7xvwVC2z280aVAFwI0_Gr1j6F4UJwA2z4x0Y4 vEx4A2jsIEc7CjxVAFwI0_Cr1j6rxdM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVAC Y4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26rWY6Fy7McIj6I8E87Iv67AKxVWxJV W8Jr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JMxkIecxEwVCm-wCF04k2 0xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI 8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2Ij64vIr41l IxAIcVC0I7IYx2IY67AKxVW8JVW5JwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Cr0_Gr1UMI IF0xvE42xK8VAvwI8IcIk0rVWrJr0_WFyUJwCI42IY6I8E87Iv67AKxVWxJVW8Jr1lIxAI cVC2z280aVCY1x0267AKxVW8Jr0_Cr1UYxBIdaVFxhVjvjDU0xZFpf9x07bzCJdUUUUU= 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-bmips to arch/mips/bmips/include/mach Signed-off-by: bibo mao --- arch/mips/Kconfig | 1 + arch/mips/bmips/Platform | 2 +- .../asm/mach-bmips => bmips/include/mach}/cpu-feature-overrides.h | 0 arch/mips/{include/asm/mach-bmips => bmips/include/mach}/ioremap.h | 0 arch/mips/bmips/include/mach/irq.h | 2 ++ arch/mips/bmips/include/mach/kernel-entry-init.h | 2 ++ arch/mips/bmips/include/mach/kmalloc.h | 2 ++ arch/mips/bmips/include/mach/mangle-port.h | 2 ++ arch/mips/{include/asm/mach-bmips => bmips/include/mach}/spaces.h | 0 arch/mips/bmips/include/mach/topology.h | 2 ++ arch/mips/bmips/include/mach/war.h | 2 ++ 11 files changed, 14 insertions(+), 1 deletion(-) rename arch/mips/{include/asm/mach-bmips => bmips/include/mach}/cpu-feature-overrides.h (100%) rename arch/mips/{include/asm/mach-bmips => bmips/include/mach}/ioremap.h (100%) create mode 100644 arch/mips/bmips/include/mach/irq.h create mode 100644 arch/mips/bmips/include/mach/kernel-entry-init.h create mode 100644 arch/mips/bmips/include/mach/kmalloc.h create mode 100644 arch/mips/bmips/include/mach/mangle-port.h rename arch/mips/{include/asm/mach-bmips => bmips/include/mach}/spaces.h (100%) create mode 100644 arch/mips/bmips/include/mach/topology.h create mode 100644 arch/mips/bmips/include/mach/war.h diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index e8e6f2b..1ee88a2 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -259,6 +259,7 @@ config BMIPS_GENERIC select USB_OHCI_BIG_ENDIAN_DESC if CPU_BIG_ENDIAN select USB_OHCI_BIG_ENDIAN_MMIO if CPU_BIG_ENDIAN select HARDIRQS_SW_RESEND + select HAVE_MACH_HEAD_FILES help Build a generic DT-based kernel image that boots on select BCM33xx cable modem chips, BCM63xx DSL chips, and BCM7xxx set-top diff --git a/arch/mips/bmips/Platform b/arch/mips/bmips/Platform index 5f127fd..8b9574f 100644 --- a/arch/mips/bmips/Platform +++ b/arch/mips/bmips/Platform @@ -3,5 +3,5 @@ # platform-$(CONFIG_BMIPS_GENERIC) += bmips/ cflags-$(CONFIG_BMIPS_GENERIC) += \ - -I$(srctree)/arch/mips/include/asm/mach-bmips/ + -I$(srctree)/arch/mips/bmips/include load-$(CONFIG_BMIPS_GENERIC) := 0xffffffff80010000 diff --git a/arch/mips/include/asm/mach-bmips/cpu-feature-overrides.h b/arch/mips/bmips/include/mach/cpu-feature-overrides.h similarity index 100% rename from arch/mips/include/asm/mach-bmips/cpu-feature-overrides.h rename to arch/mips/bmips/include/mach/cpu-feature-overrides.h diff --git a/arch/mips/include/asm/mach-bmips/ioremap.h b/arch/mips/bmips/include/mach/ioremap.h similarity index 100% rename from arch/mips/include/asm/mach-bmips/ioremap.h rename to arch/mips/bmips/include/mach/ioremap.h diff --git a/arch/mips/bmips/include/mach/irq.h b/arch/mips/bmips/include/mach/irq.h new file mode 100644 index 0000000..bb5ccce --- /dev/null +++ b/arch/mips/bmips/include/mach/irq.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/bmips/include/mach/kernel-entry-init.h b/arch/mips/bmips/include/mach/kernel-entry-init.h new file mode 100644 index 0000000..19b872be --- /dev/null +++ b/arch/mips/bmips/include/mach/kernel-entry-init.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/bmips/include/mach/kmalloc.h b/arch/mips/bmips/include/mach/kmalloc.h new file mode 100644 index 0000000..4f056db --- /dev/null +++ b/arch/mips/bmips/include/mach/kmalloc.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/bmips/include/mach/mangle-port.h b/arch/mips/bmips/include/mach/mangle-port.h new file mode 100644 index 0000000..b9736e3 --- /dev/null +++ b/arch/mips/bmips/include/mach/mangle-port.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-bmips/spaces.h b/arch/mips/bmips/include/mach/spaces.h similarity index 100% rename from arch/mips/include/asm/mach-bmips/spaces.h rename to arch/mips/bmips/include/mach/spaces.h diff --git a/arch/mips/bmips/include/mach/topology.h b/arch/mips/bmips/include/mach/topology.h new file mode 100644 index 0000000..86e585b --- /dev/null +++ b/arch/mips/bmips/include/mach/topology.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/bmips/include/mach/war.h b/arch/mips/bmips/include/mach/war.h new file mode 100644 index 0000000..5b0422a --- /dev/null +++ b/arch/mips/bmips/include/mach/war.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include From patchwork Mon Mar 30 08:52: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: 11464957 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 325B492C for ; Mon, 30 Mar 2020 08:53:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1036920732 for ; Mon, 30 Mar 2020 08:53:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729822AbgC3Iw7 (ORCPT ); Mon, 30 Mar 2020 04:52:59 -0400 Received: from mail.loongson.cn ([114.242.206.163]:60156 "EHLO loongson.cn" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729812AbgC3Iw7 (ORCPT ); Mon, 30 Mar 2020 04:52:59 -0400 Received: from kvm-dev1.localdomain (unknown [10.2.5.134]) by mail.loongson.cn (Coremail) with SMTP id AQAAf9Ax1ulls4FemZghAA--.17S2; Mon, 30 Mar 2020 16:52: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 12/39] MIPS: cavium-octeon: Add header file path prefix Date: Mon, 30 Mar 2020 04:52:53 -0400 Message-Id: <1585558373-1897-1-git-send-email-maobibo@loongson.cn> X-Mailer: git-send-email 1.8.3.1 X-CM-TRANSID: AQAAf9Ax1ulls4FemZghAA--.17S2 X-Coremail-Antispam: 1UD129KBjvJXoW3WFW7tr4xCw1kAFy8Ww13XFb_yoW7urWrpa ykAan5CrWxuryrAF12vr4Ik3yDtan8Gr4jka45W3WUu3W3WF1jvFs5KrnYyry8GF4qyF1S grZaqr48Gws2vaDanT9S1TB71UUUUUDqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUkab7Iv0xC_KF4lb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rw A2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Xr0_Ar1l84ACjcxK6xII jxv20xvEc7CjxVAFwI0_Cr0_Gr1UM28EF7xvwVC2z280aVAFwI0_Gr1j6F4UJwA2z4x0Y4 vEx4A2jsIEc7CjxVAFwI0_Cr1j6rxdM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVAC Y4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26rWY6Fy7McIj6I8E87Iv67AKxVWxJV W8Jr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JMxkIecxEwVCm-wCF04k2 0xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI 8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2Ij64vIr41l IxAIcVC0I7IYx2IY67AKxVW8JVW5JwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Cr0_Gr1UMI IF0xvE42xK8VAvwI8IcIk0rVW8JVW3JwCI42IY6I8E87Iv67AKxVWxJVW8Jr1lIxAIcVC2 z280aVCY1x0267AKxVW8Jr0_Cr1UYxBIdaVFxhVjvjDU0xZFpf9x07jIsjbUUUUU= 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-cavium-octeon to arch/mips/cavium-octeon/include/mach Signed-off-by: bibo mao --- arch/mips/Kconfig | 1 + arch/mips/cavium-octeon/Platform | 2 +- .../include/mach}/cpu-feature-overrides.h | 0 arch/mips/cavium-octeon/include/mach/ioremap.h | 2 ++ .../asm/mach-cavium-octeon => cavium-octeon/include/mach}/irq.h | 0 .../include/mach}/kernel-entry-init.h | 0 arch/mips/cavium-octeon/include/mach/kmalloc.h | 2 ++ .../asm/mach-cavium-octeon => cavium-octeon/include/mach}/mangle-port.h | 0 .../asm/mach-cavium-octeon => cavium-octeon/include/mach}/spaces.h | 0 arch/mips/cavium-octeon/include/mach/topology.h | 2 ++ .../asm/mach-cavium-octeon => cavium-octeon/include/mach}/war.h | 0 11 files changed, 8 insertions(+), 1 deletion(-) rename arch/mips/{include/asm/mach-cavium-octeon => cavium-octeon/include/mach}/cpu-feature-overrides.h (100%) create mode 100644 arch/mips/cavium-octeon/include/mach/ioremap.h rename arch/mips/{include/asm/mach-cavium-octeon => cavium-octeon/include/mach}/irq.h (100%) rename arch/mips/{include/asm/mach-cavium-octeon => cavium-octeon/include/mach}/kernel-entry-init.h (100%) create mode 100644 arch/mips/cavium-octeon/include/mach/kmalloc.h rename arch/mips/{include/asm/mach-cavium-octeon => cavium-octeon/include/mach}/mangle-port.h (100%) rename arch/mips/{include/asm/mach-cavium-octeon => cavium-octeon/include/mach}/spaces.h (100%) create mode 100644 arch/mips/cavium-octeon/include/mach/topology.h rename arch/mips/{include/asm/mach-cavium-octeon => cavium-octeon/include/mach}/war.h (100%) diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 1ee88a2..f31ff10 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -1782,6 +1782,7 @@ config CPU_CAVIUM_OCTEON select USB_OHCI_BIG_ENDIAN_MMIO if CPU_BIG_ENDIAN select MIPS_L1_CACHE_SHIFT_7 select HAVE_KVM + select HAVE_MACH_HEAD_FILES help The Cavium Octeon processor is a highly integrated chip containing many ethernet hardware widgets for networking tasks. The processor diff --git a/arch/mips/cavium-octeon/Platform b/arch/mips/cavium-octeon/Platform index 45be853..cb9ae89 100644 --- a/arch/mips/cavium-octeon/Platform +++ b/arch/mips/cavium-octeon/Platform @@ -3,5 +3,5 @@ # platform-$(CONFIG_CAVIUM_OCTEON_SOC) += cavium-octeon/ cflags-$(CONFIG_CAVIUM_OCTEON_SOC) += \ - -I$(srctree)/arch/mips/include/asm/mach-cavium-octeon + -I$(srctree)/arch/mips/cavium-octeon/include load-$(CONFIG_CAVIUM_OCTEON_SOC) += 0xffffffff81100000 diff --git a/arch/mips/include/asm/mach-cavium-octeon/cpu-feature-overrides.h b/arch/mips/cavium-octeon/include/mach/cpu-feature-overrides.h similarity index 100% rename from arch/mips/include/asm/mach-cavium-octeon/cpu-feature-overrides.h rename to arch/mips/cavium-octeon/include/mach/cpu-feature-overrides.h diff --git a/arch/mips/cavium-octeon/include/mach/ioremap.h b/arch/mips/cavium-octeon/include/mach/ioremap.h new file mode 100644 index 0000000..2369393 --- /dev/null +++ b/arch/mips/cavium-octeon/include/mach/ioremap.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-cavium-octeon/irq.h b/arch/mips/cavium-octeon/include/mach/irq.h similarity index 100% rename from arch/mips/include/asm/mach-cavium-octeon/irq.h rename to arch/mips/cavium-octeon/include/mach/irq.h diff --git a/arch/mips/include/asm/mach-cavium-octeon/kernel-entry-init.h b/arch/mips/cavium-octeon/include/mach/kernel-entry-init.h similarity index 100% rename from arch/mips/include/asm/mach-cavium-octeon/kernel-entry-init.h rename to arch/mips/cavium-octeon/include/mach/kernel-entry-init.h diff --git a/arch/mips/cavium-octeon/include/mach/kmalloc.h b/arch/mips/cavium-octeon/include/mach/kmalloc.h new file mode 100644 index 0000000..4f056db --- /dev/null +++ b/arch/mips/cavium-octeon/include/mach/kmalloc.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-cavium-octeon/mangle-port.h b/arch/mips/cavium-octeon/include/mach/mangle-port.h similarity index 100% rename from arch/mips/include/asm/mach-cavium-octeon/mangle-port.h rename to arch/mips/cavium-octeon/include/mach/mangle-port.h diff --git a/arch/mips/include/asm/mach-cavium-octeon/spaces.h b/arch/mips/cavium-octeon/include/mach/spaces.h similarity index 100% rename from arch/mips/include/asm/mach-cavium-octeon/spaces.h rename to arch/mips/cavium-octeon/include/mach/spaces.h diff --git a/arch/mips/cavium-octeon/include/mach/topology.h b/arch/mips/cavium-octeon/include/mach/topology.h new file mode 100644 index 0000000..86e585b --- /dev/null +++ b/arch/mips/cavium-octeon/include/mach/topology.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-cavium-octeon/war.h b/arch/mips/cavium-octeon/include/mach/war.h similarity index 100% rename from arch/mips/include/asm/mach-cavium-octeon/war.h rename to arch/mips/cavium-octeon/include/mach/war.h From patchwork Mon Mar 30 08:53:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bibo Mao X-Patchwork-Id: 11464959 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 832C9912 for ; Mon, 30 Mar 2020 08:53:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5841320757 for ; Mon, 30 Mar 2020 08:53:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729800AbgC3IxQ (ORCPT ); Mon, 30 Mar 2020 04:53:16 -0400 Received: from mail.loongson.cn ([114.242.206.163]:60222 "EHLO loongson.cn" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729812AbgC3IxP (ORCPT ); Mon, 30 Mar 2020 04:53:15 -0400 Received: from kvm-dev1.localdomain (unknown [10.2.5.134]) by mail.loongson.cn (Coremail) with SMTP id AQAAf9DxT2hxs4FenJghAA--.30S2; Mon, 30 Mar 2020 16:53:06 +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 13/39] MIPS: cobalt: Add header file path prefix Date: Mon, 30 Mar 2020 04:53:05 -0400 Message-Id: <1585558385-2974-1-git-send-email-maobibo@loongson.cn> X-Mailer: git-send-email 1.8.3.1 X-CM-TRANSID: AQAAf9DxT2hxs4FenJghAA--.30S2 X-Coremail-Antispam: 1UD129KBjvJXoW3JF4UJr45Gr48GFWxWry7GFg_yoWfKFyfpa nru3Z5GF409ry0yF4fuFW2vr43Xan8GrZFkFy5W34UZ3WSqF1UJrZ5tr9xAry8JF4Dta48 WFWSqr1Utrs29w7anT9S1TB71UUUUUDqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUkIb7Iv0xC_Kw4lb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rw A2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Xr0_Ar1l84ACjcxK6xII jxv20xvEc7CjxVAFwI0_Cr0_Gr1UM28EF7xvwVC2z280aVAFwI0_Gr1j6F4UJwA2z4x0Y4 vEx4A2jsIEc7CjxVAFwI0_Cr1j6rxdM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVAC Y4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26rWY6Fy7McIj6I8E87Iv67AKxVWxJV W8Jr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JMxkIecxEwVCm-wCF04k2 0xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI 8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2Ij64vIr41l IxAIcVC0I7IYx2IY67AKxVWUCVW8JwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr1lIx AIcVCF04k26cxKx2IYs7xG6r4j6FyUMIIF0xvEx4A2jsIE14v26F4j6r4UJwCI42IY6I8E 87Iv6xkF7I0E14v26r4UJVWxJrUvcSsGvfC2KfnxnUUI43ZEXa7IU5RVbJUUUUU== 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-cobalt to arch/mips/cobalt/include/mach Signed-off-by: bibo mao --- arch/mips/Kconfig | 1 + arch/mips/cobalt/Platform | 2 +- arch/mips/{include/asm/mach-cobalt => cobalt/include/mach}/cobalt.h | 0 .../asm/mach-cobalt => cobalt/include/mach}/cpu-feature-overrides.h | 0 arch/mips/cobalt/include/mach/ioremap.h | 2 ++ arch/mips/{include/asm/mach-cobalt => cobalt/include/mach}/irq.h | 0 arch/mips/cobalt/include/mach/kernel-entry-init.h | 2 ++ arch/mips/cobalt/include/mach/kmalloc.h | 2 ++ .../{include/asm/mach-cobalt => cobalt/include/mach}/mach-gt64120.h | 0 arch/mips/cobalt/include/mach/mangle-port.h | 2 ++ arch/mips/cobalt/include/mach/mc146818rtc.h | 2 ++ arch/mips/cobalt/include/mach/spaces.h | 2 ++ arch/mips/cobalt/include/mach/topology.h | 2 ++ arch/mips/cobalt/include/mach/war.h | 2 ++ arch/mips/cobalt/irq.c | 2 +- arch/mips/cobalt/led.c | 2 +- arch/mips/cobalt/reset.c | 2 +- arch/mips/cobalt/serial.c | 4 ++-- arch/mips/cobalt/setup.c | 2 +- arch/mips/include/asm/gt64120.h | 2 +- arch/mips/pci/fixup-cobalt.c | 4 ++-- 21 files changed, 27 insertions(+), 10 deletions(-) rename arch/mips/{include/asm/mach-cobalt => cobalt/include/mach}/cobalt.h (100%) rename arch/mips/{include/asm/mach-cobalt => cobalt/include/mach}/cpu-feature-overrides.h (100%) create mode 100644 arch/mips/cobalt/include/mach/ioremap.h rename arch/mips/{include/asm/mach-cobalt => cobalt/include/mach}/irq.h (100%) create mode 100644 arch/mips/cobalt/include/mach/kernel-entry-init.h create mode 100644 arch/mips/cobalt/include/mach/kmalloc.h rename arch/mips/{include/asm/mach-cobalt => cobalt/include/mach}/mach-gt64120.h (100%) create mode 100644 arch/mips/cobalt/include/mach/mangle-port.h create mode 100644 arch/mips/cobalt/include/mach/mc146818rtc.h create mode 100644 arch/mips/cobalt/include/mach/spaces.h create mode 100644 arch/mips/cobalt/include/mach/topology.h create mode 100644 arch/mips/cobalt/include/mach/war.h diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index f31ff10..ba7e065 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -329,6 +329,7 @@ config MIPS_COBALT select SYS_SUPPORTS_64BIT_KERNEL select SYS_SUPPORTS_LITTLE_ENDIAN select USE_GENERIC_EARLY_PRINTK_8250 + select HAVE_MACH_HEAD_FILES config MACH_DECSTATION bool "DECstations" diff --git a/arch/mips/cobalt/Platform b/arch/mips/cobalt/Platform index 34123ef..db48e5b 100644 --- a/arch/mips/cobalt/Platform +++ b/arch/mips/cobalt/Platform @@ -2,5 +2,5 @@ # Cobalt Server # platform-$(CONFIG_MIPS_COBALT) += cobalt/ -cflags-$(CONFIG_MIPS_COBALT) += -I$(srctree)/arch/mips/include/asm/mach-cobalt +cflags-$(CONFIG_MIPS_COBALT) += -I$(srctree)/arch/mips/cobalt/include load-$(CONFIG_MIPS_COBALT) += 0xffffffff80080000 diff --git a/arch/mips/include/asm/mach-cobalt/cobalt.h b/arch/mips/cobalt/include/mach/cobalt.h similarity index 100% rename from arch/mips/include/asm/mach-cobalt/cobalt.h rename to arch/mips/cobalt/include/mach/cobalt.h diff --git a/arch/mips/include/asm/mach-cobalt/cpu-feature-overrides.h b/arch/mips/cobalt/include/mach/cpu-feature-overrides.h similarity index 100% rename from arch/mips/include/asm/mach-cobalt/cpu-feature-overrides.h rename to arch/mips/cobalt/include/mach/cpu-feature-overrides.h diff --git a/arch/mips/cobalt/include/mach/ioremap.h b/arch/mips/cobalt/include/mach/ioremap.h new file mode 100644 index 0000000..2369393 --- /dev/null +++ b/arch/mips/cobalt/include/mach/ioremap.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-cobalt/irq.h b/arch/mips/cobalt/include/mach/irq.h similarity index 100% rename from arch/mips/include/asm/mach-cobalt/irq.h rename to arch/mips/cobalt/include/mach/irq.h diff --git a/arch/mips/cobalt/include/mach/kernel-entry-init.h b/arch/mips/cobalt/include/mach/kernel-entry-init.h new file mode 100644 index 0000000..19b872be --- /dev/null +++ b/arch/mips/cobalt/include/mach/kernel-entry-init.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/cobalt/include/mach/kmalloc.h b/arch/mips/cobalt/include/mach/kmalloc.h new file mode 100644 index 0000000..4f056db --- /dev/null +++ b/arch/mips/cobalt/include/mach/kmalloc.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-cobalt/mach-gt64120.h b/arch/mips/cobalt/include/mach/mach-gt64120.h similarity index 100% rename from arch/mips/include/asm/mach-cobalt/mach-gt64120.h rename to arch/mips/cobalt/include/mach/mach-gt64120.h diff --git a/arch/mips/cobalt/include/mach/mangle-port.h b/arch/mips/cobalt/include/mach/mangle-port.h new file mode 100644 index 0000000..b9736e3 --- /dev/null +++ b/arch/mips/cobalt/include/mach/mangle-port.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/cobalt/include/mach/mc146818rtc.h b/arch/mips/cobalt/include/mach/mc146818rtc.h new file mode 100644 index 0000000..7284af8 --- /dev/null +++ b/arch/mips/cobalt/include/mach/mc146818rtc.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/cobalt/include/mach/spaces.h b/arch/mips/cobalt/include/mach/spaces.h new file mode 100644 index 0000000..39a4d72 --- /dev/null +++ b/arch/mips/cobalt/include/mach/spaces.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/cobalt/include/mach/topology.h b/arch/mips/cobalt/include/mach/topology.h new file mode 100644 index 0000000..86e585b --- /dev/null +++ b/arch/mips/cobalt/include/mach/topology.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/cobalt/include/mach/war.h b/arch/mips/cobalt/include/mach/war.h new file mode 100644 index 0000000..5b0422a --- /dev/null +++ b/arch/mips/cobalt/include/mach/war.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/cobalt/irq.c b/arch/mips/cobalt/irq.c index ead5ae4..f490116 100644 --- a/arch/mips/cobalt/irq.c +++ b/arch/mips/cobalt/irq.c @@ -18,7 +18,7 @@ #include #include -#include +#include asmlinkage void plat_irq_dispatch(void) { diff --git a/arch/mips/cobalt/led.c b/arch/mips/cobalt/led.c index 196660c..191d5c6 100644 --- a/arch/mips/cobalt/led.c +++ b/arch/mips/cobalt/led.c @@ -9,7 +9,7 @@ #include #include -#include +#include static struct resource cobalt_led_resource __initdata = { .start = 0x1c000000, diff --git a/arch/mips/cobalt/reset.c b/arch/mips/cobalt/reset.c index 4eedd48..9333e56 100644 --- a/arch/mips/cobalt/reset.c +++ b/arch/mips/cobalt/reset.c @@ -15,7 +15,7 @@ #include #include -#include +#include #define RESET_PORT ((void __iomem *)CKSEG1ADDR(0x1c000000)) #define RESET 0x0f diff --git a/arch/mips/cobalt/serial.c b/arch/mips/cobalt/serial.c index 5fb6767..56a6532 100644 --- a/arch/mips/cobalt/serial.c +++ b/arch/mips/cobalt/serial.c @@ -10,8 +10,8 @@ #include #include -#include -#include +#include +#include static struct resource cobalt_uart_resource[] __initdata = { { diff --git a/arch/mips/cobalt/setup.c b/arch/mips/cobalt/setup.c index c136a18..ab4d587 100644 --- a/arch/mips/cobalt/setup.c +++ b/arch/mips/cobalt/setup.c @@ -20,7 +20,7 @@ #include #include -#include +#include extern void cobalt_machine_restart(char *command); extern void cobalt_machine_halt(void); diff --git a/arch/mips/include/asm/gt64120.h b/arch/mips/include/asm/gt64120.h index 5d68d72..953ab1a 100644 --- a/arch/mips/include/asm/gt64120.h +++ b/arch/mips/include/asm/gt64120.h @@ -547,7 +547,7 @@ * full gt64120 cascade interrupt support is in place */ -#include +#include /* * Because of an error/peculiarity in the Galileo chip, we need to swap the diff --git a/arch/mips/pci/fixup-cobalt.c b/arch/mips/pci/fixup-cobalt.c index 44be65c..96badb1 100644 --- a/arch/mips/pci/fixup-cobalt.c +++ b/arch/mips/pci/fixup-cobalt.c @@ -16,8 +16,8 @@ #include #include -#include -#include +#include +#include /* * PCI slot numbers From patchwork Mon Mar 30 08:53:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bibo Mao X-Patchwork-Id: 11464961 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 3169292C for ; Mon, 30 Mar 2020 08:53:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0DC3C20732 for ; Mon, 30 Mar 2020 08:53:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729604AbgC3Ixu (ORCPT ); Mon, 30 Mar 2020 04:53:50 -0400 Received: from mail.loongson.cn ([114.242.206.163]:60338 "EHLO loongson.cn" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729595AbgC3Ixu (ORCPT ); Mon, 30 Mar 2020 04:53:50 -0400 Received: from kvm-dev1.localdomain (unknown [10.2.5.134]) by mail.loongson.cn (Coremail) with SMTP id AQAAf9Dx32qUs4Feq5ghAA--.18S2; Mon, 30 Mar 2020 16:53:40 +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 14/39] MIPS: dec: Add header file path prefix Date: Mon, 30 Mar 2020 04:53:40 -0400 Message-Id: <1585558420-936-1-git-send-email-maobibo@loongson.cn> X-Mailer: git-send-email 1.8.3.1 X-CM-TRANSID: AQAAf9Dx32qUs4Feq5ghAA--.18S2 X-Coremail-Antispam: 1UD129KBjvJXoWxKFyDCw1rWF1DKw4DGry3Jwb_yoWxJr43pa 1DA3Z5WF4Dury8Awn5ZFyIyr43Ja98WrWjkry5Wa47Z3ZaqF1UtrZ3Jr98AryxAF4DK3Wx WrZxW3yUtws2vaUanT9S1TB71UUUUUDqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUkIb7Iv0xC_KF4lb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rw A2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Xr0_Ar1l84ACjcxK6xII jxv20xvEc7CjxVAFwI0_Cr0_Gr1UM28EF7xvwVC2z280aVAFwI0_Gr1j6F4UJwA2z4x0Y4 vEx4A2jsIEc7CjxVAFwI0_Cr1j6rxdM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVAC Y4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26rWY6Fy7McIj6I8E87Iv67AKxVWxJV W8Jr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JMxkIecxEwVCm-wCF04k2 0xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI 8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2Ij64vIr41l IxAIcVC0I7IYx2IY67AKxVWUCVW8JwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr1lIx AIcVCF04k26cxKx2IYs7xG6r4j6FyUMIIF0xvEx4A2jsIE14v26F4j6r4UJwCI42IY6I8E 87Iv6xkF7I0E14v26r4UJVWxJrUvcSsGvfC2KfnxnUUI43ZEXa7IU0I385UUUUU== 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-dec to arch/mips/dec/include/mach Signed-off-by: bibo mao --- arch/mips/Kconfig | 1 + arch/mips/dec/Platform | 2 +- .../{include/asm/mach-dec => dec/include/mach}/cpu-feature-overrides.h | 0 arch/mips/dec/include/mach/ioremap.h | 2 ++ arch/mips/dec/include/mach/irq.h | 2 ++ arch/mips/dec/include/mach/kernel-entry-init.h | 2 ++ arch/mips/dec/include/mach/kmalloc.h | 2 ++ arch/mips/dec/include/mach/mangle-port.h | 2 ++ arch/mips/{include/asm/mach-dec => dec/include/mach}/mc146818rtc.h | 0 arch/mips/dec/include/mach/spaces.h | 2 ++ arch/mips/dec/include/mach/topology.h | 2 ++ arch/mips/dec/include/mach/war.h | 2 ++ arch/mips/include/asm/dec/interrupts.h | 2 +- 13 files changed, 19 insertions(+), 2 deletions(-) rename arch/mips/{include/asm/mach-dec => dec/include/mach}/cpu-feature-overrides.h (100%) create mode 100644 arch/mips/dec/include/mach/ioremap.h create mode 100644 arch/mips/dec/include/mach/irq.h create mode 100644 arch/mips/dec/include/mach/kernel-entry-init.h create mode 100644 arch/mips/dec/include/mach/kmalloc.h create mode 100644 arch/mips/dec/include/mach/mangle-port.h rename arch/mips/{include/asm/mach-dec => dec/include/mach}/mc146818rtc.h (100%) create mode 100644 arch/mips/dec/include/mach/spaces.h create mode 100644 arch/mips/dec/include/mach/topology.h create mode 100644 arch/mips/dec/include/mach/war.h diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index ba7e065..17e1131 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -353,6 +353,7 @@ config MACH_DECSTATION select SYS_SUPPORTS_256HZ select SYS_SUPPORTS_1024HZ select MIPS_L1_CACHE_SHIFT_4 + select HAVE_MACH_HEAD_FILES help This enables support for DEC's MIPS based workstations. For details see the Linux/MIPS FAQ on and the diff --git a/arch/mips/dec/Platform b/arch/mips/dec/Platform index cf55a6f..f450c99 100644 --- a/arch/mips/dec/Platform +++ b/arch/mips/dec/Platform @@ -3,6 +3,6 @@ # platform-$(CONFIG_MACH_DECSTATION) += dec/ cflags-$(CONFIG_MACH_DECSTATION) += \ - -I$(srctree)/arch/mips/include/asm/mach-dec + -I$(srctree)/arch/mips/dec/include libs-$(CONFIG_MACH_DECSTATION) += arch/mips/dec/prom/ load-$(CONFIG_MACH_DECSTATION) += 0xffffffff80040000 diff --git a/arch/mips/include/asm/mach-dec/cpu-feature-overrides.h b/arch/mips/dec/include/mach/cpu-feature-overrides.h similarity index 100% rename from arch/mips/include/asm/mach-dec/cpu-feature-overrides.h rename to arch/mips/dec/include/mach/cpu-feature-overrides.h diff --git a/arch/mips/dec/include/mach/ioremap.h b/arch/mips/dec/include/mach/ioremap.h new file mode 100644 index 0000000..2369393 --- /dev/null +++ b/arch/mips/dec/include/mach/ioremap.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/dec/include/mach/irq.h b/arch/mips/dec/include/mach/irq.h new file mode 100644 index 0000000..bb5ccce --- /dev/null +++ b/arch/mips/dec/include/mach/irq.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/dec/include/mach/kernel-entry-init.h b/arch/mips/dec/include/mach/kernel-entry-init.h new file mode 100644 index 0000000..19b872be --- /dev/null +++ b/arch/mips/dec/include/mach/kernel-entry-init.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/dec/include/mach/kmalloc.h b/arch/mips/dec/include/mach/kmalloc.h new file mode 100644 index 0000000..4f056db --- /dev/null +++ b/arch/mips/dec/include/mach/kmalloc.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/dec/include/mach/mangle-port.h b/arch/mips/dec/include/mach/mangle-port.h new file mode 100644 index 0000000..b9736e3 --- /dev/null +++ b/arch/mips/dec/include/mach/mangle-port.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-dec/mc146818rtc.h b/arch/mips/dec/include/mach/mc146818rtc.h similarity index 100% rename from arch/mips/include/asm/mach-dec/mc146818rtc.h rename to arch/mips/dec/include/mach/mc146818rtc.h diff --git a/arch/mips/dec/include/mach/spaces.h b/arch/mips/dec/include/mach/spaces.h new file mode 100644 index 0000000..39a4d72 --- /dev/null +++ b/arch/mips/dec/include/mach/spaces.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/dec/include/mach/topology.h b/arch/mips/dec/include/mach/topology.h new file mode 100644 index 0000000..86e585b --- /dev/null +++ b/arch/mips/dec/include/mach/topology.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/dec/include/mach/war.h b/arch/mips/dec/include/mach/war.h new file mode 100644 index 0000000..5b0422a --- /dev/null +++ b/arch/mips/dec/include/mach/war.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/dec/interrupts.h b/arch/mips/include/asm/dec/interrupts.h index e10d341..a2206e1 100644 --- a/arch/mips/include/asm/dec/interrupts.h +++ b/arch/mips/include/asm/dec/interrupts.h @@ -14,7 +14,7 @@ #ifndef __ASM_DEC_INTERRUPTS_H #define __ASM_DEC_INTERRUPTS_H -#include +#include #include From patchwork Mon Mar 30 08:58: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: 11464965 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 453B092C for ; Mon, 30 Mar 2020 08:59:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 240D720733 for ; Mon, 30 Mar 2020 08:59:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729736AbgC3I7B (ORCPT ); Mon, 30 Mar 2020 04:59:01 -0400 Received: from mail.loongson.cn ([114.242.206.163]:33206 "EHLO loongson.cn" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729735AbgC3I7B (ORCPT ); Mon, 30 Mar 2020 04:59:01 -0400 Received: from kvm-dev1.localdomain (unknown [10.2.5.134]) by mail.loongson.cn (Coremail) with SMTP id AQAAf9Dxv9vPtIFeGpkhAA--.23S2; Mon, 30 Mar 2020 16:58: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 15/39] MIPS: emma: Add header file path prefix Date: Mon, 30 Mar 2020 04:58:55 -0400 Message-Id: <1585558735-31535-1-git-send-email-maobibo@loongson.cn> X-Mailer: git-send-email 1.8.3.1 X-CM-TRANSID: AQAAf9Dxv9vPtIFeGpkhAA--.23S2 X-Coremail-Antispam: 1UD129KBjvJXoW3Xr15Gw13tF43Ww4fKrW7Jwb_yoW7KF4rpa 1DA3Z5GF4UuryUAayruFy7ZF43Jan5KrW0kryUW34UZ3WaqF1UJrs3Wr98CFyxAFWDt3WF grZxXrW5tw4vvaUanT9S1TB71UUUUUDqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUkSb7Iv0xC_KF4lb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rw A2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Xr0_Ar1l84ACjcxK6xII jxv20xvEc7CjxVAFwI0_Cr0_Gr1UM28EF7xvwVC2z280aVAFwI0_Gr1j6F4UJwA2z4x0Y4 vEx4A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xv F2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_JF0_Jw1lYx0Ex4A2jsIE14v26F4j6r 4UJwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lc2xSY4AK6svPMxAIw28I cxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2 IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAVWUtwCIc40Y0x0EwIxGrwCI 42IY6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8JVWxJwCI42 IY6xAIw20EY4v20xvaj40_Wr1j6rW3Jr1lIxAIcVC2z280aVAFwI0_Cr0_Gr1UMIIF0xvE x4A2jsIEc7CjxVAFwI0_Gr1j6F4UJbIYCTnIWIevJa73UjIFyTuYvjxU7R6zUUUUU 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-emma2rh to arch/mips/emma/include/mach Signed-off-by: bibo mao --- arch/mips/Kconfig | 1 + arch/mips/emma/Platform | 2 +- arch/mips/emma/include/mach/cpu-feature-overrides.h | 2 ++ arch/mips/emma/include/mach/ioremap.h | 2 ++ arch/mips/{include/asm/mach-emma2rh => emma/include/mach}/irq.h | 0 arch/mips/emma/include/mach/kernel-entry-init.h | 2 ++ arch/mips/emma/include/mach/kmalloc.h | 2 ++ arch/mips/emma/include/mach/mangle-port.h | 2 ++ arch/mips/emma/include/mach/mc146818rtc.h | 2 ++ arch/mips/emma/include/mach/spaces.h | 2 ++ arch/mips/emma/include/mach/topology.h | 2 ++ arch/mips/emma/include/mach/war.h | 2 ++ arch/mips/include/asm/emma/emma2rh.h | 2 +- 13 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 arch/mips/emma/include/mach/cpu-feature-overrides.h create mode 100644 arch/mips/emma/include/mach/ioremap.h rename arch/mips/{include/asm/mach-emma2rh => emma/include/mach}/irq.h (100%) create mode 100644 arch/mips/emma/include/mach/kernel-entry-init.h create mode 100644 arch/mips/emma/include/mach/kmalloc.h create mode 100644 arch/mips/emma/include/mach/mangle-port.h create mode 100644 arch/mips/emma/include/mach/mc146818rtc.h create mode 100644 arch/mips/emma/include/mach/spaces.h create mode 100644 arch/mips/emma/include/mach/topology.h create mode 100644 arch/mips/emma/include/mach/war.h diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 17e1131..cef1723 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -1360,6 +1360,7 @@ config SOC_EMMA2RH select SYS_SUPPORTS_32BIT_KERNEL select SYS_SUPPORTS_64BIT_KERNEL select SYS_SUPPORTS_BIG_ENDIAN + select HAVE_MACH_HEAD_FILES config SOC_PNX833X bool diff --git a/arch/mips/emma/Platform b/arch/mips/emma/Platform index 0282f7f..f97aecf 100644 --- a/arch/mips/emma/Platform +++ b/arch/mips/emma/Platform @@ -1,4 +1,4 @@ platform-$(CONFIG_SOC_EMMA2RH) += emma/ cflags-$(CONFIG_SOC_EMMA2RH) += \ - -I$(srctree)/arch/mips/include/asm/mach-emma2rh + -I$(srctree)/arch/mips/emma/include load-$(CONFIG_NEC_MARKEINS) += 0xffffffff88100000 diff --git a/arch/mips/emma/include/mach/cpu-feature-overrides.h b/arch/mips/emma/include/mach/cpu-feature-overrides.h new file mode 100644 index 0000000..f3e0e12 --- /dev/null +++ b/arch/mips/emma/include/mach/cpu-feature-overrides.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/emma/include/mach/ioremap.h b/arch/mips/emma/include/mach/ioremap.h new file mode 100644 index 0000000..2369393 --- /dev/null +++ b/arch/mips/emma/include/mach/ioremap.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-emma2rh/irq.h b/arch/mips/emma/include/mach/irq.h similarity index 100% rename from arch/mips/include/asm/mach-emma2rh/irq.h rename to arch/mips/emma/include/mach/irq.h diff --git a/arch/mips/emma/include/mach/kernel-entry-init.h b/arch/mips/emma/include/mach/kernel-entry-init.h new file mode 100644 index 0000000..19b872be --- /dev/null +++ b/arch/mips/emma/include/mach/kernel-entry-init.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/emma/include/mach/kmalloc.h b/arch/mips/emma/include/mach/kmalloc.h new file mode 100644 index 0000000..4f056db --- /dev/null +++ b/arch/mips/emma/include/mach/kmalloc.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/emma/include/mach/mangle-port.h b/arch/mips/emma/include/mach/mangle-port.h new file mode 100644 index 0000000..b9736e3 --- /dev/null +++ b/arch/mips/emma/include/mach/mangle-port.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/emma/include/mach/mc146818rtc.h b/arch/mips/emma/include/mach/mc146818rtc.h new file mode 100644 index 0000000..7284af8 --- /dev/null +++ b/arch/mips/emma/include/mach/mc146818rtc.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/emma/include/mach/spaces.h b/arch/mips/emma/include/mach/spaces.h new file mode 100644 index 0000000..39a4d72 --- /dev/null +++ b/arch/mips/emma/include/mach/spaces.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/emma/include/mach/topology.h b/arch/mips/emma/include/mach/topology.h new file mode 100644 index 0000000..86e585b --- /dev/null +++ b/arch/mips/emma/include/mach/topology.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/emma/include/mach/war.h b/arch/mips/emma/include/mach/war.h new file mode 100644 index 0000000..5b0422a --- /dev/null +++ b/arch/mips/emma/include/mach/war.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/emma/emma2rh.h b/arch/mips/include/asm/emma/emma2rh.h index a25cdb3..2797f34 100644 --- a/arch/mips/include/asm/emma/emma2rh.h +++ b/arch/mips/include/asm/emma/emma2rh.h @@ -8,7 +8,7 @@ #ifndef __ASM_EMMA_EMMA2RH_H #define __ASM_EMMA_EMMA2RH_H -#include +#include /* * EMMA2RH registers From patchwork Mon Mar 30 08:59:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bibo Mao X-Patchwork-Id: 11464967 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 4E19092C for ; Mon, 30 Mar 2020 08:59:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2B98420776 for ; Mon, 30 Mar 2020 08:59:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729735AbgC3I7G (ORCPT ); Mon, 30 Mar 2020 04:59:06 -0400 Received: from mail.loongson.cn ([114.242.206.163]:33244 "EHLO loongson.cn" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729809AbgC3I7G (ORCPT ); Mon, 30 Mar 2020 04:59:06 -0400 Received: from kvm-dev1.localdomain (unknown [10.2.5.134]) by mail.loongson.cn (Coremail) with SMTP id AQAAf9DxX2rVtIFeHJkhAA--.29S2; Mon, 30 Mar 2020 16:59:01 +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 16/39] MIPS: ip22: Add header file path prefix Date: Mon, 30 Mar 2020 04:59:01 -0400 Message-Id: <1585558741-7924-1-git-send-email-maobibo@loongson.cn> X-Mailer: git-send-email 1.8.3.1 X-CM-TRANSID: AQAAf9DxX2rVtIFeHJkhAA--.29S2 X-Coremail-Antispam: 1UD129KBjvJXoW3AF47Jw4rWFWkAry7uFyUWrg_yoWxCryrpa yqy3WkWFsI9ryDAw1rZFy2gr4aqw4Du3y0yryjgw17Z3WIgF15Jrs5KryDCr95AF4Dt3W0 gFWfua1DtF4kuw7anT9S1TB71UUUUUDqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUk2b7Iv0xC_Kw4lb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rw A2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Xr0_Ar1l84ACjcxK6xII jxv20xvEc7CjxVAFwI0_Cr0_Gr1UM28EF7xvwVC2z280aVAFwI0_Gr1j6F4UJwA2z4x0Y4 vEx4A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xv F2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_JF0_Jw1lYx0Ex4A2jsIE14v26F4j6r 4UJwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lc2xSY4AK6svPMxAIw28I cxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2 IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAVWUtwCIc40Y0x0EwIxGrwCI 42IY6xIIjxv20xvE14v26r1I6r4UMIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8JVWxJwCI42 IY6xAIw20EY4v20xvaj40_JFI_Gr1lIxAIcVC2z280aVAFwI0_Cr0_Gr1UMIIF0xvEx4A2 jsIEc7CjxVAFwI0_Gr1j6F4UJbIYCTnIWIevJa73UjIFyTuYvjxUqXTQUUUUU 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-ip22 to arch/mips/sgi-ip22/ip22/include/mach Signed-off-by: bibo mao --- arch/mips/Kconfig | 1 + arch/mips/include/asm/sgi/ip22.h | 2 +- arch/mips/sgi-ip22/Platform | 2 +- .../mach-ip22 => sgi-ip22/ip22/include/mach}/cpu-feature-overrides.h | 0 arch/mips/sgi-ip22/ip22/include/mach/ioremap.h | 2 ++ arch/mips/sgi-ip22/ip22/include/mach/irq.h | 2 ++ arch/mips/sgi-ip22/ip22/include/mach/kernel-entry-init.h | 2 ++ arch/mips/sgi-ip22/ip22/include/mach/kmalloc.h | 2 ++ arch/mips/sgi-ip22/ip22/include/mach/mangle-port.h | 2 ++ arch/mips/sgi-ip22/ip22/include/mach/mc146818rtc.h | 2 ++ .../mips/{include/asm/mach-ip22 => sgi-ip22/ip22/include/mach}/spaces.h | 0 arch/mips/sgi-ip22/ip22/include/mach/topology.h | 2 ++ arch/mips/{include/asm/mach-ip22 => sgi-ip22/ip22/include/mach}/war.h | 0 13 files changed, 17 insertions(+), 2 deletions(-) rename arch/mips/{include/asm/mach-ip22 => sgi-ip22/ip22/include/mach}/cpu-feature-overrides.h (100%) create mode 100644 arch/mips/sgi-ip22/ip22/include/mach/ioremap.h create mode 100644 arch/mips/sgi-ip22/ip22/include/mach/irq.h create mode 100644 arch/mips/sgi-ip22/ip22/include/mach/kernel-entry-init.h create mode 100644 arch/mips/sgi-ip22/ip22/include/mach/kmalloc.h create mode 100644 arch/mips/sgi-ip22/ip22/include/mach/mangle-port.h create mode 100644 arch/mips/sgi-ip22/ip22/include/mach/mc146818rtc.h rename arch/mips/{include/asm/mach-ip22 => sgi-ip22/ip22/include/mach}/spaces.h (100%) create mode 100644 arch/mips/sgi-ip22/ip22/include/mach/topology.h rename arch/mips/{include/asm/mach-ip22 => sgi-ip22/ip22/include/mach}/war.h (100%) diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index cef1723..d394542 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -707,6 +707,7 @@ config SGI_IP22 select SYS_SUPPORTS_64BIT_KERNEL select SYS_SUPPORTS_BIG_ENDIAN select MIPS_L1_CACHE_SHIFT_7 + select HAVE_MACH_HEAD_FILES help This are the SGI Indy, Challenge S and Indigo2, as well as certain OEM variants like the Tandem CMN B006S. To compile a Linux kernel diff --git a/arch/mips/include/asm/sgi/ip22.h b/arch/mips/include/asm/sgi/ip22.h index 87ec9ea..6011ef6 100644 --- a/arch/mips/include/asm/sgi/ip22.h +++ b/arch/mips/include/asm/sgi/ip22.h @@ -21,7 +21,7 @@ * HAL2 driver). This will prevent many complications, trust me ;-) */ -#include +#include #include #define SGINT_EISA 0 /* 16 EISA irq levels (Indigo2) */ diff --git a/arch/mips/sgi-ip22/Platform b/arch/mips/sgi-ip22/Platform index e8f6b3a..539b305 100644 --- a/arch/mips/sgi-ip22/Platform +++ b/arch/mips/sgi-ip22/Platform @@ -8,7 +8,7 @@ # address by 8kb. # platform-$(CONFIG_SGI_IP22) += sgi-ip22/ -cflags-$(CONFIG_SGI_IP22) += -I$(srctree)/arch/mips/include/asm/mach-ip22 +cflags-$(CONFIG_SGI_IP22) += -I$(srctree)/arch/mips/sgi-ip22/ip22/include ifdef CONFIG_32BIT load-$(CONFIG_SGI_IP22) += 0xffffffff88002000 endif diff --git a/arch/mips/include/asm/mach-ip22/cpu-feature-overrides.h b/arch/mips/sgi-ip22/ip22/include/mach/cpu-feature-overrides.h similarity index 100% rename from arch/mips/include/asm/mach-ip22/cpu-feature-overrides.h rename to arch/mips/sgi-ip22/ip22/include/mach/cpu-feature-overrides.h diff --git a/arch/mips/sgi-ip22/ip22/include/mach/ioremap.h b/arch/mips/sgi-ip22/ip22/include/mach/ioremap.h new file mode 100644 index 0000000..2369393 --- /dev/null +++ b/arch/mips/sgi-ip22/ip22/include/mach/ioremap.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/sgi-ip22/ip22/include/mach/irq.h b/arch/mips/sgi-ip22/ip22/include/mach/irq.h new file mode 100644 index 0000000..bb5ccce --- /dev/null +++ b/arch/mips/sgi-ip22/ip22/include/mach/irq.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/sgi-ip22/ip22/include/mach/kernel-entry-init.h b/arch/mips/sgi-ip22/ip22/include/mach/kernel-entry-init.h new file mode 100644 index 0000000..19b872be --- /dev/null +++ b/arch/mips/sgi-ip22/ip22/include/mach/kernel-entry-init.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/sgi-ip22/ip22/include/mach/kmalloc.h b/arch/mips/sgi-ip22/ip22/include/mach/kmalloc.h new file mode 100644 index 0000000..4f056db --- /dev/null +++ b/arch/mips/sgi-ip22/ip22/include/mach/kmalloc.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/sgi-ip22/ip22/include/mach/mangle-port.h b/arch/mips/sgi-ip22/ip22/include/mach/mangle-port.h new file mode 100644 index 0000000..b9736e3 --- /dev/null +++ b/arch/mips/sgi-ip22/ip22/include/mach/mangle-port.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/sgi-ip22/ip22/include/mach/mc146818rtc.h b/arch/mips/sgi-ip22/ip22/include/mach/mc146818rtc.h new file mode 100644 index 0000000..7284af8 --- /dev/null +++ b/arch/mips/sgi-ip22/ip22/include/mach/mc146818rtc.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-ip22/spaces.h b/arch/mips/sgi-ip22/ip22/include/mach/spaces.h similarity index 100% rename from arch/mips/include/asm/mach-ip22/spaces.h rename to arch/mips/sgi-ip22/ip22/include/mach/spaces.h diff --git a/arch/mips/sgi-ip22/ip22/include/mach/topology.h b/arch/mips/sgi-ip22/ip22/include/mach/topology.h new file mode 100644 index 0000000..86e585b --- /dev/null +++ b/arch/mips/sgi-ip22/ip22/include/mach/topology.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-ip22/war.h b/arch/mips/sgi-ip22/ip22/include/mach/war.h similarity index 100% rename from arch/mips/include/asm/mach-ip22/war.h rename to arch/mips/sgi-ip22/ip22/include/mach/war.h From patchwork Mon Mar 30 08:59: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: 11464969 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 29273912 for ; Mon, 30 Mar 2020 08:59:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 077462082D for ; Mon, 30 Mar 2020 08:59:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729841AbgC3I7L (ORCPT ); Mon, 30 Mar 2020 04:59:11 -0400 Received: from mail.loongson.cn ([114.242.206.163]:33284 "EHLO loongson.cn" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728759AbgC3I7L (ORCPT ); Mon, 30 Mar 2020 04:59:11 -0400 Received: from kvm-dev1.localdomain (unknown [10.2.5.134]) by mail.loongson.cn (Coremail) with SMTP id AQAAf9Dxj9_btIFeH5khAA--.19S2; Mon, 30 Mar 2020 16:59: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 17/39] MIPS: ip28: Add header file path prefix Date: Mon, 30 Mar 2020 04:59:07 -0400 Message-Id: <1585558747-13522-1-git-send-email-maobibo@loongson.cn> X-Mailer: git-send-email 1.8.3.1 X-CM-TRANSID: AQAAf9Dxj9_btIFeH5khAA--.19S2 X-Coremail-Antispam: 1UD129KBjvJXoW3WryDGr15tF1Utr4xAr1rCrg_yoWxGF47pa yqy3WkWFsa9ryUCw1rZFy2gr4Sqw4DC3y0kr1Ygw17u3WIgFy5JrZYgryDur95AF4Dt3W0 gFyS93WUtr4kuw7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUk2b7Iv0xC_Kw4lb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rw A2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Xr0_Ar1l84ACjcxK6xII jxv20xvEc7CjxVAFwI0_Cr0_Gr1UM28EF7xvwVC2z280aVAFwI0_Gr1j6F4UJwA2z4x0Y4 vEx4A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xv F2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_JF0_Jw1lYx0Ex4A2jsIE14v26F4j6r 4UJwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lc2xSY4AK6svPMxAIw28I cxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2 IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAVWUtwCIc40Y0x0EwIxGrwCI 42IY6xIIjxv20xvE14v26r1I6r4UMIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8JVWxJwCI42 IY6xAIw20EY4v20xvaj40_JFI_Gr1lIxAIcVC2z280aVAFwI0_Cr0_Gr1UMIIF0xvEx4A2 jsIEc7CjxVAFwI0_Gr1j6F4UJbIYCTnIWIevJa73UjIFyTuYvjxUqXTQUUUUU 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-ip28 to arch/mips/sgi-ip22/ip28/include/mach Signed-off-by: bibo mao --- arch/mips/Kconfig | 1 + arch/mips/sgi-ip22/Platform | 2 +- .../mach-ip28 => sgi-ip22/ip28/include/mach}/cpu-feature-overrides.h | 0 arch/mips/sgi-ip22/ip28/include/mach/ioremap.h | 2 ++ arch/mips/sgi-ip22/ip28/include/mach/irq.h | 2 ++ arch/mips/sgi-ip22/ip28/include/mach/kernel-entry-init.h | 2 ++ arch/mips/sgi-ip22/ip28/include/mach/kmalloc.h | 2 ++ arch/mips/sgi-ip22/ip28/include/mach/mangle-port.h | 2 ++ arch/mips/sgi-ip22/ip28/include/mach/mc146818rtc.h | 2 ++ .../mips/{include/asm/mach-ip28 => sgi-ip22/ip28/include/mach}/spaces.h | 0 arch/mips/sgi-ip22/ip28/include/mach/topology.h | 2 ++ arch/mips/{include/asm/mach-ip28 => sgi-ip22/ip28/include/mach}/war.h | 0 12 files changed, 16 insertions(+), 1 deletion(-) rename arch/mips/{include/asm/mach-ip28 => sgi-ip22/ip28/include/mach}/cpu-feature-overrides.h (100%) create mode 100644 arch/mips/sgi-ip22/ip28/include/mach/ioremap.h create mode 100644 arch/mips/sgi-ip22/ip28/include/mach/irq.h create mode 100644 arch/mips/sgi-ip22/ip28/include/mach/kernel-entry-init.h create mode 100644 arch/mips/sgi-ip22/ip28/include/mach/kmalloc.h create mode 100644 arch/mips/sgi-ip22/ip28/include/mach/mangle-port.h create mode 100644 arch/mips/sgi-ip22/ip28/include/mach/mc146818rtc.h rename arch/mips/{include/asm/mach-ip28 => sgi-ip22/ip28/include/mach}/spaces.h (100%) create mode 100644 arch/mips/sgi-ip22/ip28/include/mach/topology.h rename arch/mips/{include/asm/mach-ip28 => sgi-ip22/ip28/include/mach}/war.h (100%) diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index d394542..aad4a68 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -769,6 +769,7 @@ config SGI_IP28 select SYS_SUPPORTS_64BIT_KERNEL select SYS_SUPPORTS_BIG_ENDIAN select MIPS_L1_CACHE_SHIFT_7 + select HAVE_MACH_HEAD_FILES help This is the SGI Indigo2 with R10000 processor. To compile a Linux kernel that runs on these, say Y here. diff --git a/arch/mips/sgi-ip22/Platform b/arch/mips/sgi-ip22/Platform index 539b305..ef1db85 100644 --- a/arch/mips/sgi-ip22/Platform +++ b/arch/mips/sgi-ip22/Platform @@ -30,5 +30,5 @@ ifdef CONFIG_SGI_IP28 endif endif platform-$(CONFIG_SGI_IP28) += sgi-ip22/ -cflags-$(CONFIG_SGI_IP28) += -mr10k-cache-barrier=store -I$(srctree)/arch/mips/include/asm/mach-ip28 +cflags-$(CONFIG_SGI_IP28) += -mr10k-cache-barrier=store -I$(srctree)/arch/mips/sgi-ip22/ip28/include load-$(CONFIG_SGI_IP28) += 0xa800000020004000 diff --git a/arch/mips/include/asm/mach-ip28/cpu-feature-overrides.h b/arch/mips/sgi-ip22/ip28/include/mach/cpu-feature-overrides.h similarity index 100% rename from arch/mips/include/asm/mach-ip28/cpu-feature-overrides.h rename to arch/mips/sgi-ip22/ip28/include/mach/cpu-feature-overrides.h diff --git a/arch/mips/sgi-ip22/ip28/include/mach/ioremap.h b/arch/mips/sgi-ip22/ip28/include/mach/ioremap.h new file mode 100644 index 0000000..2369393 --- /dev/null +++ b/arch/mips/sgi-ip22/ip28/include/mach/ioremap.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/sgi-ip22/ip28/include/mach/irq.h b/arch/mips/sgi-ip22/ip28/include/mach/irq.h new file mode 100644 index 0000000..bb5ccce --- /dev/null +++ b/arch/mips/sgi-ip22/ip28/include/mach/irq.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/sgi-ip22/ip28/include/mach/kernel-entry-init.h b/arch/mips/sgi-ip22/ip28/include/mach/kernel-entry-init.h new file mode 100644 index 0000000..19b872be --- /dev/null +++ b/arch/mips/sgi-ip22/ip28/include/mach/kernel-entry-init.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/sgi-ip22/ip28/include/mach/kmalloc.h b/arch/mips/sgi-ip22/ip28/include/mach/kmalloc.h new file mode 100644 index 0000000..4f056db --- /dev/null +++ b/arch/mips/sgi-ip22/ip28/include/mach/kmalloc.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/sgi-ip22/ip28/include/mach/mangle-port.h b/arch/mips/sgi-ip22/ip28/include/mach/mangle-port.h new file mode 100644 index 0000000..b9736e3 --- /dev/null +++ b/arch/mips/sgi-ip22/ip28/include/mach/mangle-port.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/sgi-ip22/ip28/include/mach/mc146818rtc.h b/arch/mips/sgi-ip22/ip28/include/mach/mc146818rtc.h new file mode 100644 index 0000000..7284af8 --- /dev/null +++ b/arch/mips/sgi-ip22/ip28/include/mach/mc146818rtc.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-ip28/spaces.h b/arch/mips/sgi-ip22/ip28/include/mach/spaces.h similarity index 100% rename from arch/mips/include/asm/mach-ip28/spaces.h rename to arch/mips/sgi-ip22/ip28/include/mach/spaces.h diff --git a/arch/mips/sgi-ip22/ip28/include/mach/topology.h b/arch/mips/sgi-ip22/ip28/include/mach/topology.h new file mode 100644 index 0000000..86e585b --- /dev/null +++ b/arch/mips/sgi-ip22/ip28/include/mach/topology.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-ip28/war.h b/arch/mips/sgi-ip22/ip28/include/mach/war.h similarity index 100% rename from arch/mips/include/asm/mach-ip28/war.h rename to arch/mips/sgi-ip22/ip28/include/mach/war.h From patchwork Mon Mar 30 08:59:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bibo Mao X-Patchwork-Id: 11464971 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 CDEF692C for ; Mon, 30 Mar 2020 08:59:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AC19620658 for ; Mon, 30 Mar 2020 08:59:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729808AbgC3I7S (ORCPT ); Mon, 30 Mar 2020 04:59:18 -0400 Received: from mail.loongson.cn ([114.242.206.163]:33304 "EHLO loongson.cn" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728759AbgC3I7S (ORCPT ); Mon, 30 Mar 2020 04:59:18 -0400 Received: from kvm-dev1.localdomain (unknown [10.2.5.134]) by mail.loongson.cn (Coremail) with SMTP id AQAAf9Ax9unhtIFeIpkhAA--.22S2; Mon, 30 Mar 2020 16:59:13 +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 18/39] MIPS: ip27: Add header file path prefix Date: Mon, 30 Mar 2020 04:59:13 -0400 Message-Id: <1585558753-18285-1-git-send-email-maobibo@loongson.cn> X-Mailer: git-send-email 1.8.3.1 X-CM-TRANSID: AQAAf9Ax9unhtIFeIpkhAA--.22S2 X-Coremail-Antispam: 1UD129KBjvJXoW3XrW3Cr48KFW8uF4DWF1rZwb_yoWxGFWxpa 1DA3WkGws09ryUAw17ZFZFgF4ftw4DWrZIvrWYgr1UZ3ZagF1UXFs3Krn8Ar95AF4kt3WI gFW3u3W5trs7uw7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUk2b7Iv0xC_tr1lb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rw A2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Xr0_Ar1l84ACjcxK6xII jxv20xvEc7CjxVAFwI0_Cr0_Gr1UM28EF7xvwVC2z280aVAFwI0_Gr1j6F4UJwA2z4x0Y4 vEx4A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xv F2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_JF0_Jw1lYx0Ex4A2jsIE14v26F4j6r 4UJwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lc2xSY4AK6svPMxAIw28I cxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2 IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAVWUtwCIc40Y0x0EwIxGrwCI 42IY6xIIjxv20xvE14v26r1I6r4UMIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8JVWxJwCI42 IY6xAIw20EY4v20xvaj40_JFI_Gr1lIxAIcVC2z280aVAFwI0_Cr0_Gr1UMIIF0xvEx4A2 jsIEc7CjxVAFwI0_Gr1j6F4UJbIYCTnIWIevJa73UjIFyTuYvjxU7ZXoDUUUU 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-ip27 o arch/mips/sgi-ip27/include/mach Signed-off-by: bibo mao --- arch/mips/Kconfig | 1 + arch/mips/sgi-ip27/Platform | 2 +- .../asm/mach-ip27 => sgi-ip27/include/mach}/cpu-feature-overrides.h | 0 arch/mips/sgi-ip27/include/mach/ioremap.h | 2 ++ arch/mips/{include/asm/mach-ip27 => sgi-ip27/include/mach}/irq.h | 0 .../asm/mach-ip27 => sgi-ip27/include/mach}/kernel-entry-init.h | 0 arch/mips/{include/asm/mach-ip27 => sgi-ip27/include/mach}/kmalloc.h | 0 .../mips/{include/asm/mach-ip27 => sgi-ip27/include/mach}/mangle-port.h | 0 arch/mips/sgi-ip27/include/mach/mc146818rtc.h | 2 ++ arch/mips/{include/asm/mach-ip27 => sgi-ip27/include/mach}/mmzone.h | 0 arch/mips/{include/asm/mach-ip27 => sgi-ip27/include/mach}/spaces.h | 0 arch/mips/{include/asm/mach-ip27 => sgi-ip27/include/mach}/topology.h | 0 arch/mips/{include/asm/mach-ip27 => sgi-ip27/include/mach}/war.h | 0 13 files changed, 6 insertions(+), 1 deletion(-) rename arch/mips/{include/asm/mach-ip27 => sgi-ip27/include/mach}/cpu-feature-overrides.h (100%) create mode 100644 arch/mips/sgi-ip27/include/mach/ioremap.h rename arch/mips/{include/asm/mach-ip27 => sgi-ip27/include/mach}/irq.h (100%) rename arch/mips/{include/asm/mach-ip27 => sgi-ip27/include/mach}/kernel-entry-init.h (100%) rename arch/mips/{include/asm/mach-ip27 => sgi-ip27/include/mach}/kmalloc.h (100%) rename arch/mips/{include/asm/mach-ip27 => sgi-ip27/include/mach}/mangle-port.h (100%) create mode 100644 arch/mips/sgi-ip27/include/mach/mc146818rtc.h rename arch/mips/{include/asm/mach-ip27 => sgi-ip27/include/mach}/mmzone.h (100%) rename arch/mips/{include/asm/mach-ip27 => sgi-ip27/include/mach}/spaces.h (100%) rename arch/mips/{include/asm/mach-ip27 => sgi-ip27/include/mach}/topology.h (100%) rename arch/mips/{include/asm/mach-ip27 => sgi-ip27/include/mach}/war.h (100%) diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index aad4a68..48fd625 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -735,6 +735,7 @@ config SGI_IP27 select SYS_SUPPORTS_NUMA select SYS_SUPPORTS_SMP select MIPS_L1_CACHE_SHIFT_7 + select HAVE_MACH_HEAD_FILES help This are the SGI Origin 200, Origin 2000 and Onyx 2 Graphics workstations. To compile a Linux kernel that runs on these, say Y diff --git a/arch/mips/sgi-ip27/Platform b/arch/mips/sgi-ip27/Platform index 1fb9c2e..5d37446 100644 --- a/arch/mips/sgi-ip27/Platform +++ b/arch/mips/sgi-ip27/Platform @@ -7,7 +7,7 @@ # ifdef CONFIG_SGI_IP27 platform-$(CONFIG_SGI_IP27) += sgi-ip27/ -cflags-$(CONFIG_SGI_IP27) += -I$(srctree)/arch/mips/include/asm/mach-ip27 +cflags-$(CONFIG_SGI_IP27) += -I$(srctree)/arch/mips/sgi-ip27/include ifdef CONFIG_MAPPED_KERNEL load-$(CONFIG_SGI_IP27) += 0xc00000004001c000 OBJCOPYFLAGS := --change-addresses=0x3fffffff80000000 diff --git a/arch/mips/include/asm/mach-ip27/cpu-feature-overrides.h b/arch/mips/sgi-ip27/include/mach/cpu-feature-overrides.h similarity index 100% rename from arch/mips/include/asm/mach-ip27/cpu-feature-overrides.h rename to arch/mips/sgi-ip27/include/mach/cpu-feature-overrides.h diff --git a/arch/mips/sgi-ip27/include/mach/ioremap.h b/arch/mips/sgi-ip27/include/mach/ioremap.h new file mode 100644 index 0000000..2369393 --- /dev/null +++ b/arch/mips/sgi-ip27/include/mach/ioremap.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-ip27/irq.h b/arch/mips/sgi-ip27/include/mach/irq.h similarity index 100% rename from arch/mips/include/asm/mach-ip27/irq.h rename to arch/mips/sgi-ip27/include/mach/irq.h diff --git a/arch/mips/include/asm/mach-ip27/kernel-entry-init.h b/arch/mips/sgi-ip27/include/mach/kernel-entry-init.h similarity index 100% rename from arch/mips/include/asm/mach-ip27/kernel-entry-init.h rename to arch/mips/sgi-ip27/include/mach/kernel-entry-init.h diff --git a/arch/mips/include/asm/mach-ip27/kmalloc.h b/arch/mips/sgi-ip27/include/mach/kmalloc.h similarity index 100% rename from arch/mips/include/asm/mach-ip27/kmalloc.h rename to arch/mips/sgi-ip27/include/mach/kmalloc.h diff --git a/arch/mips/include/asm/mach-ip27/mangle-port.h b/arch/mips/sgi-ip27/include/mach/mangle-port.h similarity index 100% rename from arch/mips/include/asm/mach-ip27/mangle-port.h rename to arch/mips/sgi-ip27/include/mach/mangle-port.h diff --git a/arch/mips/sgi-ip27/include/mach/mc146818rtc.h b/arch/mips/sgi-ip27/include/mach/mc146818rtc.h new file mode 100644 index 0000000..7284af8 --- /dev/null +++ b/arch/mips/sgi-ip27/include/mach/mc146818rtc.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-ip27/mmzone.h b/arch/mips/sgi-ip27/include/mach/mmzone.h similarity index 100% rename from arch/mips/include/asm/mach-ip27/mmzone.h rename to arch/mips/sgi-ip27/include/mach/mmzone.h diff --git a/arch/mips/include/asm/mach-ip27/spaces.h b/arch/mips/sgi-ip27/include/mach/spaces.h similarity index 100% rename from arch/mips/include/asm/mach-ip27/spaces.h rename to arch/mips/sgi-ip27/include/mach/spaces.h diff --git a/arch/mips/include/asm/mach-ip27/topology.h b/arch/mips/sgi-ip27/include/mach/topology.h similarity index 100% rename from arch/mips/include/asm/mach-ip27/topology.h rename to arch/mips/sgi-ip27/include/mach/topology.h diff --git a/arch/mips/include/asm/mach-ip27/war.h b/arch/mips/sgi-ip27/include/mach/war.h similarity index 100% rename from arch/mips/include/asm/mach-ip27/war.h rename to arch/mips/sgi-ip27/include/mach/war.h From patchwork Mon Mar 30 08:59:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bibo Mao X-Patchwork-Id: 11464973 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 A27C092C for ; Mon, 30 Mar 2020 08:59:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7E90E20658 for ; Mon, 30 Mar 2020 08:59:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729827AbgC3I7Y (ORCPT ); Mon, 30 Mar 2020 04:59:24 -0400 Received: from mail.loongson.cn ([114.242.206.163]:33330 "EHLO loongson.cn" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728759AbgC3I7X (ORCPT ); Mon, 30 Mar 2020 04:59:23 -0400 Received: from kvm-dev1.localdomain (unknown [10.2.5.134]) by mail.loongson.cn (Coremail) with SMTP id AQAAf9Dxb2jntIFeI5khAA--.27S2; Mon, 30 Mar 2020 16:59:19 +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 19/39] MIPS: ip30: Add header file path prefix Date: Mon, 30 Mar 2020 04:59:19 -0400 Message-Id: <1585558759-18419-1-git-send-email-maobibo@loongson.cn> X-Mailer: git-send-email 1.8.3.1 X-CM-TRANSID: AQAAf9Dxb2jntIFeI5khAA--.27S2 X-Coremail-Antispam: 1UD129KBjvJXoWxuw15tFy7AF15GFWfZrWrXwb_yoW7uFWxpa n2y3Z5Gr45urW5AryDZFy7Kr43Ja1DGrWjvrWYg347Z3WSq3WUJFs3t3s8Ar97AF4Dtay0 gFW3WF1DJF4kuw7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUk2b7Iv0xC_Kw4lb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rw A2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Xr0_Ar1l84ACjcxK6xII jxv20xvEc7CjxVAFwI0_Cr0_Gr1UM28EF7xvwVC2z280aVAFwI0_Gr1j6F4UJwA2z4x0Y4 vEx4A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xv F2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jw0_WrylYx0Ex4A2jsIE14v26F4j6r 4UJwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lc2xSY4AK6svPMxAIw28I cxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2 IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAVWUtwCIc40Y0x0EwIxGrwCI 42IY6xIIjxv20xvE14v26r1I6r4UMIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8JVWxJwCI42 IY6xAIw20EY4v20xvaj40_JFI_Gr1lIxAIcVC2z280aVAFwI0_Cr0_Gr1UMIIF0xvEx4A2 jsIEc7CjxVAFwI0_Gr1j6F4UJbIYCTnIWIevJa73UjIFyTuYvjxUq_MaDUUUU 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-ip30 to arch/mips/sgi-ip30/include/mach Signed-off-by: bibo mao --- arch/mips/Kconfig | 1 + arch/mips/sgi-ip30/Platform | 2 +- .../asm/mach-ip30 => sgi-ip30/include/mach}/cpu-feature-overrides.h | 0 arch/mips/sgi-ip30/include/mach/ioremap.h | 2 ++ arch/mips/{include/asm/mach-ip30 => sgi-ip30/include/mach}/irq.h | 0 .../asm/mach-ip30 => sgi-ip30/include/mach}/kernel-entry-init.h | 0 arch/mips/sgi-ip30/include/mach/kmalloc.h | 2 ++ .../mips/{include/asm/mach-ip30 => sgi-ip30/include/mach}/mangle-port.h | 0 arch/mips/sgi-ip30/include/mach/mc146818rtc.h | 2 ++ arch/mips/{include/asm/mach-ip30 => sgi-ip30/include/mach}/spaces.h | 0 arch/mips/sgi-ip30/include/mach/topology.h | 2 ++ arch/mips/{include/asm/mach-ip30 => sgi-ip30/include/mach}/war.h | 0 12 files changed, 10 insertions(+), 1 deletion(-) rename arch/mips/{include/asm/mach-ip30 => sgi-ip30/include/mach}/cpu-feature-overrides.h (100%) create mode 100644 arch/mips/sgi-ip30/include/mach/ioremap.h rename arch/mips/{include/asm/mach-ip30 => sgi-ip30/include/mach}/irq.h (100%) rename arch/mips/{include/asm/mach-ip30 => sgi-ip30/include/mach}/kernel-entry-init.h (100%) create mode 100644 arch/mips/sgi-ip30/include/mach/kmalloc.h rename arch/mips/{include/asm/mach-ip30 => sgi-ip30/include/mach}/mangle-port.h (100%) create mode 100644 arch/mips/sgi-ip30/include/mach/mc146818rtc.h rename arch/mips/{include/asm/mach-ip30 => sgi-ip30/include/mach}/spaces.h (100%) create mode 100644 arch/mips/sgi-ip30/include/mach/topology.h rename arch/mips/{include/asm/mach-ip30 => sgi-ip30/include/mach}/war.h (100%) diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 48fd625..6a6cf8c 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -798,6 +798,7 @@ config SGI_IP30 select SYS_SUPPORTS_SMP select MIPS_L1_CACHE_SHIFT_7 select ARC_MEMORY + select HAVE_MACH_HEAD_FILES help These are the SGI Octane and Octane2 graphics workstations. To compile a Linux kernel that runs on these, say Y here. diff --git a/arch/mips/sgi-ip30/Platform b/arch/mips/sgi-ip30/Platform index 2b5695c..38433a5 100644 --- a/arch/mips/sgi-ip30/Platform +++ b/arch/mips/sgi-ip30/Platform @@ -3,6 +3,6 @@ # ifdef CONFIG_SGI_IP30 platform-$(CONFIG_SGI_IP30) += sgi-ip30/ -cflags-$(CONFIG_SGI_IP30) += -I$(srctree)/arch/mips/include/asm/mach-ip30 +cflags-$(CONFIG_SGI_IP30) += -I$(srctree)/arch/mips/sgi-ip30/include load-$(CONFIG_SGI_IP30) += 0xa800000020004000 endif diff --git a/arch/mips/include/asm/mach-ip30/cpu-feature-overrides.h b/arch/mips/sgi-ip30/include/mach/cpu-feature-overrides.h similarity index 100% rename from arch/mips/include/asm/mach-ip30/cpu-feature-overrides.h rename to arch/mips/sgi-ip30/include/mach/cpu-feature-overrides.h diff --git a/arch/mips/sgi-ip30/include/mach/ioremap.h b/arch/mips/sgi-ip30/include/mach/ioremap.h new file mode 100644 index 0000000..2369393 --- /dev/null +++ b/arch/mips/sgi-ip30/include/mach/ioremap.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-ip30/irq.h b/arch/mips/sgi-ip30/include/mach/irq.h similarity index 100% rename from arch/mips/include/asm/mach-ip30/irq.h rename to arch/mips/sgi-ip30/include/mach/irq.h diff --git a/arch/mips/include/asm/mach-ip30/kernel-entry-init.h b/arch/mips/sgi-ip30/include/mach/kernel-entry-init.h similarity index 100% rename from arch/mips/include/asm/mach-ip30/kernel-entry-init.h rename to arch/mips/sgi-ip30/include/mach/kernel-entry-init.h diff --git a/arch/mips/sgi-ip30/include/mach/kmalloc.h b/arch/mips/sgi-ip30/include/mach/kmalloc.h new file mode 100644 index 0000000..4f056db --- /dev/null +++ b/arch/mips/sgi-ip30/include/mach/kmalloc.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-ip30/mangle-port.h b/arch/mips/sgi-ip30/include/mach/mangle-port.h similarity index 100% rename from arch/mips/include/asm/mach-ip30/mangle-port.h rename to arch/mips/sgi-ip30/include/mach/mangle-port.h diff --git a/arch/mips/sgi-ip30/include/mach/mc146818rtc.h b/arch/mips/sgi-ip30/include/mach/mc146818rtc.h new file mode 100644 index 0000000..7284af8 --- /dev/null +++ b/arch/mips/sgi-ip30/include/mach/mc146818rtc.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-ip30/spaces.h b/arch/mips/sgi-ip30/include/mach/spaces.h similarity index 100% rename from arch/mips/include/asm/mach-ip30/spaces.h rename to arch/mips/sgi-ip30/include/mach/spaces.h diff --git a/arch/mips/sgi-ip30/include/mach/topology.h b/arch/mips/sgi-ip30/include/mach/topology.h new file mode 100644 index 0000000..86e585b --- /dev/null +++ b/arch/mips/sgi-ip30/include/mach/topology.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-ip30/war.h b/arch/mips/sgi-ip30/include/mach/war.h similarity index 100% rename from arch/mips/include/asm/mach-ip30/war.h rename to arch/mips/sgi-ip30/include/mach/war.h From patchwork Mon Mar 30 08:59:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bibo Mao X-Patchwork-Id: 11464975 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 2DD6A92C for ; Mon, 30 Mar 2020 08:59:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0BEC9208E0 for ; Mon, 30 Mar 2020 08:59:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729788AbgC3I72 (ORCPT ); Mon, 30 Mar 2020 04:59:28 -0400 Received: from mail.loongson.cn ([114.242.206.163]:33374 "EHLO loongson.cn" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728759AbgC3I72 (ORCPT ); Mon, 30 Mar 2020 04:59:28 -0400 Received: from kvm-dev1.localdomain (unknown [10.2.5.134]) by mail.loongson.cn (Coremail) with SMTP id AQAAf9Dx397stIFeJZkhAA--.28S2; Mon, 30 Mar 2020 16:59:24 +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 20/39] MIPS: ip32: Add header file path prefix Date: Mon, 30 Mar 2020 04:59:24 -0400 Message-Id: <1585558764-18492-1-git-send-email-maobibo@loongson.cn> X-Mailer: git-send-email 1.8.3.1 X-CM-TRANSID: AQAAf9Dx397stIFeJZkhAA--.28S2 X-Coremail-Antispam: 1UD129KBjvJXoW3GFy8CF4DXrWfJr43XF1rXrb_yoW7uw1fpa 1DC3Z5GF4rurWjywn8ZFy7Wr43Ja1DWrWjvryYg347Z3WSq3WUJrZ5Jr98Ar97AF4Dta10 gFWfWF1DJF4kuw7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUk2b7Iv0xC_KF4lb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rw A2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Xr0_Ar1l84ACjcxK6xII jxv20xvEc7CjxVAFwI0_Cr0_Gr1UM28EF7xvwVC2z280aVAFwI0_Gr1j6F4UJwA2z4x0Y4 vEx4A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xv F2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jw0_WrylYx0Ex4A2jsIE14v26F4j6r 4UJwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lc2xSY4AK6svPMxAIw28I cxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2 IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAVWUtwCIc40Y0x0EwIxGrwCI 42IY6xIIjxv20xvE14v26r1I6r4UMIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8JVWxJwCI42 IY6xAIw20EY4v20xvaj40_JFI_Gr1lIxAIcVC2z280aVAFwI0_Cr0_Gr1UMIIF0xvEx4A2 jsIEc7CjxVAFwI0_Gr1j6F4UJbIYCTnIWIevJa73UjIFyTuYvjxU2xhLUUUUU 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-ip32 to arch/mips/sgi-ip32/include/mach Signed-off-by: bibo mao --- arch/mips/Kconfig | 1 + arch/mips/sgi-ip32/Platform | 2 +- .../asm/mach-ip32 => sgi-ip32/include/mach}/cpu-feature-overrides.h | 0 arch/mips/sgi-ip32/include/mach/ioremap.h | 2 ++ arch/mips/sgi-ip32/include/mach/irq.h | 2 ++ arch/mips/sgi-ip32/include/mach/kernel-entry-init.h | 2 ++ arch/mips/{include/asm/mach-ip32 => sgi-ip32/include/mach}/kmalloc.h | 0 .../mips/{include/asm/mach-ip32 => sgi-ip32/include/mach}/mangle-port.h | 0 arch/mips/sgi-ip32/include/mach/mc146818rtc.h | 2 ++ arch/mips/sgi-ip32/include/mach/spaces.h | 2 ++ arch/mips/sgi-ip32/include/mach/topology.h | 2 ++ arch/mips/{include/asm/mach-ip32 => sgi-ip32/include/mach}/war.h | 0 12 files changed, 14 insertions(+), 1 deletion(-) rename arch/mips/{include/asm/mach-ip32 => sgi-ip32/include/mach}/cpu-feature-overrides.h (100%) create mode 100644 arch/mips/sgi-ip32/include/mach/ioremap.h create mode 100644 arch/mips/sgi-ip32/include/mach/irq.h create mode 100644 arch/mips/sgi-ip32/include/mach/kernel-entry-init.h rename arch/mips/{include/asm/mach-ip32 => sgi-ip32/include/mach}/kmalloc.h (100%) rename arch/mips/{include/asm/mach-ip32 => sgi-ip32/include/mach}/mangle-port.h (100%) create mode 100644 arch/mips/sgi-ip32/include/mach/mc146818rtc.h create mode 100644 arch/mips/sgi-ip32/include/mach/spaces.h create mode 100644 arch/mips/sgi-ip32/include/mach/topology.h rename arch/mips/{include/asm/mach-ip32 => sgi-ip32/include/mach}/war.h (100%) diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 6a6cf8c..af3dddf 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -824,6 +824,7 @@ config SGI_IP32 select SYS_HAS_CPU_NEVADA select SYS_SUPPORTS_64BIT_KERNEL select SYS_SUPPORTS_BIG_ENDIAN + select HAVE_MACH_HEAD_FILES help If you want this kernel to run on SGI O2 workstation, say Y here. diff --git a/arch/mips/sgi-ip32/Platform b/arch/mips/sgi-ip32/Platform index 0fea556..e377e75 100644 --- a/arch/mips/sgi-ip32/Platform +++ b/arch/mips/sgi-ip32/Platform @@ -7,5 +7,5 @@ # will break. # platform-$(CONFIG_SGI_IP32) += sgi-ip32/ -cflags-$(CONFIG_SGI_IP32) += -I$(srctree)/arch/mips/include/asm/mach-ip32 +cflags-$(CONFIG_SGI_IP32) += -I$(srctree)/arch/mips/sgi-ip32/include load-$(CONFIG_SGI_IP32) += 0xffffffff80004000 diff --git a/arch/mips/include/asm/mach-ip32/cpu-feature-overrides.h b/arch/mips/sgi-ip32/include/mach/cpu-feature-overrides.h similarity index 100% rename from arch/mips/include/asm/mach-ip32/cpu-feature-overrides.h rename to arch/mips/sgi-ip32/include/mach/cpu-feature-overrides.h diff --git a/arch/mips/sgi-ip32/include/mach/ioremap.h b/arch/mips/sgi-ip32/include/mach/ioremap.h new file mode 100644 index 0000000..2369393 --- /dev/null +++ b/arch/mips/sgi-ip32/include/mach/ioremap.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/sgi-ip32/include/mach/irq.h b/arch/mips/sgi-ip32/include/mach/irq.h new file mode 100644 index 0000000..bb5ccce --- /dev/null +++ b/arch/mips/sgi-ip32/include/mach/irq.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/sgi-ip32/include/mach/kernel-entry-init.h b/arch/mips/sgi-ip32/include/mach/kernel-entry-init.h new file mode 100644 index 0000000..19b872be --- /dev/null +++ b/arch/mips/sgi-ip32/include/mach/kernel-entry-init.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-ip32/kmalloc.h b/arch/mips/sgi-ip32/include/mach/kmalloc.h similarity index 100% rename from arch/mips/include/asm/mach-ip32/kmalloc.h rename to arch/mips/sgi-ip32/include/mach/kmalloc.h diff --git a/arch/mips/include/asm/mach-ip32/mangle-port.h b/arch/mips/sgi-ip32/include/mach/mangle-port.h similarity index 100% rename from arch/mips/include/asm/mach-ip32/mangle-port.h rename to arch/mips/sgi-ip32/include/mach/mangle-port.h diff --git a/arch/mips/sgi-ip32/include/mach/mc146818rtc.h b/arch/mips/sgi-ip32/include/mach/mc146818rtc.h new file mode 100644 index 0000000..7284af8 --- /dev/null +++ b/arch/mips/sgi-ip32/include/mach/mc146818rtc.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/sgi-ip32/include/mach/spaces.h b/arch/mips/sgi-ip32/include/mach/spaces.h new file mode 100644 index 0000000..39a4d72 --- /dev/null +++ b/arch/mips/sgi-ip32/include/mach/spaces.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/sgi-ip32/include/mach/topology.h b/arch/mips/sgi-ip32/include/mach/topology.h new file mode 100644 index 0000000..86e585b --- /dev/null +++ b/arch/mips/sgi-ip32/include/mach/topology.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-ip32/war.h b/arch/mips/sgi-ip32/include/mach/war.h similarity index 100% rename from arch/mips/include/asm/mach-ip32/war.h rename to arch/mips/sgi-ip32/include/mach/war.h From patchwork Mon Mar 30 08:59:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bibo Mao X-Patchwork-Id: 11464977 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 CC98317EA for ; Mon, 30 Mar 2020 08:59:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A4DA120757 for ; Mon, 30 Mar 2020 08:59:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729794AbgC3I7g (ORCPT ); Mon, 30 Mar 2020 04:59:36 -0400 Received: from mail.loongson.cn ([114.242.206.163]:33408 "EHLO loongson.cn" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729543AbgC3I7g (ORCPT ); Mon, 30 Mar 2020 04:59:36 -0400 Received: from kvm-dev1.localdomain (unknown [10.2.5.134]) by mail.loongson.cn (Coremail) with SMTP id AQAAf9Dxn9zytIFeKZkhAA--.35S2; Mon, 30 Mar 2020 16:59:30 +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 21/39] MIPS: jazz: Add header file path prefix Date: Mon, 30 Mar 2020 04:59:30 -0400 Message-Id: <1585558770-21032-1-git-send-email-maobibo@loongson.cn> X-Mailer: git-send-email 1.8.3.1 X-CM-TRANSID: AQAAf9Dxn9zytIFeKZkhAA--.35S2 X-Coremail-Antispam: 1UD129KBjvJXoW3Wr1xtr18KFWDJr4rJF1UZFb_yoWxJFyfpa 1DA3Z5GF4kuryUArn3uFy7tr43tan8GrZ093y5u34UZ3WSqFyUJrs3trZ0yr97Ja1DKa18 W39xWr15trsYvaUanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUkIb7Iv0xC_Kw4lb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rw A2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Xr0_Ar1l84ACjcxK6xII jxv20xvEc7CjxVAFwI0_Cr0_Gr1UM28EF7xvwVC2z280aVAFwI0_Gr1j6F4UJwA2z4x0Y4 vEx4A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xv F2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jw0_WrylYx0Ex4A2jsIE14v26F4j6r 4UJwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lc2xSY4AK6svPMxAIw28I cxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2 IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAVWUtwCIc40Y0x0EwIxGrwCI 42IY6xIIjxv20xvE14v26r4j6ryUMIIF0xvE2Ix0cI8IcVCY1x0267AKxVWxJVW8Jr1lIx AIcVCF04k26cxKx2IYs7xG6r1I6r4UMIIF0xvEx4A2jsIE14v26F4j6r4UJwCI42IY6I8E 87Iv6xkF7I0E14v26r4UJVWxJrUvcSsGvfC2KfnxnUUI43ZEXa7IU56wZ3UUUUU== 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-jazz to arch/mips/jazz/include/mach Signed-off-by: bibo mao --- arch/mips/Kconfig | 1 + arch/mips/jazz/Platform | 2 +- arch/mips/jazz/include/mach/cpu-feature-overrides.h | 2 ++ arch/mips/{include/asm/mach-jazz => jazz/include/mach}/floppy.h | 0 arch/mips/jazz/include/mach/ioremap.h | 2 ++ arch/mips/jazz/include/mach/irq.h | 2 ++ arch/mips/jazz/include/mach/kernel-entry-init.h | 2 ++ arch/mips/jazz/include/mach/kmalloc.h | 2 ++ arch/mips/jazz/include/mach/mangle-port.h | 2 ++ arch/mips/{include/asm/mach-jazz => jazz/include/mach}/mc146818rtc.h | 0 arch/mips/jazz/include/mach/spaces.h | 2 ++ arch/mips/jazz/include/mach/topology.h | 2 ++ arch/mips/jazz/include/mach/war.h | 2 ++ 13 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 arch/mips/jazz/include/mach/cpu-feature-overrides.h rename arch/mips/{include/asm/mach-jazz => jazz/include/mach}/floppy.h (100%) create mode 100644 arch/mips/jazz/include/mach/ioremap.h create mode 100644 arch/mips/jazz/include/mach/irq.h create mode 100644 arch/mips/jazz/include/mach/kernel-entry-init.h create mode 100644 arch/mips/jazz/include/mach/kmalloc.h create mode 100644 arch/mips/jazz/include/mach/mangle-port.h rename arch/mips/{include/asm/mach-jazz => jazz/include/mach}/mc146818rtc.h (100%) create mode 100644 arch/mips/jazz/include/mach/spaces.h create mode 100644 arch/mips/jazz/include/mach/topology.h create mode 100644 arch/mips/jazz/include/mach/war.h diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index af3dddf..9a8ff2d 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -391,6 +391,7 @@ config MACH_JAZZ select SYS_SUPPORTS_32BIT_KERNEL select SYS_SUPPORTS_64BIT_KERNEL select SYS_SUPPORTS_100HZ + select HAVE_MACH_HEAD_FILES help This a family of machines based on the MIPS R4030 chipset which was used by several vendors to build RISC/os and Windows NT workstations. diff --git a/arch/mips/jazz/Platform b/arch/mips/jazz/Platform index 3373788..7c35bac 100644 --- a/arch/mips/jazz/Platform +++ b/arch/mips/jazz/Platform @@ -2,5 +2,5 @@ # Acer PICA 61, Mips Magnum 4000 and Olivetti M700. # platform-$(CONFIG_MACH_JAZZ) += jazz/ -cflags-$(CONFIG_MACH_JAZZ) += -I$(srctree)/arch/mips/include/asm/mach-jazz +cflags-$(CONFIG_MACH_JAZZ) += -I$(srctree)/arch/mips/jazz/include load-$(CONFIG_MACH_JAZZ) += 0xffffffff80080000 diff --git a/arch/mips/jazz/include/mach/cpu-feature-overrides.h b/arch/mips/jazz/include/mach/cpu-feature-overrides.h new file mode 100644 index 0000000..f3e0e12 --- /dev/null +++ b/arch/mips/jazz/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-jazz/floppy.h b/arch/mips/jazz/include/mach/floppy.h similarity index 100% rename from arch/mips/include/asm/mach-jazz/floppy.h rename to arch/mips/jazz/include/mach/floppy.h diff --git a/arch/mips/jazz/include/mach/ioremap.h b/arch/mips/jazz/include/mach/ioremap.h new file mode 100644 index 0000000..2369393 --- /dev/null +++ b/arch/mips/jazz/include/mach/ioremap.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/jazz/include/mach/irq.h b/arch/mips/jazz/include/mach/irq.h new file mode 100644 index 0000000..bb5ccce --- /dev/null +++ b/arch/mips/jazz/include/mach/irq.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/jazz/include/mach/kernel-entry-init.h b/arch/mips/jazz/include/mach/kernel-entry-init.h new file mode 100644 index 0000000..19b872be --- /dev/null +++ b/arch/mips/jazz/include/mach/kernel-entry-init.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/jazz/include/mach/kmalloc.h b/arch/mips/jazz/include/mach/kmalloc.h new file mode 100644 index 0000000..4f056db --- /dev/null +++ b/arch/mips/jazz/include/mach/kmalloc.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/jazz/include/mach/mangle-port.h b/arch/mips/jazz/include/mach/mangle-port.h new file mode 100644 index 0000000..b9736e3 --- /dev/null +++ b/arch/mips/jazz/include/mach/mangle-port.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-jazz/mc146818rtc.h b/arch/mips/jazz/include/mach/mc146818rtc.h similarity index 100% rename from arch/mips/include/asm/mach-jazz/mc146818rtc.h rename to arch/mips/jazz/include/mach/mc146818rtc.h diff --git a/arch/mips/jazz/include/mach/spaces.h b/arch/mips/jazz/include/mach/spaces.h new file mode 100644 index 0000000..39a4d72 --- /dev/null +++ b/arch/mips/jazz/include/mach/spaces.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/jazz/include/mach/topology.h b/arch/mips/jazz/include/mach/topology.h new file mode 100644 index 0000000..86e585b --- /dev/null +++ b/arch/mips/jazz/include/mach/topology.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/jazz/include/mach/war.h b/arch/mips/jazz/include/mach/war.h new file mode 100644 index 0000000..5b0422a --- /dev/null +++ b/arch/mips/jazz/include/mach/war.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include From patchwork Mon Mar 30 08:59:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bibo Mao X-Patchwork-Id: 11464979 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 67CEF1805 for ; Mon, 30 Mar 2020 08:59:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 45FC220748 for ; Mon, 30 Mar 2020 08:59:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728759AbgC3I7m (ORCPT ); Mon, 30 Mar 2020 04:59:42 -0400 Received: from mail.loongson.cn ([114.242.206.163]:33456 "EHLO loongson.cn" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729543AbgC3I7m (ORCPT ); Mon, 30 Mar 2020 04:59:42 -0400 Received: from kvm-dev1.localdomain (unknown [10.2.5.134]) by mail.loongson.cn (Coremail) with SMTP id AQAAf9DxH2n4tIFeL5khAA--.20S2; Mon, 30 Mar 2020 16:59:36 +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 22/39] MIPS: jz4740: Add header file path prefix Date: Mon, 30 Mar 2020 04:59:36 -0400 Message-Id: <1585558776-21953-1-git-send-email-maobibo@loongson.cn> X-Mailer: git-send-email 1.8.3.1 X-CM-TRANSID: AQAAf9DxH2n4tIFeL5khAA--.20S2 X-Coremail-Antispam: 1UD129KBjvJXoWxKF4DGryruF4kKF1fXF43Wrg_yoW3trWxpa nrZ3Z5WF48ury8AFWxZFy7tF45Jws0grZ0kFW5uw1UZ3WagF1UXrs5tr98Ar97JF4Dta4I ga9IqF15Jrs5uw7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUkIb7Iv0xC_Kw4lb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rw A2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Xr0_Ar1l84ACjcxK6xII jxv20xvEc7CjxVAFwI0_Cr0_Gr1UM28EF7xvwVC2z280aVAFwI0_Gr1j6F4UJwA2z4x0Y4 vEx4A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xv F2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jw0_WrylYx0Ex4A2jsIE14v26F4j6r 4UJwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lc2xSY4AK6svPMxAIw28I cxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2 IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAVWUtwCIc40Y0x0EwIxGrwCI 42IY6xIIjxv20xvE14v26r4j6ryUMIIF0xvE2Ix0cI8IcVCY1x0267AKxVWxJVW8Jr1lIx AIcVCF04k26cxKx2IYs7xG6r1I6r4UMIIF0xvEx4A2jsIE14v26F4j6r4UJwCI42IY6I8E 87Iv6xkF7I0E14v26r4UJVWxJrUvcSsGvfC2KfnxnUUI43ZEXa7IU56wZ3UUUUU== 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-jz4740 to arch/mips/jz4740/include/mach Signed-off-by: bibo mao --- arch/mips/Kconfig | 1 + arch/mips/jz4740/Platform | 2 +- arch/mips/{include/asm/mach-jz4740 => jz4740/include/mach}/base.h | 0 .../asm/mach-jz4740 => jz4740/include/mach}/cpu-feature-overrides.h | 0 arch/mips/{include/asm/mach-jz4740 => jz4740/include/mach}/dma.h | 0 arch/mips/jz4740/include/mach/ioremap.h | 2 ++ arch/mips/{include/asm/mach-jz4740 => jz4740/include/mach}/irq.h | 0 arch/mips/jz4740/include/mach/kernel-entry-init.h | 2 ++ arch/mips/jz4740/include/mach/kmalloc.h | 2 ++ arch/mips/jz4740/include/mach/mangle-port.h | 2 ++ arch/mips/jz4740/include/mach/mc146818rtc.h | 2 ++ arch/mips/jz4740/include/mach/spaces.h | 2 ++ arch/mips/{include/asm/mach-jz4740 => jz4740/include/mach}/timer.h | 0 arch/mips/jz4740/include/mach/topology.h | 2 ++ arch/mips/jz4740/include/mach/war.h | 2 ++ arch/mips/jz4740/time.c | 2 +- arch/mips/jz4740/timer.c | 4 ++-- drivers/pwm/pwm-jz4740.c | 2 +- 18 files changed, 22 insertions(+), 5 deletions(-) rename arch/mips/{include/asm/mach-jz4740 => jz4740/include/mach}/base.h (100%) rename arch/mips/{include/asm/mach-jz4740 => jz4740/include/mach}/cpu-feature-overrides.h (100%) rename arch/mips/{include/asm/mach-jz4740 => jz4740/include/mach}/dma.h (100%) create mode 100644 arch/mips/jz4740/include/mach/ioremap.h rename arch/mips/{include/asm/mach-jz4740 => jz4740/include/mach}/irq.h (100%) create mode 100644 arch/mips/jz4740/include/mach/kernel-entry-init.h create mode 100644 arch/mips/jz4740/include/mach/kmalloc.h create mode 100644 arch/mips/jz4740/include/mach/mangle-port.h create mode 100644 arch/mips/jz4740/include/mach/mc146818rtc.h create mode 100644 arch/mips/jz4740/include/mach/spaces.h rename arch/mips/{include/asm/mach-jz4740 => jz4740/include/mach}/timer.h (100%) create mode 100644 arch/mips/jz4740/include/mach/topology.h create mode 100644 arch/mips/jz4740/include/mach/war.h diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 9a8ff2d..6a6d2e2 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -412,6 +412,7 @@ config MACH_INGENIC select GENERIC_IRQ_CHIP select BUILTIN_DTB if MIPS_NO_APPENDED_DTB select USE_OF + select HAVE_MACH_HEAD_FILES config LANTIQ bool "Lantiq based platforms" diff --git a/arch/mips/jz4740/Platform b/arch/mips/jz4740/Platform index a2a5a85..937b7fa 100644 --- a/arch/mips/jz4740/Platform +++ b/arch/mips/jz4740/Platform @@ -1,4 +1,4 @@ platform-$(CONFIG_MACH_INGENIC) += jz4740/ -cflags-$(CONFIG_MACH_INGENIC) += -I$(srctree)/arch/mips/include/asm/mach-jz4740 +cflags-$(CONFIG_MACH_INGENIC) += -I$(srctree)/arch/mips/jz4740/include load-$(CONFIG_MACH_INGENIC) += 0xffffffff80010000 zload-$(CONFIG_MACH_INGENIC) += 0xffffffff81000000 diff --git a/arch/mips/include/asm/mach-jz4740/base.h b/arch/mips/jz4740/include/mach/base.h similarity index 100% rename from arch/mips/include/asm/mach-jz4740/base.h rename to arch/mips/jz4740/include/mach/base.h diff --git a/arch/mips/include/asm/mach-jz4740/cpu-feature-overrides.h b/arch/mips/jz4740/include/mach/cpu-feature-overrides.h similarity index 100% rename from arch/mips/include/asm/mach-jz4740/cpu-feature-overrides.h rename to arch/mips/jz4740/include/mach/cpu-feature-overrides.h diff --git a/arch/mips/include/asm/mach-jz4740/dma.h b/arch/mips/jz4740/include/mach/dma.h similarity index 100% rename from arch/mips/include/asm/mach-jz4740/dma.h rename to arch/mips/jz4740/include/mach/dma.h diff --git a/arch/mips/jz4740/include/mach/ioremap.h b/arch/mips/jz4740/include/mach/ioremap.h new file mode 100644 index 0000000..2369393 --- /dev/null +++ b/arch/mips/jz4740/include/mach/ioremap.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-jz4740/irq.h b/arch/mips/jz4740/include/mach/irq.h similarity index 100% rename from arch/mips/include/asm/mach-jz4740/irq.h rename to arch/mips/jz4740/include/mach/irq.h diff --git a/arch/mips/jz4740/include/mach/kernel-entry-init.h b/arch/mips/jz4740/include/mach/kernel-entry-init.h new file mode 100644 index 0000000..19b872be --- /dev/null +++ b/arch/mips/jz4740/include/mach/kernel-entry-init.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/jz4740/include/mach/kmalloc.h b/arch/mips/jz4740/include/mach/kmalloc.h new file mode 100644 index 0000000..4f056db --- /dev/null +++ b/arch/mips/jz4740/include/mach/kmalloc.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/jz4740/include/mach/mangle-port.h b/arch/mips/jz4740/include/mach/mangle-port.h new file mode 100644 index 0000000..b9736e3 --- /dev/null +++ b/arch/mips/jz4740/include/mach/mangle-port.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/jz4740/include/mach/mc146818rtc.h b/arch/mips/jz4740/include/mach/mc146818rtc.h new file mode 100644 index 0000000..7284af8 --- /dev/null +++ b/arch/mips/jz4740/include/mach/mc146818rtc.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/jz4740/include/mach/spaces.h b/arch/mips/jz4740/include/mach/spaces.h new file mode 100644 index 0000000..39a4d72 --- /dev/null +++ b/arch/mips/jz4740/include/mach/spaces.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-jz4740/timer.h b/arch/mips/jz4740/include/mach/timer.h similarity index 100% rename from arch/mips/include/asm/mach-jz4740/timer.h rename to arch/mips/jz4740/include/mach/timer.h diff --git a/arch/mips/jz4740/include/mach/topology.h b/arch/mips/jz4740/include/mach/topology.h new file mode 100644 index 0000000..86e585b --- /dev/null +++ b/arch/mips/jz4740/include/mach/topology.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/jz4740/include/mach/war.h b/arch/mips/jz4740/include/mach/war.h new file mode 100644 index 0000000..5b0422a --- /dev/null +++ b/arch/mips/jz4740/include/mach/war.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/jz4740/time.c b/arch/mips/jz4740/time.c index 605a84a..64a5a19 100644 --- a/arch/mips/jz4740/time.c +++ b/arch/mips/jz4740/time.c @@ -7,7 +7,7 @@ #include #include -#include +#include void __init plat_time_init(void) { diff --git a/arch/mips/jz4740/timer.c b/arch/mips/jz4740/timer.c index 5c9f82d..a473d49 100644 --- a/arch/mips/jz4740/timer.c +++ b/arch/mips/jz4740/timer.c @@ -9,8 +9,8 @@ #include #include -#include -#include +#include +#include void __iomem *jz4740_timer_base; EXPORT_SYMBOL_GPL(jz4740_timer_base); diff --git a/drivers/pwm/pwm-jz4740.c b/drivers/pwm/pwm-jz4740.c index 9d78cc2..bb9d266 100644 --- a/drivers/pwm/pwm-jz4740.c +++ b/drivers/pwm/pwm-jz4740.c @@ -18,7 +18,7 @@ #include #include -#include +#include #define NUM_PWM 8 From patchwork Mon Mar 30 08:59:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bibo Mao X-Patchwork-Id: 11464981 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 4733D159A for ; Mon, 30 Mar 2020 08:59:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 046BA206CC for ; Mon, 30 Mar 2020 08:59:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729731AbgC3I7s (ORCPT ); Mon, 30 Mar 2020 04:59:48 -0400 Received: from mail.loongson.cn ([114.242.206.163]:33488 "EHLO loongson.cn" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729897AbgC3I7s (ORCPT ); Mon, 30 Mar 2020 04:59:48 -0400 Received: from kvm-dev1.localdomain (unknown [10.2.5.134]) by mail.loongson.cn (Coremail) with SMTP id AQAAf9DxL2j+tIFeN5khAA--.15S2; Mon, 30 Mar 2020 16:59:42 +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 23/39] MIPS: lantiq: Add header file path prefix Date: Mon, 30 Mar 2020 04:59:42 -0400 Message-Id: <1585558782-24357-1-git-send-email-maobibo@loongson.cn> X-Mailer: git-send-email 1.8.3.1 X-CM-TRANSID: AQAAf9DxL2j+tIFeN5khAA--.15S2 X-Coremail-Antispam: 1UD129KBjvAXoWftw13tw4rZFykXry5XFWkZwb_yoW5WF4UXo WxtF17Wr1vqFW7JF13WFW7Ca4xZwn2qrs5Xa4aq39rtF97A39Fyr1v9w1jyF15CryxtwsF k3y5Z34rXr95KFykn29KB7ZKAUJUUUU8529EdanIXcx71UUUUU7v73VFW2AGmfu7bjvjm3 AaLaJ3UjIYCTnIWjp_UUUY07k0a2IF6w4kM7kC6x804xWl14x267AKxVWUJVW8JwAFc2x0 x2IEx4CE42xK8VAvwI8IcIk0rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2ocxC64kIII0Yj4 1l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26ryj6F1UM28EF7xvwVC0 I7IYx2IY6xkF7I0E14v26F4j6r4UJwA2z4x0Y4vEx4A2jsIE14v26r4UJVWxJr1l84ACjc xK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVAC Y4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1q6rW5McIj6I8E87Iv67AKxVWxJV W8Jr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JMxkIecxEwVCm-wCF04k2 0xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI 8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2Ij64vIr41l IxAIcVC0I7IYx2IY67AKxVW8JVW5JwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Cr0_Gr1UMI IF0xvE42xK8VAvwI8IcIk0rVWUCVW8JwCI42IY6I8E87Iv67AKxVWxJVW8Jr1lIxAIcVC2 z280aVCY1x0267AKxVW8Jr0_Cr1UYxBIdaVFxhVjvjDU0xZFpf9x07beWl9UUUUU= X-CM-SenderInfo: xpdruxter6z05rqj20fqof0/ Sender: linux-mips-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org For lantiq falcon platform, remove header files from directory arch/mips/include/asm/mach-lantiq/falcon to arch/mips/lantiq/falcon/include/mach For lantiq xway platform, remove header files from directory arch/mips/include/asm/mach-lantiq/xway to arch/mips/lantiq/xway/include/mach Signed-off-by: bibo mao --- arch/mips/Kconfig | 1 + arch/mips/lantiq/Platform | 5 ++--- arch/mips/lantiq/clk.c | 2 +- arch/mips/lantiq/early_printk.c | 2 +- .../falcon => lantiq/falcon/include/mach}/cpu-feature-overrides.h | 0 .../mach-lantiq/falcon => lantiq/falcon/include/mach}/falcon_irq.h | 0 arch/mips/lantiq/falcon/include/mach/ioremap.h | 2 ++ .../asm/mach-lantiq/falcon => lantiq/falcon/include/mach}/irq.h | 0 arch/mips/lantiq/falcon/include/mach/kernel-entry-init.h | 2 ++ arch/mips/lantiq/falcon/include/mach/kmalloc.h | 2 ++ .../asm/mach-lantiq => lantiq/falcon/include/mach}/lantiq.h | 0 .../mach-lantiq => lantiq/falcon/include/mach}/lantiq_platform.h | 0 .../mach-lantiq/falcon => lantiq/falcon/include/mach}/lantiq_soc.h | 0 arch/mips/lantiq/falcon/include/mach/mangle-port.h | 2 ++ arch/mips/lantiq/falcon/include/mach/mc146818rtc.h | 2 ++ arch/mips/lantiq/falcon/include/mach/spaces.h | 2 ++ arch/mips/lantiq/falcon/include/mach/topology.h | 2 ++ arch/mips/lantiq/falcon/include/mach/war.h | 2 ++ arch/mips/lantiq/falcon/prom.c | 2 +- arch/mips/lantiq/falcon/reset.c | 2 +- arch/mips/lantiq/falcon/sysctrl.c | 2 +- arch/mips/lantiq/irq.c | 4 ++-- arch/mips/lantiq/prom.c | 2 +- arch/mips/lantiq/xway/clk.c | 2 +- arch/mips/lantiq/xway/dcdc.c | 2 +- arch/mips/lantiq/xway/dma.c | 4 ++-- arch/mips/lantiq/xway/gptu.c | 2 +- arch/mips/lantiq/xway/include/mach/cpu-feature-overrides.h | 2 ++ arch/mips/lantiq/xway/include/mach/ioremap.h | 2 ++ .../asm/mach-lantiq/xway => lantiq/xway/include/mach}/irq.h | 2 +- arch/mips/lantiq/xway/include/mach/kernel-entry-init.h | 2 ++ arch/mips/lantiq/xway/include/mach/kmalloc.h | 2 ++ .../{include/asm/mach-lantiq => lantiq/xway/include/mach}/lantiq.h | 0 .../asm/mach-lantiq/xway => lantiq/xway/include/mach}/lantiq_irq.h | 0 .../asm/mach-lantiq => lantiq/xway/include/mach}/lantiq_platform.h | 0 .../asm/mach-lantiq/xway => lantiq/xway/include/mach}/lantiq_soc.h | 2 +- arch/mips/lantiq/xway/include/mach/mangle-port.h | 2 ++ arch/mips/lantiq/xway/include/mach/mc146818rtc.h | 2 ++ arch/mips/lantiq/xway/include/mach/spaces.h | 2 ++ arch/mips/lantiq/xway/include/mach/topology.h | 2 ++ arch/mips/lantiq/xway/include/mach/war.h | 2 ++ .../asm/mach-lantiq/xway => lantiq/xway/include/mach}/xway_dma.h | 0 arch/mips/lantiq/xway/prom.c | 2 +- arch/mips/lantiq/xway/sysctrl.c | 2 +- arch/mips/lantiq/xway/vmmc.c | 2 +- arch/mips/pci/ops-lantiq.c | 2 +- arch/mips/pci/pci-lantiq.c | 4 ++-- drivers/gpio/gpio-mm-lantiq.c | 2 +- drivers/hwmon/ltq-cputemp.c | 2 +- drivers/mtd/maps/lantiq-flash.c | 2 +- drivers/mtd/nand/raw/xway_nand.c | 2 +- drivers/net/ethernet/lantiq_etop.c | 6 +++--- drivers/pinctrl/pinctrl-falcon.c | 2 +- drivers/pinctrl/pinctrl-xway.c | 2 +- drivers/soc/lantiq/fpi-bus.c | 2 +- drivers/spi/spi-falcon.c | 2 +- drivers/spi/spi-lantiq-ssc.c | 2 +- drivers/watchdog/lantiq_wdt.c | 2 +- include/linux/lantiq.h | 2 +- 59 files changed, 72 insertions(+), 38 deletions(-) rename arch/mips/{include/asm/mach-lantiq/falcon => lantiq/falcon/include/mach}/cpu-feature-overrides.h (100%) rename arch/mips/{include/asm/mach-lantiq/falcon => lantiq/falcon/include/mach}/falcon_irq.h (100%) create mode 100644 arch/mips/lantiq/falcon/include/mach/ioremap.h rename arch/mips/{include/asm/mach-lantiq/falcon => lantiq/falcon/include/mach}/irq.h (100%) create mode 100644 arch/mips/lantiq/falcon/include/mach/kernel-entry-init.h create mode 100644 arch/mips/lantiq/falcon/include/mach/kmalloc.h copy arch/mips/{include/asm/mach-lantiq => lantiq/falcon/include/mach}/lantiq.h (100%) copy arch/mips/{include/asm/mach-lantiq => lantiq/falcon/include/mach}/lantiq_platform.h (100%) rename arch/mips/{include/asm/mach-lantiq/falcon => lantiq/falcon/include/mach}/lantiq_soc.h (100%) create mode 100644 arch/mips/lantiq/falcon/include/mach/mangle-port.h create mode 100644 arch/mips/lantiq/falcon/include/mach/mc146818rtc.h create mode 100644 arch/mips/lantiq/falcon/include/mach/spaces.h create mode 100644 arch/mips/lantiq/falcon/include/mach/topology.h create mode 100644 arch/mips/lantiq/falcon/include/mach/war.h create mode 100644 arch/mips/lantiq/xway/include/mach/cpu-feature-overrides.h create mode 100644 arch/mips/lantiq/xway/include/mach/ioremap.h rename arch/mips/{include/asm/mach-lantiq/xway => lantiq/xway/include/mach}/irq.h (88%) create mode 100644 arch/mips/lantiq/xway/include/mach/kernel-entry-init.h create mode 100644 arch/mips/lantiq/xway/include/mach/kmalloc.h rename arch/mips/{include/asm/mach-lantiq => lantiq/xway/include/mach}/lantiq.h (100%) rename arch/mips/{include/asm/mach-lantiq/xway => lantiq/xway/include/mach}/lantiq_irq.h (100%) rename arch/mips/{include/asm/mach-lantiq => lantiq/xway/include/mach}/lantiq_platform.h (100%) rename arch/mips/{include/asm/mach-lantiq/xway => lantiq/xway/include/mach}/lantiq_soc.h (99%) create mode 100644 arch/mips/lantiq/xway/include/mach/mangle-port.h create mode 100644 arch/mips/lantiq/xway/include/mach/mc146818rtc.h create mode 100644 arch/mips/lantiq/xway/include/mach/spaces.h create mode 100644 arch/mips/lantiq/xway/include/mach/topology.h create mode 100644 arch/mips/lantiq/xway/include/mach/war.h rename arch/mips/{include/asm/mach-lantiq/xway => lantiq/xway/include/mach}/xway_dma.h (100%) diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 6a6d2e2..738863fc 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -437,6 +437,7 @@ config LANTIQ select PINCTRL_LANTIQ select ARCH_HAS_RESET_CONTROLLER select RESET_CONTROLLER + select HAVE_MACH_HEAD_FILES config LASAT bool "LASAT Networks platforms" diff --git a/arch/mips/lantiq/Platform b/arch/mips/lantiq/Platform index b3ec498..3434d85 100644 --- a/arch/mips/lantiq/Platform +++ b/arch/mips/lantiq/Platform @@ -3,7 +3,6 @@ # platform-$(CONFIG_LANTIQ) += lantiq/ -cflags-$(CONFIG_LANTIQ) += -I$(srctree)/arch/mips/include/asm/mach-lantiq load-$(CONFIG_LANTIQ) = 0xffffffff80002000 -cflags-$(CONFIG_SOC_TYPE_XWAY) += -I$(srctree)/arch/mips/include/asm/mach-lantiq/xway -cflags-$(CONFIG_SOC_FALCON) += -I$(srctree)/arch/mips/include/asm/mach-lantiq/falcon +cflags-$(CONFIG_SOC_TYPE_XWAY) += -I$(srctree)/arch/mips/lantiq/xway/include +cflags-$(CONFIG_SOC_FALCON) += -I$(srctree)/arch/mips/lantiq/falcon/include diff --git a/arch/mips/lantiq/clk.c b/arch/mips/lantiq/clk.c index dd819e3..8c715fb 100644 --- a/arch/mips/lantiq/clk.c +++ b/arch/mips/lantiq/clk.c @@ -18,7 +18,7 @@ #include #include -#include +#include #include "clk.h" #include "prom.h" diff --git a/arch/mips/lantiq/early_printk.c b/arch/mips/lantiq/early_printk.c index 4e4a28b..94c8641 100644 --- a/arch/mips/lantiq/early_printk.c +++ b/arch/mips/lantiq/early_printk.c @@ -5,7 +5,7 @@ */ #include -#include +#include #include #define ASC_BUF 1024 diff --git a/arch/mips/include/asm/mach-lantiq/falcon/cpu-feature-overrides.h b/arch/mips/lantiq/falcon/include/mach/cpu-feature-overrides.h similarity index 100% rename from arch/mips/include/asm/mach-lantiq/falcon/cpu-feature-overrides.h rename to arch/mips/lantiq/falcon/include/mach/cpu-feature-overrides.h diff --git a/arch/mips/include/asm/mach-lantiq/falcon/falcon_irq.h b/arch/mips/lantiq/falcon/include/mach/falcon_irq.h similarity index 100% rename from arch/mips/include/asm/mach-lantiq/falcon/falcon_irq.h rename to arch/mips/lantiq/falcon/include/mach/falcon_irq.h diff --git a/arch/mips/lantiq/falcon/include/mach/ioremap.h b/arch/mips/lantiq/falcon/include/mach/ioremap.h new file mode 100644 index 0000000..2369393 --- /dev/null +++ b/arch/mips/lantiq/falcon/include/mach/ioremap.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-lantiq/falcon/irq.h b/arch/mips/lantiq/falcon/include/mach/irq.h similarity index 100% rename from arch/mips/include/asm/mach-lantiq/falcon/irq.h rename to arch/mips/lantiq/falcon/include/mach/irq.h diff --git a/arch/mips/lantiq/falcon/include/mach/kernel-entry-init.h b/arch/mips/lantiq/falcon/include/mach/kernel-entry-init.h new file mode 100644 index 0000000..19b872be --- /dev/null +++ b/arch/mips/lantiq/falcon/include/mach/kernel-entry-init.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/lantiq/falcon/include/mach/kmalloc.h b/arch/mips/lantiq/falcon/include/mach/kmalloc.h new file mode 100644 index 0000000..4f056db --- /dev/null +++ b/arch/mips/lantiq/falcon/include/mach/kmalloc.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-lantiq/lantiq.h b/arch/mips/lantiq/falcon/include/mach/lantiq.h similarity index 100% copy from arch/mips/include/asm/mach-lantiq/lantiq.h copy to arch/mips/lantiq/falcon/include/mach/lantiq.h diff --git a/arch/mips/include/asm/mach-lantiq/lantiq_platform.h b/arch/mips/lantiq/falcon/include/mach/lantiq_platform.h similarity index 100% copy from arch/mips/include/asm/mach-lantiq/lantiq_platform.h copy to arch/mips/lantiq/falcon/include/mach/lantiq_platform.h diff --git a/arch/mips/include/asm/mach-lantiq/falcon/lantiq_soc.h b/arch/mips/lantiq/falcon/include/mach/lantiq_soc.h similarity index 100% rename from arch/mips/include/asm/mach-lantiq/falcon/lantiq_soc.h rename to arch/mips/lantiq/falcon/include/mach/lantiq_soc.h diff --git a/arch/mips/lantiq/falcon/include/mach/mangle-port.h b/arch/mips/lantiq/falcon/include/mach/mangle-port.h new file mode 100644 index 0000000..b9736e3 --- /dev/null +++ b/arch/mips/lantiq/falcon/include/mach/mangle-port.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/lantiq/falcon/include/mach/mc146818rtc.h b/arch/mips/lantiq/falcon/include/mach/mc146818rtc.h new file mode 100644 index 0000000..7284af8 --- /dev/null +++ b/arch/mips/lantiq/falcon/include/mach/mc146818rtc.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/lantiq/falcon/include/mach/spaces.h b/arch/mips/lantiq/falcon/include/mach/spaces.h new file mode 100644 index 0000000..39a4d72 --- /dev/null +++ b/arch/mips/lantiq/falcon/include/mach/spaces.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/lantiq/falcon/include/mach/topology.h b/arch/mips/lantiq/falcon/include/mach/topology.h new file mode 100644 index 0000000..86e585b --- /dev/null +++ b/arch/mips/lantiq/falcon/include/mach/topology.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/lantiq/falcon/include/mach/war.h b/arch/mips/lantiq/falcon/include/mach/war.h new file mode 100644 index 0000000..5b0422a --- /dev/null +++ b/arch/mips/lantiq/falcon/include/mach/war.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/lantiq/falcon/prom.c b/arch/mips/lantiq/falcon/prom.c index 7b98def..7df6fd4 100644 --- a/arch/mips/lantiq/falcon/prom.c +++ b/arch/mips/lantiq/falcon/prom.c @@ -10,7 +10,7 @@ #include #include -#include +#include #include "../prom.h" diff --git a/arch/mips/lantiq/falcon/reset.c b/arch/mips/lantiq/falcon/reset.c index 261996c..e9a3048 100644 --- a/arch/mips/lantiq/falcon/reset.c +++ b/arch/mips/lantiq/falcon/reset.c @@ -11,7 +11,7 @@ #include #include -#include +#include /* * Dummy implementation. Used to allow platform code to find out what diff --git a/arch/mips/lantiq/falcon/sysctrl.c b/arch/mips/lantiq/falcon/sysctrl.c index 42222f8..0c6e1c1 100644 --- a/arch/mips/lantiq/falcon/sysctrl.c +++ b/arch/mips/lantiq/falcon/sysctrl.c @@ -11,7 +11,7 @@ #include #include -#include +#include #include "../clk.h" diff --git a/arch/mips/lantiq/irq.c b/arch/mips/lantiq/irq.c index df8eed3..934d773 100644 --- a/arch/mips/lantiq/irq.c +++ b/arch/mips/lantiq/irq.c @@ -16,8 +16,8 @@ #include #include -#include -#include +#include +#include /* register definitions - internal irqs */ #define LTQ_ICU_ISR 0x0000 diff --git a/arch/mips/lantiq/prom.c b/arch/mips/lantiq/prom.c index 51a218f..e40e781 100644 --- a/arch/mips/lantiq/prom.c +++ b/arch/mips/lantiq/prom.c @@ -13,7 +13,7 @@ #include #include -#include +#include #include "prom.h" #include "clk.h" diff --git a/arch/mips/lantiq/xway/clk.c b/arch/mips/lantiq/xway/clk.c index 47ad214..b5f93e9 100644 --- a/arch/mips/lantiq/xway/clk.c +++ b/arch/mips/lantiq/xway/clk.c @@ -13,7 +13,7 @@ #include #include -#include +#include #include "../clk.h" diff --git a/arch/mips/lantiq/xway/dcdc.c b/arch/mips/lantiq/xway/dcdc.c index 4960bee..65b3d9b 100644 --- a/arch/mips/lantiq/xway/dcdc.c +++ b/arch/mips/lantiq/xway/dcdc.c @@ -8,7 +8,7 @@ #include #include -#include +#include /* Bias and regulator Setup Register */ #define DCDC_BIAS_VREG0 0xa diff --git a/arch/mips/lantiq/xway/dma.c b/arch/mips/lantiq/xway/dma.c index aeb1b98..1e66592 100644 --- a/arch/mips/lantiq/xway/dma.c +++ b/arch/mips/lantiq/xway/dma.c @@ -13,8 +13,8 @@ #include #include -#include -#include +#include +#include #define LTQ_DMA_ID 0x08 #define LTQ_DMA_CTRL 0x10 diff --git a/arch/mips/lantiq/xway/gptu.c b/arch/mips/lantiq/xway/gptu.c index 3d5683e..f57f6f3 100644 --- a/arch/mips/lantiq/xway/gptu.c +++ b/arch/mips/lantiq/xway/gptu.c @@ -11,7 +11,7 @@ #include #include -#include +#include #include "../clk.h" /* the magic ID byte of the core */ diff --git a/arch/mips/lantiq/xway/include/mach/cpu-feature-overrides.h b/arch/mips/lantiq/xway/include/mach/cpu-feature-overrides.h new file mode 100644 index 0000000..f3e0e12 --- /dev/null +++ b/arch/mips/lantiq/xway/include/mach/cpu-feature-overrides.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/lantiq/xway/include/mach/ioremap.h b/arch/mips/lantiq/xway/include/mach/ioremap.h new file mode 100644 index 0000000..2369393 --- /dev/null +++ b/arch/mips/lantiq/xway/include/mach/ioremap.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-lantiq/xway/irq.h b/arch/mips/lantiq/xway/include/mach/irq.h similarity index 88% rename from arch/mips/include/asm/mach-lantiq/xway/irq.h rename to arch/mips/lantiq/xway/include/mach/irq.h index 2980e77..6b1e6e4 100644 --- a/arch/mips/include/asm/mach-lantiq/xway/irq.h +++ b/arch/mips/lantiq/xway/include/mach/irq.h @@ -7,7 +7,7 @@ #ifndef __LANTIQ_IRQ_H #define __LANTIQ_IRQ_H -#include +#include #define NR_IRQS 256 diff --git a/arch/mips/lantiq/xway/include/mach/kernel-entry-init.h b/arch/mips/lantiq/xway/include/mach/kernel-entry-init.h new file mode 100644 index 0000000..19b872be --- /dev/null +++ b/arch/mips/lantiq/xway/include/mach/kernel-entry-init.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/lantiq/xway/include/mach/kmalloc.h b/arch/mips/lantiq/xway/include/mach/kmalloc.h new file mode 100644 index 0000000..4f056db --- /dev/null +++ b/arch/mips/lantiq/xway/include/mach/kmalloc.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-lantiq/lantiq.h b/arch/mips/lantiq/xway/include/mach/lantiq.h similarity index 100% rename from arch/mips/include/asm/mach-lantiq/lantiq.h rename to arch/mips/lantiq/xway/include/mach/lantiq.h diff --git a/arch/mips/include/asm/mach-lantiq/xway/lantiq_irq.h b/arch/mips/lantiq/xway/include/mach/lantiq_irq.h similarity index 100% rename from arch/mips/include/asm/mach-lantiq/xway/lantiq_irq.h rename to arch/mips/lantiq/xway/include/mach/lantiq_irq.h diff --git a/arch/mips/include/asm/mach-lantiq/lantiq_platform.h b/arch/mips/lantiq/xway/include/mach/lantiq_platform.h similarity index 100% rename from arch/mips/include/asm/mach-lantiq/lantiq_platform.h rename to arch/mips/lantiq/xway/include/mach/lantiq_platform.h diff --git a/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h b/arch/mips/lantiq/xway/include/mach/lantiq_soc.h similarity index 99% rename from arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h rename to arch/mips/lantiq/xway/include/mach/lantiq_soc.h index 4790cfa..45ad252 100644 --- a/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h +++ b/arch/mips/lantiq/xway/include/mach/lantiq_soc.h @@ -9,7 +9,7 @@ #ifdef CONFIG_SOC_TYPE_XWAY -#include +#include /* Chip IDs */ #define SOC_ID_DANUBE1 0x129 diff --git a/arch/mips/lantiq/xway/include/mach/mangle-port.h b/arch/mips/lantiq/xway/include/mach/mangle-port.h new file mode 100644 index 0000000..b9736e3 --- /dev/null +++ b/arch/mips/lantiq/xway/include/mach/mangle-port.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/lantiq/xway/include/mach/mc146818rtc.h b/arch/mips/lantiq/xway/include/mach/mc146818rtc.h new file mode 100644 index 0000000..7284af8 --- /dev/null +++ b/arch/mips/lantiq/xway/include/mach/mc146818rtc.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/lantiq/xway/include/mach/spaces.h b/arch/mips/lantiq/xway/include/mach/spaces.h new file mode 100644 index 0000000..39a4d72 --- /dev/null +++ b/arch/mips/lantiq/xway/include/mach/spaces.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/lantiq/xway/include/mach/topology.h b/arch/mips/lantiq/xway/include/mach/topology.h new file mode 100644 index 0000000..86e585b --- /dev/null +++ b/arch/mips/lantiq/xway/include/mach/topology.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/lantiq/xway/include/mach/war.h b/arch/mips/lantiq/xway/include/mach/war.h new file mode 100644 index 0000000..5b0422a --- /dev/null +++ b/arch/mips/lantiq/xway/include/mach/war.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-lantiq/xway/xway_dma.h b/arch/mips/lantiq/xway/include/mach/xway_dma.h similarity index 100% rename from arch/mips/include/asm/mach-lantiq/xway/xway_dma.h rename to arch/mips/lantiq/xway/include/mach/xway_dma.h diff --git a/arch/mips/lantiq/xway/prom.c b/arch/mips/lantiq/xway/prom.c index 5446197..33166ae 100644 --- a/arch/mips/lantiq/xway/prom.c +++ b/arch/mips/lantiq/xway/prom.c @@ -10,7 +10,7 @@ #include #include -#include +#include #include "../prom.h" diff --git a/arch/mips/lantiq/xway/sysctrl.c b/arch/mips/lantiq/xway/sysctrl.c index aa37545..3aec430 100644 --- a/arch/mips/lantiq/xway/sysctrl.c +++ b/arch/mips/lantiq/xway/sysctrl.c @@ -13,7 +13,7 @@ #include #include -#include +#include #include "../clk.h" #include "../prom.h" diff --git a/arch/mips/lantiq/xway/vmmc.c b/arch/mips/lantiq/xway/vmmc.c index 7a14da8..9f64e0b 100644 --- a/arch/mips/lantiq/xway/vmmc.c +++ b/arch/mips/lantiq/xway/vmmc.c @@ -9,7 +9,7 @@ #include #include -#include +#include static unsigned int *cp1_base; diff --git a/arch/mips/pci/ops-lantiq.c b/arch/mips/pci/ops-lantiq.c index 7d71355..f695431 100644 --- a/arch/mips/pci/ops-lantiq.c +++ b/arch/mips/pci/ops-lantiq.c @@ -12,7 +12,7 @@ #include #include -#include +#include #include "pci-lantiq.h" diff --git a/arch/mips/pci/pci-lantiq.c b/arch/mips/pci/pci-lantiq.c index 1ca42f4..c1faecb 100644 --- a/arch/mips/pci/pci-lantiq.c +++ b/arch/mips/pci/pci-lantiq.c @@ -19,8 +19,8 @@ #include -#include -#include +#include +#include #include "pci-lantiq.h" diff --git a/drivers/gpio/gpio-mm-lantiq.c b/drivers/gpio/gpio-mm-lantiq.c index f460d71..4e153d3 100644 --- a/drivers/gpio/gpio-mm-lantiq.c +++ b/drivers/gpio/gpio-mm-lantiq.c @@ -15,7 +15,7 @@ #include #include -#include +#include /* * By attaching hardware latches to the EBU it is possible to create output diff --git a/drivers/hwmon/ltq-cputemp.c b/drivers/hwmon/ltq-cputemp.c index 019e770..327c5e1 100644 --- a/drivers/hwmon/ltq-cputemp.c +++ b/drivers/hwmon/ltq-cputemp.c @@ -12,7 +12,7 @@ #include #include -#include +#include /* gphy1 configuration register contains cpu temperature */ #define CGU_GPHY1_CR 0x0040 diff --git a/drivers/mtd/maps/lantiq-flash.c b/drivers/mtd/maps/lantiq-flash.c index 67a1dbf..9b0c3a5 100644 --- a/drivers/mtd/maps/lantiq-flash.c +++ b/drivers/mtd/maps/lantiq-flash.c @@ -19,7 +19,7 @@ #include #include -#include +#include /* * The NOR flash is connected to the same external bus unit (EBU) as PCI. diff --git a/drivers/mtd/nand/raw/xway_nand.c b/drivers/mtd/nand/raw/xway_nand.c index 834f794..5bdeea2 100644 --- a/drivers/mtd/nand/raw/xway_nand.c +++ b/drivers/mtd/nand/raw/xway_nand.c @@ -9,7 +9,7 @@ #include #include -#include +#include /* nand registers */ #define EBU_ADDSEL1 0x24 diff --git a/drivers/net/ethernet/lantiq_etop.c b/drivers/net/ethernet/lantiq_etop.c index 2d0c52f..bae1c1e 100644 --- a/drivers/net/ethernet/lantiq_etop.c +++ b/drivers/net/ethernet/lantiq_etop.c @@ -28,9 +28,9 @@ #include -#include -#include -#include +#include +#include +#include #define LTQ_ETOP_MDIO 0x11804 #define MDIO_REQUEST 0x80000000 diff --git a/drivers/pinctrl/pinctrl-falcon.c b/drivers/pinctrl/pinctrl-falcon.c index a454f57..f7e66b1 100644 --- a/drivers/pinctrl/pinctrl-falcon.c +++ b/drivers/pinctrl/pinctrl-falcon.c @@ -21,7 +21,7 @@ #include "pinctrl-lantiq.h" -#include +#include /* Multiplexer Control Register */ #define LTQ_PADC_MUX(x) (x * 0x4) diff --git a/drivers/pinctrl/pinctrl-xway.c b/drivers/pinctrl/pinctrl-xway.c index 5e3f31b..cb7f92e 100644 --- a/drivers/pinctrl/pinctrl-xway.c +++ b/drivers/pinctrl/pinctrl-xway.c @@ -20,7 +20,7 @@ #include "pinctrl-lantiq.h" -#include +#include /* we have up to 4 banks of 16 bit each */ #define PINS 16 diff --git a/drivers/soc/lantiq/fpi-bus.c b/drivers/soc/lantiq/fpi-bus.c index dff1375..1d3f3d7 100644 --- a/drivers/soc/lantiq/fpi-bus.c +++ b/drivers/soc/lantiq/fpi-bus.c @@ -16,7 +16,7 @@ #include #include -#include +#include #define XBAR_ALWAYS_LAST 0x430 #define XBAR_FPI_BURST_EN BIT(1) diff --git a/drivers/spi/spi-falcon.c b/drivers/spi/spi-falcon.c index d3336a6..572b01d 100644 --- a/drivers/spi/spi-falcon.c +++ b/drivers/spi/spi-falcon.c @@ -12,7 +12,7 @@ #include #include -#include +#include #define DRV_NAME "sflash-falcon" diff --git a/drivers/spi/spi-lantiq-ssc.c b/drivers/spi/spi-lantiq-ssc.c index 1fd7ee5..ad3c0b4 100644 --- a/drivers/spi/spi-lantiq-ssc.c +++ b/drivers/spi/spi-lantiq-ssc.c @@ -20,7 +20,7 @@ #include #ifdef CONFIG_LANTIQ -#include +#include #endif #define LTQ_SPI_RX_IRQ_NAME "spi_rx" diff --git a/drivers/watchdog/lantiq_wdt.c b/drivers/watchdog/lantiq_wdt.c index 6fab504..f9c1850 100644 --- a/drivers/watchdog/lantiq_wdt.c +++ b/drivers/watchdog/lantiq_wdt.c @@ -16,7 +16,7 @@ #include #include -#include +#include #define LTQ_XRX_RCU_RST_STAT 0x0014 #define LTQ_XRX_RCU_RST_STAT_WDT BIT(31) diff --git a/include/linux/lantiq.h b/include/linux/lantiq.h index 6792116..1a9103f 100644 --- a/include/linux/lantiq.h +++ b/include/linux/lantiq.h @@ -4,7 +4,7 @@ #define __LINUX_LANTIQ_H #ifdef CONFIG_LANTIQ -#include +#include #else #ifndef LTQ_EARLY_ASC From patchwork Mon Mar 30 08:59:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bibo Mao X-Patchwork-Id: 11464983 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 A39DA159A for ; Mon, 30 Mar 2020 08:59:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8141C206CC for ; Mon, 30 Mar 2020 08:59:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729745AbgC3I7z (ORCPT ); Mon, 30 Mar 2020 04:59:55 -0400 Received: from mail.loongson.cn ([114.242.206.163]:33518 "EHLO loongson.cn" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729543AbgC3I7y (ORCPT ); Mon, 30 Mar 2020 04:59:54 -0400 Received: from kvm-dev1.localdomain (unknown [10.2.5.134]) by mail.loongson.cn (Coremail) with SMTP id AQAAf9Dxz2gFtYFeO5khAA--.23S2; Mon, 30 Mar 2020 16:59: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 24/39] MIPS: lasat: Add header file path prefix Date: Mon, 30 Mar 2020 04:59:48 -0400 Message-Id: <1585558788-32476-1-git-send-email-maobibo@loongson.cn> X-Mailer: git-send-email 1.8.3.1 X-CM-TRANSID: AQAAf9Dxz2gFtYFeO5khAA--.23S2 X-Coremail-Antispam: 1UD129KBjvJXoW3Jr4Uuw1rCrW8XFWftFy5Arb_yoWxurWfpa 1kA3Z5WF45ua4jkr1rZay7XF4fJan8G3yYkFyYg34UZ3ZaqF1UXan3tr98Ar97JFs8t3Wx W3yfXF4Utr4vvaDanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUkab7Iv0xC_Kw4lb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rw A2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Xr0_Ar1l84ACjcxK6xII jxv20xvEc7CjxVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26r4UJVWxJr1l84ACjc xK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVAC Y4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1q6rW5McIj6I8E87Iv67AKxVWxJV W8Jr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JMxkIecxEwVCm-wCF04k2 0xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI 8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2Ij64vIr41l IxAIcVC0I7IYx2IY67AKxVW8JVW5JwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Cr0_Gr1UMI IF0xvE42xK8VAvwI8IcIk0rVWUCVW8JwCI42IY6I8E87Iv67AKxVWxJVW8Jr1lIxAIcVC2 z280aVCY1x0267AKxVW8Jr0_Cr1UYxBIdaVFxhVjvjDU0xZFpf9x07beWl9UUUUU= 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-lasat to arch/mips/lasat/include/mach Signed-off-by: bibo mao --- arch/mips/Kconfig | 1 + arch/mips/lasat/Platform | 2 +- arch/mips/lasat/include/mach/cpu-feature-overrides.h | 2 ++ arch/mips/lasat/include/mach/ioremap.h | 2 ++ arch/mips/{include/asm/mach-lasat => lasat/include/mach}/irq.h | 0 arch/mips/lasat/include/mach/kernel-entry-init.h | 2 ++ arch/mips/lasat/include/mach/kmalloc.h | 2 ++ arch/mips/{include/asm/mach-lasat => lasat/include/mach}/mach-gt64120.h | 0 arch/mips/lasat/include/mach/mangle-port.h | 2 ++ arch/mips/lasat/include/mach/mc146818rtc.h | 2 ++ arch/mips/lasat/include/mach/spaces.h | 2 ++ arch/mips/lasat/include/mach/topology.h | 2 ++ arch/mips/lasat/include/mach/war.h | 2 ++ arch/mips/lasat/interrupt.c | 2 +- arch/mips/pci/pci-lasat.c | 2 +- 15 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 arch/mips/lasat/include/mach/cpu-feature-overrides.h create mode 100644 arch/mips/lasat/include/mach/ioremap.h rename arch/mips/{include/asm/mach-lasat => lasat/include/mach}/irq.h (100%) create mode 100644 arch/mips/lasat/include/mach/kernel-entry-init.h create mode 100644 arch/mips/lasat/include/mach/kmalloc.h rename arch/mips/{include/asm/mach-lasat => lasat/include/mach}/mach-gt64120.h (100%) create mode 100644 arch/mips/lasat/include/mach/mangle-port.h create mode 100644 arch/mips/lasat/include/mach/mc146818rtc.h create mode 100644 arch/mips/lasat/include/mach/spaces.h create mode 100644 arch/mips/lasat/include/mach/topology.h create mode 100644 arch/mips/lasat/include/mach/war.h diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 738863fc..37d4d48 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -455,6 +455,7 @@ config LASAT select SYS_SUPPORTS_32BIT_KERNEL select SYS_SUPPORTS_64BIT_KERNEL if BROKEN select SYS_SUPPORTS_LITTLE_ENDIAN + select HAVE_MACH_HEAD_FILES config MACH_LOONGSON32 bool "Loongson 32-bit family of machines" diff --git a/arch/mips/lasat/Platform b/arch/mips/lasat/Platform index 7602528..9bd958b 100644 --- a/arch/mips/lasat/Platform +++ b/arch/mips/lasat/Platform @@ -3,5 +3,5 @@ # platform-$(CONFIG_LASAT) += lasat/ cflags-$(CONFIG_LASAT) += \ - -I$(srctree)/arch/mips/include/asm/mach-lasat + -I$(srctree)/arch/mips/lasat/include load-$(CONFIG_LASAT) += 0xffffffff80000000 diff --git a/arch/mips/lasat/include/mach/cpu-feature-overrides.h b/arch/mips/lasat/include/mach/cpu-feature-overrides.h new file mode 100644 index 0000000..f3e0e12 --- /dev/null +++ b/arch/mips/lasat/include/mach/cpu-feature-overrides.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/lasat/include/mach/ioremap.h b/arch/mips/lasat/include/mach/ioremap.h new file mode 100644 index 0000000..2369393 --- /dev/null +++ b/arch/mips/lasat/include/mach/ioremap.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-lasat/irq.h b/arch/mips/lasat/include/mach/irq.h similarity index 100% rename from arch/mips/include/asm/mach-lasat/irq.h rename to arch/mips/lasat/include/mach/irq.h diff --git a/arch/mips/lasat/include/mach/kernel-entry-init.h b/arch/mips/lasat/include/mach/kernel-entry-init.h new file mode 100644 index 0000000..19b872be --- /dev/null +++ b/arch/mips/lasat/include/mach/kernel-entry-init.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/lasat/include/mach/kmalloc.h b/arch/mips/lasat/include/mach/kmalloc.h new file mode 100644 index 0000000..4f056db --- /dev/null +++ b/arch/mips/lasat/include/mach/kmalloc.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-lasat/mach-gt64120.h b/arch/mips/lasat/include/mach/mach-gt64120.h similarity index 100% rename from arch/mips/include/asm/mach-lasat/mach-gt64120.h rename to arch/mips/lasat/include/mach/mach-gt64120.h diff --git a/arch/mips/lasat/include/mach/mangle-port.h b/arch/mips/lasat/include/mach/mangle-port.h new file mode 100644 index 0000000..b9736e3 --- /dev/null +++ b/arch/mips/lasat/include/mach/mangle-port.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/lasat/include/mach/mc146818rtc.h b/arch/mips/lasat/include/mach/mc146818rtc.h new file mode 100644 index 0000000..7284af8 --- /dev/null +++ b/arch/mips/lasat/include/mach/mc146818rtc.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/lasat/include/mach/spaces.h b/arch/mips/lasat/include/mach/spaces.h new file mode 100644 index 0000000..39a4d72 --- /dev/null +++ b/arch/mips/lasat/include/mach/spaces.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/lasat/include/mach/topology.h b/arch/mips/lasat/include/mach/topology.h new file mode 100644 index 0000000..86e585b --- /dev/null +++ b/arch/mips/lasat/include/mach/topology.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/lasat/include/mach/war.h b/arch/mips/lasat/include/mach/war.h new file mode 100644 index 0000000..5b0422a --- /dev/null +++ b/arch/mips/lasat/include/mach/war.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/lasat/interrupt.c b/arch/mips/lasat/interrupt.c index 7965bbd..6d48e33 100644 --- a/arch/mips/lasat/interrupt.c +++ b/arch/mips/lasat/interrupt.c @@ -14,7 +14,7 @@ #include #include -#include +#include static volatile int *lasat_int_status; static volatile int *lasat_int_mask; diff --git a/arch/mips/pci/pci-lasat.c b/arch/mips/pci/pci-lasat.c index 47f4ee6..a20a1b9 100644 --- a/arch/mips/pci/pci-lasat.c +++ b/arch/mips/pci/pci-lasat.c @@ -12,7 +12,7 @@ #include -#include +#include extern struct pci_ops nile4_pci_ops; extern struct pci_ops gt64xxx_pci0_ops; From patchwork Mon Mar 30 08:59: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: 11464985 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 61C2181 for ; Mon, 30 Mar 2020 09:00:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3853E20784 for ; Mon, 30 Mar 2020 09:00:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729704AbgC3JAC (ORCPT ); Mon, 30 Mar 2020 05:00:02 -0400 Received: from mail.loongson.cn ([114.242.206.163]:33562 "EHLO loongson.cn" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729543AbgC3JAC (ORCPT ); Mon, 30 Mar 2020 05:00:02 -0400 Received: from kvm-dev1.localdomain (unknown [10.2.5.134]) by mail.loongson.cn (Coremail) with SMTP id AQAAf9DxT2gLtYFeP5khAA--.36S2; Mon, 30 Mar 2020 16:59: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 25/39] MIPS: pic32: Add header file path prefix Date: Mon, 30 Mar 2020 04:59:55 -0400 Message-Id: <1585558795-8647-1-git-send-email-maobibo@loongson.cn> X-Mailer: git-send-email 1.8.3.1 X-CM-TRANSID: AQAAf9DxT2gLtYFeP5khAA--.36S2 X-Coremail-Antispam: 1UD129KBjvJXoW3KF4xWrW3WFyfCFW7ZrW5KFg_yoWkXr4fpF 4DAa4kGFWUur1UAF1xZFy2yr45XayDurWjg3409345Z3WaqFn8Ars3tr98AFn7AFWDt3Wr WrW3XFWUGr4kZw7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUkab7Iv0xC_Kw4lb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rw A2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Xr0_Ar1l84ACjcxK6xII jxv20xvEc7CjxVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26r4UJVWxJr1l84ACjc xK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVAC Y4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1q6rW5McIj6I8E87Iv67AKxVWxJV W8Jr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JMxkIecxEwVCm-wCF04k2 0xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI 8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2Ij64vIr41l IxAIcVC0I7IYx2IY67AKxVW8JVW5JwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Cr0_Gr1UMI IF0xvE42xK8VAvwI8IcIk0rVWUCVW8JwCI42IY6I8E87Iv67AKxVWxJVW8Jr1lIxAIcVC2 z280aVCY1x0267AKxVW8Jr0_Cr1UYxBIdaVFxhVjvjDU0xZFpf9x07beWl9UUUUU= 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-pic32 to arch/mips/pic32/include/mach Signed-off-by: bibo mao --- arch/mips/Kconfig | 1 + arch/mips/pic32/Platform | 2 +- arch/mips/pic32/common/reset.c | 2 +- .../asm/mach-pic32 => pic32/include/mach}/cpu-feature-overrides.h | 0 arch/mips/pic32/include/mach/ioremap.h | 2 ++ arch/mips/{include/asm/mach-pic32 => pic32/include/mach}/irq.h | 0 arch/mips/pic32/include/mach/kernel-entry-init.h | 2 ++ arch/mips/pic32/include/mach/kmalloc.h | 2 ++ arch/mips/pic32/include/mach/mangle-port.h | 2 ++ arch/mips/pic32/include/mach/mc146818rtc.h | 2 ++ arch/mips/{include/asm/mach-pic32 => pic32/include/mach}/pic32.h | 0 arch/mips/{include/asm/mach-pic32 => pic32/include/mach}/spaces.h | 0 arch/mips/pic32/include/mach/topology.h | 2 ++ arch/mips/pic32/include/mach/war.h | 2 ++ arch/mips/pic32/pic32mzda/config.c | 2 +- arch/mips/pic32/pic32mzda/early_clk.c | 2 +- arch/mips/pic32/pic32mzda/early_console.c | 2 +- drivers/clk/microchip/clk-core.c | 2 +- drivers/irqchip/irq-pic32-evic.c | 2 +- drivers/pinctrl/pinctrl-pic32.c | 2 +- drivers/rtc/rtc-pic32.c | 2 +- drivers/tty/serial/pic32_uart.c | 2 +- drivers/watchdog/pic32-dmt.c | 2 +- drivers/watchdog/pic32-wdt.c | 2 +- 24 files changed, 27 insertions(+), 12 deletions(-) rename arch/mips/{include/asm/mach-pic32 => pic32/include/mach}/cpu-feature-overrides.h (100%) create mode 100644 arch/mips/pic32/include/mach/ioremap.h rename arch/mips/{include/asm/mach-pic32 => pic32/include/mach}/irq.h (100%) create mode 100644 arch/mips/pic32/include/mach/kernel-entry-init.h create mode 100644 arch/mips/pic32/include/mach/kmalloc.h create mode 100644 arch/mips/pic32/include/mach/mangle-port.h create mode 100644 arch/mips/pic32/include/mach/mc146818rtc.h rename arch/mips/{include/asm/mach-pic32 => pic32/include/mach}/pic32.h (100%) rename arch/mips/{include/asm/mach-pic32 => pic32/include/mach}/spaces.h (100%) create mode 100644 arch/mips/pic32/include/mach/topology.h create mode 100644 arch/mips/pic32/include/mach/war.h diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 37d4d48..ce1b5e3 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -603,6 +603,7 @@ config MIPS_MALTA config MACH_PIC32 bool "Microchip PIC32 Family" + select HAVE_MACH_HEAD_FILES help This enables support for the Microchip PIC32 family of platforms. diff --git a/arch/mips/pic32/Platform b/arch/mips/pic32/Platform index cd2084f4..615ce0d 100644 --- a/arch/mips/pic32/Platform +++ b/arch/mips/pic32/Platform @@ -2,6 +2,6 @@ # PIC32MZDA # platform-$(CONFIG_PIC32MZDA) += pic32/ -cflags-$(CONFIG_PIC32MZDA) += -I$(srctree)/arch/mips/include/asm/mach-pic32 +cflags-$(CONFIG_PIC32MZDA) += -I$(srctree)/arch/mips/pic32/include load-$(CONFIG_PIC32MZDA) += 0xffffffff88000000 all-$(CONFIG_PIC32MZDA) := $(COMPRESSION_FNAME).bin diff --git a/arch/mips/pic32/common/reset.c b/arch/mips/pic32/common/reset.c index a5fd7a8..5fca663 100644 --- a/arch/mips/pic32/common/reset.c +++ b/arch/mips/pic32/common/reset.c @@ -6,7 +6,7 @@ #include #include #include -#include +#include #define PIC32_RSWRST 0x10 diff --git a/arch/mips/include/asm/mach-pic32/cpu-feature-overrides.h b/arch/mips/pic32/include/mach/cpu-feature-overrides.h similarity index 100% rename from arch/mips/include/asm/mach-pic32/cpu-feature-overrides.h rename to arch/mips/pic32/include/mach/cpu-feature-overrides.h diff --git a/arch/mips/pic32/include/mach/ioremap.h b/arch/mips/pic32/include/mach/ioremap.h new file mode 100644 index 0000000..2369393 --- /dev/null +++ b/arch/mips/pic32/include/mach/ioremap.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-pic32/irq.h b/arch/mips/pic32/include/mach/irq.h similarity index 100% rename from arch/mips/include/asm/mach-pic32/irq.h rename to arch/mips/pic32/include/mach/irq.h diff --git a/arch/mips/pic32/include/mach/kernel-entry-init.h b/arch/mips/pic32/include/mach/kernel-entry-init.h new file mode 100644 index 0000000..19b872be --- /dev/null +++ b/arch/mips/pic32/include/mach/kernel-entry-init.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/pic32/include/mach/kmalloc.h b/arch/mips/pic32/include/mach/kmalloc.h new file mode 100644 index 0000000..4f056db --- /dev/null +++ b/arch/mips/pic32/include/mach/kmalloc.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/pic32/include/mach/mangle-port.h b/arch/mips/pic32/include/mach/mangle-port.h new file mode 100644 index 0000000..b9736e3 --- /dev/null +++ b/arch/mips/pic32/include/mach/mangle-port.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/pic32/include/mach/mc146818rtc.h b/arch/mips/pic32/include/mach/mc146818rtc.h new file mode 100644 index 0000000..7284af8 --- /dev/null +++ b/arch/mips/pic32/include/mach/mc146818rtc.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-pic32/pic32.h b/arch/mips/pic32/include/mach/pic32.h similarity index 100% rename from arch/mips/include/asm/mach-pic32/pic32.h rename to arch/mips/pic32/include/mach/pic32.h diff --git a/arch/mips/include/asm/mach-pic32/spaces.h b/arch/mips/pic32/include/mach/spaces.h similarity index 100% rename from arch/mips/include/asm/mach-pic32/spaces.h rename to arch/mips/pic32/include/mach/spaces.h diff --git a/arch/mips/pic32/include/mach/topology.h b/arch/mips/pic32/include/mach/topology.h new file mode 100644 index 0000000..86e585b --- /dev/null +++ b/arch/mips/pic32/include/mach/topology.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/pic32/include/mach/war.h b/arch/mips/pic32/include/mach/war.h new file mode 100644 index 0000000..5b0422a --- /dev/null +++ b/arch/mips/pic32/include/mach/war.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/pic32/pic32mzda/config.c b/arch/mips/pic32/pic32mzda/config.c index 36afe1b..5223be2 100644 --- a/arch/mips/pic32/pic32mzda/config.c +++ b/arch/mips/pic32/pic32mzda/config.c @@ -7,7 +7,7 @@ #include #include -#include +#include #include "pic32mzda.h" diff --git a/arch/mips/pic32/pic32mzda/early_clk.c b/arch/mips/pic32/pic32mzda/early_clk.c index 6001e50..4ec52e7 100644 --- a/arch/mips/pic32/pic32mzda/early_clk.c +++ b/arch/mips/pic32/pic32mzda/early_clk.c @@ -3,7 +3,7 @@ * Joshua Henderson * Copyright (C) 2015 Microchip Technology Inc. All rights reserved. */ -#include +#include #include "pic32mzda.h" diff --git a/arch/mips/pic32/pic32mzda/early_console.c b/arch/mips/pic32/pic32mzda/early_console.c index 25372e6..d05324d 100644 --- a/arch/mips/pic32/pic32mzda/early_console.c +++ b/arch/mips/pic32/pic32mzda/early_console.c @@ -3,7 +3,7 @@ * Joshua Henderson * Copyright (C) 2015 Microchip Technology Inc. All rights reserved. */ -#include +#include #include #include diff --git a/drivers/clk/microchip/clk-core.c b/drivers/clk/microchip/clk-core.c index 1b4f023..31b14902 100644 --- a/drivers/clk/microchip/clk-core.c +++ b/drivers/clk/microchip/clk-core.c @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include "clk-core.h" diff --git a/drivers/irqchip/irq-pic32-evic.c b/drivers/irqchip/irq-pic32-evic.c index 34c4b4f..0e2ce3d 100644 --- a/drivers/irqchip/irq-pic32-evic.c +++ b/drivers/irqchip/irq-pic32-evic.c @@ -16,7 +16,7 @@ #include #include -#include +#include #define REG_INTCON 0x0000 #define REG_INTSTAT 0x0020 diff --git a/drivers/pinctrl/pinctrl-pic32.c b/drivers/pinctrl/pinctrl-pic32.c index e5d6d3f..bbfe124 100644 --- a/drivers/pinctrl/pinctrl-pic32.c +++ b/drivers/pinctrl/pinctrl-pic32.c @@ -20,7 +20,7 @@ #include #include -#include +#include #include "pinctrl-utils.h" #include "pinctrl-pic32.h" diff --git a/drivers/rtc/rtc-pic32.c b/drivers/rtc/rtc-pic32.c index 2b69467..c070c53 100644 --- a/drivers/rtc/rtc-pic32.c +++ b/drivers/rtc/rtc-pic32.c @@ -16,7 +16,7 @@ #include #include -#include +#include #define PIC32_RTCCON 0x00 #define PIC32_RTCCON_ON BIT(15) diff --git a/drivers/tty/serial/pic32_uart.c b/drivers/tty/serial/pic32_uart.c index 484b7e8..af62e34 100644 --- a/drivers/tty/serial/pic32_uart.c +++ b/drivers/tty/serial/pic32_uart.c @@ -24,7 +24,7 @@ #include #include -#include +#include #include "pic32_uart.h" /* UART name and device definitions */ diff --git a/drivers/watchdog/pic32-dmt.c b/drivers/watchdog/pic32-dmt.c index f43062b..4aaf1c2 100644 --- a/drivers/watchdog/pic32-dmt.c +++ b/drivers/watchdog/pic32-dmt.c @@ -17,7 +17,7 @@ #include #include -#include +#include /* Deadman Timer Regs */ #define DMTCON_REG 0x00 diff --git a/drivers/watchdog/pic32-wdt.c b/drivers/watchdog/pic32-wdt.c index 41715d6..f4abc75 100644 --- a/drivers/watchdog/pic32-wdt.c +++ b/drivers/watchdog/pic32-wdt.c @@ -17,7 +17,7 @@ #include #include -#include +#include /* Watchdog Timer Registers */ #define WDTCON_REG 0x00 From patchwork Mon Mar 30 09:00:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bibo Mao X-Patchwork-Id: 11464987 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 8C2221805 for ; Mon, 30 Mar 2020 09:00:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 68C48206CC for ; Mon, 30 Mar 2020 09:00:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729788AbgC3JAH (ORCPT ); Mon, 30 Mar 2020 05:00:07 -0400 Received: from mail.loongson.cn ([114.242.206.163]:33632 "EHLO loongson.cn" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729543AbgC3JAG (ORCPT ); Mon, 30 Mar 2020 05:00:06 -0400 Received: from kvm-dev1.localdomain (unknown [10.2.5.134]) by mail.loongson.cn (Coremail) with SMTP id AQAAf9Dxv2sRtYFegZkhAA--.13S2; Mon, 30 Mar 2020 17:00:01 +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 26/39] MIPS: pistachio: Add header file path prefix Date: Mon, 30 Mar 2020 05:00:01 -0400 Message-Id: <1585558801-16498-1-git-send-email-maobibo@loongson.cn> X-Mailer: git-send-email 1.8.3.1 X-CM-TRANSID: AQAAf9Dxv2sRtYFegZkhAA--.13S2 X-Coremail-Antispam: 1UD129KBjvJXoWxKFyfAFyrWF4fuw1ruFykZrb_yoWxWryfpa 1kAwn7GF40934jya1fZ3W7Zr43tws5GrWj9ry5Ww1UZ3ZIgF1UXrs5trZ8Z34xJFW2ya1r ur9xWr1Utr4kZw7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUkab7Iv0xC_Kw4lb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rw A2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Xr0_Ar1l84ACjcxK6xII jxv20xvEc7CjxVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26r4UJVWxJr1l84ACjc xK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVAC Y4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1q6rW5McIj6I8E87Iv67AKxVWxJV W8Jr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JMxkIecxEwVCm-wCF04k2 0xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI 8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2Ij64vIr41l IxAIcVC0I7IYx2IY67AKxVW8JVW5JwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Cr0_Gr1UMI IF0xvE42xK8VAvwI8IcIk0rVWUCVW8JwCI42IY6I8E87Iv67AKxVWxJVW8Jr1lIxAIcVC2 z280aVCY1x0267AKxVW8Jr0_Cr1UYxBIdaVFxhVjvjDU0xZFpf9x07beWl9UUUUU= 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-pistachio to arch/mips/pistachio/include/mach Signed-off-by: bibo mao --- arch/mips/Kconfig | 1 + arch/mips/include/asm/eva.h | 2 +- arch/mips/pistachio/Platform | 2 +- arch/mips/pistachio/include/mach/cpu-feature-overrides.h | 2 ++ arch/mips/pistachio/include/mach/ioremap.h | 2 ++ arch/mips/{include/asm/mach-pistachio => pistachio/include/mach}/irq.h | 0 arch/mips/pistachio/include/mach/kernel-entry-init.h | 2 ++ arch/mips/pistachio/include/mach/kmalloc.h | 2 ++ arch/mips/pistachio/include/mach/mangle-port.h | 2 ++ arch/mips/pistachio/include/mach/mc146818rtc.h | 2 ++ arch/mips/pistachio/include/mach/spaces.h | 2 ++ arch/mips/pistachio/include/mach/topology.h | 2 ++ arch/mips/pistachio/include/mach/war.h | 2 ++ 13 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 arch/mips/pistachio/include/mach/cpu-feature-overrides.h create mode 100644 arch/mips/pistachio/include/mach/ioremap.h rename arch/mips/{include/asm/mach-pistachio => pistachio/include/mach}/irq.h (100%) create mode 100644 arch/mips/pistachio/include/mach/kernel-entry-init.h create mode 100644 arch/mips/pistachio/include/mach/kmalloc.h create mode 100644 arch/mips/pistachio/include/mach/mangle-port.h create mode 100644 arch/mips/pistachio/include/mach/mc146818rtc.h create mode 100644 arch/mips/pistachio/include/mach/spaces.h create mode 100644 arch/mips/pistachio/include/mach/topology.h create mode 100644 arch/mips/pistachio/include/mach/war.h diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index ce1b5e3..f5f144f 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -541,6 +541,7 @@ config MACH_PISTACHIO select SYS_HAS_EARLY_PRINTK select USE_GENERIC_EARLY_PRINTK_8250 select USE_OF + select HAVE_MACH_HEAD_FILES help This enables support for the IMG Pistachio SoC platform. diff --git a/arch/mips/include/asm/eva.h b/arch/mips/include/asm/eva.h index a3d1807..45034a5 100644 --- a/arch/mips/include/asm/eva.h +++ b/arch/mips/include/asm/eva.h @@ -11,7 +11,7 @@ #ifndef _ASM_EVA_H #define _ASM_EVA_H -#include +#include #ifdef __ASSEMBLY__ diff --git a/arch/mips/pistachio/Platform b/arch/mips/pistachio/Platform index c3592b37..22580e9 100644 --- a/arch/mips/pistachio/Platform +++ b/arch/mips/pistachio/Platform @@ -3,7 +3,7 @@ # platform-$(CONFIG_MACH_PISTACHIO) += pistachio/ cflags-$(CONFIG_MACH_PISTACHIO) += \ - -I$(srctree)/arch/mips/include/asm/mach-pistachio + -I$(srctree)/arch/mips/pistachio/include load-$(CONFIG_MACH_PISTACHIO) += 0xffffffff80400000 zload-$(CONFIG_MACH_PISTACHIO) += 0xffffffff81000000 all-$(CONFIG_MACH_PISTACHIO) := uImage.gz diff --git a/arch/mips/pistachio/include/mach/cpu-feature-overrides.h b/arch/mips/pistachio/include/mach/cpu-feature-overrides.h new file mode 100644 index 0000000..f3e0e12 --- /dev/null +++ b/arch/mips/pistachio/include/mach/cpu-feature-overrides.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/pistachio/include/mach/ioremap.h b/arch/mips/pistachio/include/mach/ioremap.h new file mode 100644 index 0000000..2369393 --- /dev/null +++ b/arch/mips/pistachio/include/mach/ioremap.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-pistachio/irq.h b/arch/mips/pistachio/include/mach/irq.h similarity index 100% rename from arch/mips/include/asm/mach-pistachio/irq.h rename to arch/mips/pistachio/include/mach/irq.h diff --git a/arch/mips/pistachio/include/mach/kernel-entry-init.h b/arch/mips/pistachio/include/mach/kernel-entry-init.h new file mode 100644 index 0000000..19b872be --- /dev/null +++ b/arch/mips/pistachio/include/mach/kernel-entry-init.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/pistachio/include/mach/kmalloc.h b/arch/mips/pistachio/include/mach/kmalloc.h new file mode 100644 index 0000000..4f056db --- /dev/null +++ b/arch/mips/pistachio/include/mach/kmalloc.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/pistachio/include/mach/mangle-port.h b/arch/mips/pistachio/include/mach/mangle-port.h new file mode 100644 index 0000000..b9736e3 --- /dev/null +++ b/arch/mips/pistachio/include/mach/mangle-port.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/pistachio/include/mach/mc146818rtc.h b/arch/mips/pistachio/include/mach/mc146818rtc.h new file mode 100644 index 0000000..7284af8 --- /dev/null +++ b/arch/mips/pistachio/include/mach/mc146818rtc.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/pistachio/include/mach/spaces.h b/arch/mips/pistachio/include/mach/spaces.h new file mode 100644 index 0000000..39a4d72 --- /dev/null +++ b/arch/mips/pistachio/include/mach/spaces.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/pistachio/include/mach/topology.h b/arch/mips/pistachio/include/mach/topology.h new file mode 100644 index 0000000..86e585b --- /dev/null +++ b/arch/mips/pistachio/include/mach/topology.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/pistachio/include/mach/war.h b/arch/mips/pistachio/include/mach/war.h new file mode 100644 index 0000000..5b0422a --- /dev/null +++ b/arch/mips/pistachio/include/mach/war.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include From patchwork Mon Mar 30 09:00: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: 11464991 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 D1426159A for ; Mon, 30 Mar 2020 09:00:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9C3A420733 for ; Mon, 30 Mar 2020 09:00:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729736AbgC3JAb (ORCPT ); Mon, 30 Mar 2020 05:00:31 -0400 Received: from mail.loongson.cn ([114.242.206.163]:33710 "EHLO loongson.cn" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729399AbgC3JAa (ORCPT ); Mon, 30 Mar 2020 05:00:30 -0400 Received: from kvm-dev1.localdomain (unknown [10.2.5.134]) by mail.loongson.cn (Coremail) with SMTP id AQAAf9Ax9ukXtYFe9pkhAA--.30S2; Mon, 30 Mar 2020 17:00: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 27/39] MIPS: pmcs-msp71xx: Add header file path prefix Date: Mon, 30 Mar 2020 05:00:07 -0400 Message-Id: <1585558807-23418-1-git-send-email-maobibo@loongson.cn> X-Mailer: git-send-email 1.8.3.1 X-CM-TRANSID: AQAAf9Ax9ukXtYFe9pkhAA--.30S2 X-Coremail-Antispam: 1UD129KBjvAXoW3Cr1xXrWxAr1xAFWDuryUJrb_yoW8Cw43Ko Z2yFn7K348JFZrJFy7CFy3Gw1rXryDtr4rt34rtrZrJF9rZ347Jr1S9rs2q3WUCFWft347 GrZavrW5Cr10yFWxn29KB7ZKAUJUUUU8529EdanIXcx71UUUUU7v73VFW2AGmfu7bjvjm3 AaLaJ3UjIYCTnIWjp_UUUYn7k0a2IF6w4kM7kC6x804xWl14x267AKxVWUJVW8JwAFc2x0 x2IEx4CE42xK8VAvwI8IcIk0rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2ocxC64kIII0Yj4 1l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26ryj6F1UM28EF7xvwVC0 I7IYx2IY6xkF7I0E14v26r4UJVWxJr1l84ACjcxK6I8E87Iv67AKxVW8Jr0_Cr1UM28EF7 xvwVC2z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40E FcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUtVWrXwAv7VC2z280aVAFwI0_Cr 0_Gr1UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCY02Avz4vE-syl42xK 82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGw C20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r1DMIIYrxkI7VAKI48J MIIF0xvE2Ix0cI8IcVAFwI0_Gr0_Xr1lIxAIcVC0I7IYx2IY6xkF7I0E14v26F4j6r4UJw CI42IY6xAIw20EY4v20xvaj40_JFI_Gr1lIxAIcVC2z280aVAFwI0_Cr0_Gr1UMIIF0xvE x4A2jsIEc7CjxVAFwI0_Gr1j6F4UJbIYCTnIWIevJa73UjIFyTuYvjxUq_MaDUUUU 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-pmcs-msp71xx to arch/mips/pmcs-msp71xx/include/mach Signed-off-by: bibo mao --- arch/mips/Kconfig | 1 + arch/mips/pci/fixup-pmcmsp.c | 4 ++-- arch/mips/pci/ops-pmcmsp.c | 10 +++++----- arch/mips/pmcs-msp71xx/Platform | 2 +- .../include/mach}/cpu-feature-overrides.h | 0 arch/mips/pmcs-msp71xx/include/mach/ioremap.h | 2 ++ arch/mips/pmcs-msp71xx/include/mach/irq.h | 2 ++ arch/mips/pmcs-msp71xx/include/mach/kernel-entry-init.h | 2 ++ arch/mips/pmcs-msp71xx/include/mach/kmalloc.h | 2 ++ arch/mips/pmcs-msp71xx/include/mach/mangle-port.h | 2 ++ arch/mips/pmcs-msp71xx/include/mach/mc146818rtc.h | 2 ++ .../include/mach}/msp_cic_int.h | 0 .../include/mach}/msp_gpio_macros.h | 4 ++-- .../mach-pmcs-msp71xx => pmcs-msp71xx/include/mach}/msp_int.h | 0 .../mach-pmcs-msp71xx => pmcs-msp71xx/include/mach}/msp_pci.h | 0 .../mach-pmcs-msp71xx => pmcs-msp71xx/include/mach}/msp_prom.h | 0 .../include/mach}/msp_regops.h | 0 .../mach-pmcs-msp71xx => pmcs-msp71xx/include/mach}/msp_regs.h | 0 .../include/mach}/msp_slp_int.h | 0 .../mach-pmcs-msp71xx => pmcs-msp71xx/include/mach}/msp_usb.h | 0 arch/mips/pmcs-msp71xx/include/mach/spaces.h | 2 ++ arch/mips/pmcs-msp71xx/include/mach/topology.h | 2 ++ .../asm/mach-pmcs-msp71xx => pmcs-msp71xx/include/mach}/war.h | 0 arch/mips/pmcs-msp71xx/msp_elb.c | 2 +- arch/mips/pmcs-msp71xx/msp_eth.c | 6 +++--- arch/mips/pmcs-msp71xx/msp_hwbutton.c | 6 +++--- arch/mips/pmcs-msp71xx/msp_irq.c | 2 +- arch/mips/pmcs-msp71xx/msp_irq_cic.c | 4 ++-- arch/mips/pmcs-msp71xx/msp_irq_per.c | 4 ++-- arch/mips/pmcs-msp71xx/msp_irq_slp.c | 4 ++-- arch/mips/pmcs-msp71xx/msp_pci.c | 4 ++-- arch/mips/pmcs-msp71xx/msp_prom.c | 4 ++-- arch/mips/pmcs-msp71xx/msp_serial.c | 6 +++--- arch/mips/pmcs-msp71xx/msp_setup.c | 6 +++--- arch/mips/pmcs-msp71xx/msp_time.c | 6 +++--- arch/mips/pmcs-msp71xx/msp_usb.c | 8 ++++---- drivers/mtd/maps/pmcmsp-flash.c | 4 ++-- 37 files changed, 60 insertions(+), 43 deletions(-) rename arch/mips/{include/asm/mach-pmcs-msp71xx => pmcs-msp71xx/include/mach}/cpu-feature-overrides.h (100%) create mode 100644 arch/mips/pmcs-msp71xx/include/mach/ioremap.h create mode 100644 arch/mips/pmcs-msp71xx/include/mach/irq.h create mode 100644 arch/mips/pmcs-msp71xx/include/mach/kernel-entry-init.h create mode 100644 arch/mips/pmcs-msp71xx/include/mach/kmalloc.h create mode 100644 arch/mips/pmcs-msp71xx/include/mach/mangle-port.h create mode 100644 arch/mips/pmcs-msp71xx/include/mach/mc146818rtc.h rename arch/mips/{include/asm/mach-pmcs-msp71xx => pmcs-msp71xx/include/mach}/msp_cic_int.h (100%) rename arch/mips/{include/asm/mach-pmcs-msp71xx => pmcs-msp71xx/include/mach}/msp_gpio_macros.h (99%) rename arch/mips/{include/asm/mach-pmcs-msp71xx => pmcs-msp71xx/include/mach}/msp_int.h (100%) rename arch/mips/{include/asm/mach-pmcs-msp71xx => pmcs-msp71xx/include/mach}/msp_pci.h (100%) rename arch/mips/{include/asm/mach-pmcs-msp71xx => pmcs-msp71xx/include/mach}/msp_prom.h (100%) rename arch/mips/{include/asm/mach-pmcs-msp71xx => pmcs-msp71xx/include/mach}/msp_regops.h (100%) rename arch/mips/{include/asm/mach-pmcs-msp71xx => pmcs-msp71xx/include/mach}/msp_regs.h (100%) rename arch/mips/{include/asm/mach-pmcs-msp71xx => pmcs-msp71xx/include/mach}/msp_slp_int.h (100%) rename arch/mips/{include/asm/mach-pmcs-msp71xx => pmcs-msp71xx/include/mach}/msp_usb.h (100%) create mode 100644 arch/mips/pmcs-msp71xx/include/mach/spaces.h create mode 100644 arch/mips/pmcs-msp71xx/include/mach/topology.h rename arch/mips/{include/asm/mach-pmcs-msp71xx => pmcs-msp71xx/include/mach}/war.h (100%) diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index f5f144f..56d6519 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -657,6 +657,7 @@ config PMC_MSP select SERIAL_8250_CONSOLE select USB_EHCI_BIG_ENDIAN_MMIO select USB_EHCI_BIG_ENDIAN_DESC + select HAVE_MACH_HEAD_FILES help This adds support for the PMC-Sierra family of Multi-Service Processor System-On-A-Chips. These parts include a number diff --git a/arch/mips/pci/fixup-pmcmsp.c b/arch/mips/pci/fixup-pmcmsp.c index 4ad2ef0..45cf610 100644 --- a/arch/mips/pci/fixup-pmcmsp.c +++ b/arch/mips/pci/fixup-pmcmsp.c @@ -37,8 +37,8 @@ #include -#include -#include +#include +#include /* PCI interrupt pins */ #define IRQ4 MSP_INT_EXT4 diff --git a/arch/mips/pci/ops-pmcmsp.c b/arch/mips/pci/ops-pmcmsp.c index ad5dd71..b4d44ad 100644 --- a/arch/mips/pci/ops-pmcmsp.c +++ b/arch/mips/pci/ops-pmcmsp.c @@ -30,11 +30,11 @@ #include #endif -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #define PCI_ACCESS_READ 0 #define PCI_ACCESS_WRITE 1 diff --git a/arch/mips/pmcs-msp71xx/Platform b/arch/mips/pmcs-msp71xx/Platform index 7af0734..a15f576 100644 --- a/arch/mips/pmcs-msp71xx/Platform +++ b/arch/mips/pmcs-msp71xx/Platform @@ -2,6 +2,6 @@ # PMC-Sierra MSP SOCs # platform-$(CONFIG_PMC_MSP) += pmcs-msp71xx/ -cflags-$(CONFIG_PMC_MSP) += -I$(srctree)/arch/mips/include/asm/mach-pmcs-msp71xx \ +cflags-$(CONFIG_PMC_MSP) += -I$(srctree)/arch/mips/pmcs-msp71xx/include \ -mno-branch-likely load-$(CONFIG_PMC_MSP) += 0xffffffff80100000 diff --git a/arch/mips/include/asm/mach-pmcs-msp71xx/cpu-feature-overrides.h b/arch/mips/pmcs-msp71xx/include/mach/cpu-feature-overrides.h similarity index 100% rename from arch/mips/include/asm/mach-pmcs-msp71xx/cpu-feature-overrides.h rename to arch/mips/pmcs-msp71xx/include/mach/cpu-feature-overrides.h diff --git a/arch/mips/pmcs-msp71xx/include/mach/ioremap.h b/arch/mips/pmcs-msp71xx/include/mach/ioremap.h new file mode 100644 index 0000000..2369393 --- /dev/null +++ b/arch/mips/pmcs-msp71xx/include/mach/ioremap.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/pmcs-msp71xx/include/mach/irq.h b/arch/mips/pmcs-msp71xx/include/mach/irq.h new file mode 100644 index 0000000..bb5ccce --- /dev/null +++ b/arch/mips/pmcs-msp71xx/include/mach/irq.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/pmcs-msp71xx/include/mach/kernel-entry-init.h b/arch/mips/pmcs-msp71xx/include/mach/kernel-entry-init.h new file mode 100644 index 0000000..19b872be --- /dev/null +++ b/arch/mips/pmcs-msp71xx/include/mach/kernel-entry-init.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/pmcs-msp71xx/include/mach/kmalloc.h b/arch/mips/pmcs-msp71xx/include/mach/kmalloc.h new file mode 100644 index 0000000..4f056db --- /dev/null +++ b/arch/mips/pmcs-msp71xx/include/mach/kmalloc.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/pmcs-msp71xx/include/mach/mangle-port.h b/arch/mips/pmcs-msp71xx/include/mach/mangle-port.h new file mode 100644 index 0000000..b9736e3 --- /dev/null +++ b/arch/mips/pmcs-msp71xx/include/mach/mangle-port.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/pmcs-msp71xx/include/mach/mc146818rtc.h b/arch/mips/pmcs-msp71xx/include/mach/mc146818rtc.h new file mode 100644 index 0000000..7284af8 --- /dev/null +++ b/arch/mips/pmcs-msp71xx/include/mach/mc146818rtc.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-pmcs-msp71xx/msp_cic_int.h b/arch/mips/pmcs-msp71xx/include/mach/msp_cic_int.h similarity index 100% rename from arch/mips/include/asm/mach-pmcs-msp71xx/msp_cic_int.h rename to arch/mips/pmcs-msp71xx/include/mach/msp_cic_int.h diff --git a/arch/mips/include/asm/mach-pmcs-msp71xx/msp_gpio_macros.h b/arch/mips/pmcs-msp71xx/include/mach/msp_gpio_macros.h similarity index 99% rename from arch/mips/include/asm/mach-pmcs-msp71xx/msp_gpio_macros.h rename to arch/mips/pmcs-msp71xx/include/mach/msp_gpio_macros.h index daacebb..2176203 100644 --- a/arch/mips/include/asm/mach-pmcs-msp71xx/msp_gpio_macros.h +++ b/arch/mips/pmcs-msp71xx/include/mach/msp_gpio_macros.h @@ -29,8 +29,8 @@ #ifndef __MSP_GPIO_MACROS_H__ #define __MSP_GPIO_MACROS_H__ -#include -#include +#include +#include #ifdef CONFIG_PMC_MSP7120_GW #define MSP_NUM_GPIOS 20 diff --git a/arch/mips/include/asm/mach-pmcs-msp71xx/msp_int.h b/arch/mips/pmcs-msp71xx/include/mach/msp_int.h similarity index 100% rename from arch/mips/include/asm/mach-pmcs-msp71xx/msp_int.h rename to arch/mips/pmcs-msp71xx/include/mach/msp_int.h diff --git a/arch/mips/include/asm/mach-pmcs-msp71xx/msp_pci.h b/arch/mips/pmcs-msp71xx/include/mach/msp_pci.h similarity index 100% rename from arch/mips/include/asm/mach-pmcs-msp71xx/msp_pci.h rename to arch/mips/pmcs-msp71xx/include/mach/msp_pci.h diff --git a/arch/mips/include/asm/mach-pmcs-msp71xx/msp_prom.h b/arch/mips/pmcs-msp71xx/include/mach/msp_prom.h similarity index 100% rename from arch/mips/include/asm/mach-pmcs-msp71xx/msp_prom.h rename to arch/mips/pmcs-msp71xx/include/mach/msp_prom.h diff --git a/arch/mips/include/asm/mach-pmcs-msp71xx/msp_regops.h b/arch/mips/pmcs-msp71xx/include/mach/msp_regops.h similarity index 100% rename from arch/mips/include/asm/mach-pmcs-msp71xx/msp_regops.h rename to arch/mips/pmcs-msp71xx/include/mach/msp_regops.h diff --git a/arch/mips/include/asm/mach-pmcs-msp71xx/msp_regs.h b/arch/mips/pmcs-msp71xx/include/mach/msp_regs.h similarity index 100% rename from arch/mips/include/asm/mach-pmcs-msp71xx/msp_regs.h rename to arch/mips/pmcs-msp71xx/include/mach/msp_regs.h diff --git a/arch/mips/include/asm/mach-pmcs-msp71xx/msp_slp_int.h b/arch/mips/pmcs-msp71xx/include/mach/msp_slp_int.h similarity index 100% rename from arch/mips/include/asm/mach-pmcs-msp71xx/msp_slp_int.h rename to arch/mips/pmcs-msp71xx/include/mach/msp_slp_int.h diff --git a/arch/mips/include/asm/mach-pmcs-msp71xx/msp_usb.h b/arch/mips/pmcs-msp71xx/include/mach/msp_usb.h similarity index 100% rename from arch/mips/include/asm/mach-pmcs-msp71xx/msp_usb.h rename to arch/mips/pmcs-msp71xx/include/mach/msp_usb.h diff --git a/arch/mips/pmcs-msp71xx/include/mach/spaces.h b/arch/mips/pmcs-msp71xx/include/mach/spaces.h new file mode 100644 index 0000000..39a4d72 --- /dev/null +++ b/arch/mips/pmcs-msp71xx/include/mach/spaces.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/pmcs-msp71xx/include/mach/topology.h b/arch/mips/pmcs-msp71xx/include/mach/topology.h new file mode 100644 index 0000000..86e585b --- /dev/null +++ b/arch/mips/pmcs-msp71xx/include/mach/topology.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-pmcs-msp71xx/war.h b/arch/mips/pmcs-msp71xx/include/mach/war.h similarity index 100% rename from arch/mips/include/asm/mach-pmcs-msp71xx/war.h rename to arch/mips/pmcs-msp71xx/include/mach/war.h diff --git a/arch/mips/pmcs-msp71xx/msp_elb.c b/arch/mips/pmcs-msp71xx/msp_elb.c index 3e96410..540217a 100644 --- a/arch/mips/pmcs-msp71xx/msp_elb.c +++ b/arch/mips/pmcs-msp71xx/msp_elb.c @@ -28,7 +28,7 @@ #include #include -#include +#include static int __init msp_elb_setup(void) { diff --git a/arch/mips/pmcs-msp71xx/msp_eth.c b/arch/mips/pmcs-msp71xx/msp_eth.c index 15679b4..b86fb63 100644 --- a/arch/mips/pmcs-msp71xx/msp_eth.c +++ b/arch/mips/pmcs-msp71xx/msp_eth.c @@ -29,9 +29,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #define MSP_ETHERNET_GPIO0 14 diff --git a/arch/mips/pmcs-msp71xx/msp_hwbutton.c b/arch/mips/pmcs-msp71xx/msp_hwbutton.c index bb57ed9..cf53cde 100644 --- a/arch/mips/pmcs-msp71xx/msp_hwbutton.c +++ b/arch/mips/pmcs-msp71xx/msp_hwbutton.c @@ -29,9 +29,9 @@ #include #include -#include -#include -#include +#include +#include +#include /* For hwbutton_interrupt->initial_state */ #define HWBUTTON_HI 0x1 diff --git a/arch/mips/pmcs-msp71xx/msp_irq.c b/arch/mips/pmcs-msp71xx/msp_irq.c index d525cc9..9026969 100644 --- a/arch/mips/pmcs-msp71xx/msp_irq.c +++ b/arch/mips/pmcs-msp71xx/msp_irq.c @@ -18,7 +18,7 @@ #include #include -#include +#include /* SLP bases systems */ extern void msp_slp_irq_init(void); diff --git a/arch/mips/pmcs-msp71xx/msp_irq_cic.c b/arch/mips/pmcs-msp71xx/msp_irq_cic.c index 0706010..623fcd6 100644 --- a/arch/mips/pmcs-msp71xx/msp_irq_cic.c +++ b/arch/mips/pmcs-msp71xx/msp_irq_cic.c @@ -13,8 +13,8 @@ #include -#include -#include +#include +#include /* * External API diff --git a/arch/mips/pmcs-msp71xx/msp_irq_per.c b/arch/mips/pmcs-msp71xx/msp_irq_per.c index b284412..3a62427 100644 --- a/arch/mips/pmcs-msp71xx/msp_irq_per.c +++ b/arch/mips/pmcs-msp71xx/msp_irq_per.c @@ -13,8 +13,8 @@ #include -#include -#include +#include +#include /* diff --git a/arch/mips/pmcs-msp71xx/msp_irq_slp.c b/arch/mips/pmcs-msp71xx/msp_irq_slp.c index 097a5fd..38b74b3 100644 --- a/arch/mips/pmcs-msp71xx/msp_irq_slp.c +++ b/arch/mips/pmcs-msp71xx/msp_irq_slp.c @@ -13,8 +13,8 @@ #include -#include -#include +#include +#include static inline void unmask_msp_slp_irq(struct irq_data *d) { diff --git a/arch/mips/pmcs-msp71xx/msp_pci.c b/arch/mips/pmcs-msp71xx/msp_pci.c index 428dea2..08bac78 100644 --- a/arch/mips/pmcs-msp71xx/msp_pci.c +++ b/arch/mips/pmcs-msp71xx/msp_pci.c @@ -26,8 +26,8 @@ #include -#include -#include +#include +#include extern void msp_pci_init(void); diff --git a/arch/mips/pmcs-msp71xx/msp_prom.c b/arch/mips/pmcs-msp71xx/msp_prom.c index 800a21b..3f78ac8 100644 --- a/arch/mips/pmcs-msp71xx/msp_prom.c +++ b/arch/mips/pmcs-msp71xx/msp_prom.c @@ -47,8 +47,8 @@ #include #include -#include -#include +#include +#include /* global PROM environment variables and pointers */ int prom_argc; diff --git a/arch/mips/pmcs-msp71xx/msp_serial.c b/arch/mips/pmcs-msp71xx/msp_serial.c index 940c684..d804d78 100644 --- a/arch/mips/pmcs-msp71xx/msp_serial.c +++ b/arch/mips/pmcs-msp71xx/msp_serial.c @@ -35,9 +35,9 @@ #include #include -#include -#include -#include +#include +#include +#include struct msp_uart_data { int last_lcr; diff --git a/arch/mips/pmcs-msp71xx/msp_setup.c b/arch/mips/pmcs-msp71xx/msp_setup.c index d1e59ce..c7725b3 100644 --- a/arch/mips/pmcs-msp71xx/msp_setup.c +++ b/arch/mips/pmcs-msp71xx/msp_setup.c @@ -16,11 +16,11 @@ #include #include -#include -#include +#include +#include #if defined(CONFIG_PMC_MSP7120_GW) -#include +#include #define MSP_BOARD_RESET_GPIO 9 #endif diff --git a/arch/mips/pmcs-msp71xx/msp_time.c b/arch/mips/pmcs-msp71xx/msp_time.c index 9c62982..f8a1027 100644 --- a/arch/mips/pmcs-msp71xx/msp_time.c +++ b/arch/mips/pmcs-msp71xx/msp_time.c @@ -20,9 +20,9 @@ #include #include -#include -#include -#include +#include +#include +#include #define get_current_vpe() \ ((read_c0_tcbind() >> TCBIND_CURVPE_SHIFT) & TCBIND_CURVPE) diff --git a/arch/mips/pmcs-msp71xx/msp_usb.c b/arch/mips/pmcs-msp71xx/msp_usb.c index d38ac70..f12ce4e 100644 --- a/arch/mips/pmcs-msp71xx/msp_usb.c +++ b/arch/mips/pmcs-msp71xx/msp_usb.c @@ -31,10 +31,10 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include #if defined(CONFIG_USB_EHCI_HCD) diff --git a/drivers/mtd/maps/pmcmsp-flash.c b/drivers/mtd/maps/pmcmsp-flash.c index 2051f28..8657034 100644 --- a/drivers/mtd/maps/pmcmsp-flash.c +++ b/drivers/mtd/maps/pmcmsp-flash.c @@ -38,8 +38,8 @@ #include -#include -#include +#include +#include static struct mtd_info **msp_flash; From patchwork Mon Mar 30 09:00:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bibo Mao X-Patchwork-Id: 11464989 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 71360159A for ; Mon, 30 Mar 2020 09:00:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 44954206CC for ; Mon, 30 Mar 2020 09:00:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729543AbgC3JAZ (ORCPT ); Mon, 30 Mar 2020 05:00:25 -0400 Received: from mail.loongson.cn ([114.242.206.163]:33744 "EHLO loongson.cn" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729768AbgC3JAZ (ORCPT ); Mon, 30 Mar 2020 05:00:25 -0400 Received: from kvm-dev1.localdomain (unknown [10.2.5.134]) by mail.loongson.cn (Coremail) with SMTP id AQAAf9DxL94etYFe_JkhAA--.20S2; Mon, 30 Mar 2020 17:00:14 +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 28/39] MIPS: pnx833x: Add header file path prefix Date: Mon, 30 Mar 2020 05:00:14 -0400 Message-Id: <1585558814-31302-1-git-send-email-maobibo@loongson.cn> X-Mailer: git-send-email 1.8.3.1 X-CM-TRANSID: AQAAf9DxL94etYFe_JkhAA--.20S2 X-Coremail-Antispam: 1UD129KBjvJXoW3Cw15GF15KF4DuFyUtw4Utwb_yoWkXF47pa 1DC3Wvkr4j9w1Uur1fZFy2vwsxJan8GrZ0yryF9340v3Waq3W5JFs5Jrs8Ar97XFWqg3W8 uFW3Xr1UJrsYvw7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUkab7Iv0xC_Kw4lb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rw A2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Xr0_Ar1l84ACjcxK6xII jxv20xvEc7CjxVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26r4UJVWxJr1l84ACjc xK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVAC Y4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1q6rW5McIj6I8E87Iv67AKxVWxJV W8Jr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JMxkIecxEwVCm-wCF04k2 0xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI 8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2Ij64vIr41l IxAIcVC0I7IYx2IY67AKxVW8JVW5JwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Cr0_Gr1UMI IF0xvE42xK8VAvwI8IcIk0rVWUCVW8JwCI42IY6I8E87Iv67AKxVWxJVW8Jr1lIxAIcVC2 z280aVCY1x0267AKxVW8Jr0_Cr1UYxBIdaVFxhVjvjDU0xZFpf9x07beWl9UUUUU= 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-pnx833x to arch/mips/pnx833x/include/mach Signed-off-by: bibo mao --- arch/mips/Kconfig | 1 + arch/mips/pnx833x/Platform | 2 +- arch/mips/pnx833x/common/interrupts.c | 6 +++--- arch/mips/pnx833x/common/platform.c | 6 +++--- arch/mips/pnx833x/common/reset.c | 2 +- arch/mips/pnx833x/common/setup.c | 4 ++-- arch/mips/pnx833x/include/mach/cpu-feature-overrides.h | 2 ++ arch/mips/{include/asm/mach-pnx833x => pnx833x/include/mach}/gpio.h | 2 +- arch/mips/pnx833x/include/mach/ioremap.h | 2 ++ .../asm/mach-pnx833x => pnx833x/include/mach}/irq-mapping.h | 2 +- arch/mips/{include/asm/mach-pnx833x => pnx833x/include/mach}/irq.h | 0 arch/mips/pnx833x/include/mach/kernel-entry-init.h | 2 ++ arch/mips/pnx833x/include/mach/kmalloc.h | 2 ++ arch/mips/pnx833x/include/mach/mangle-port.h | 2 ++ arch/mips/pnx833x/include/mach/mc146818rtc.h | 2 ++ .../{include/asm/mach-pnx833x => pnx833x/include/mach}/pnx833x.h | 0 arch/mips/pnx833x/include/mach/spaces.h | 2 ++ arch/mips/pnx833x/include/mach/topology.h | 2 ++ arch/mips/pnx833x/include/mach/war.h | 2 ++ arch/mips/pnx833x/stb22x/board.c | 4 ++-- drivers/watchdog/pnx833x_wdt.c | 2 +- 21 files changed, 34 insertions(+), 15 deletions(-) create mode 100644 arch/mips/pnx833x/include/mach/cpu-feature-overrides.h rename arch/mips/{include/asm/mach-pnx833x => pnx833x/include/mach}/gpio.h (99%) create mode 100644 arch/mips/pnx833x/include/mach/ioremap.h rename arch/mips/{include/asm/mach-pnx833x => pnx833x/include/mach}/irq-mapping.h (99%) rename arch/mips/{include/asm/mach-pnx833x => pnx833x/include/mach}/irq.h (100%) create mode 100644 arch/mips/pnx833x/include/mach/kernel-entry-init.h create mode 100644 arch/mips/pnx833x/include/mach/kmalloc.h create mode 100644 arch/mips/pnx833x/include/mach/mangle-port.h create mode 100644 arch/mips/pnx833x/include/mach/mc146818rtc.h rename arch/mips/{include/asm/mach-pnx833x => pnx833x/include/mach}/pnx833x.h (100%) create mode 100644 arch/mips/pnx833x/include/mach/spaces.h create mode 100644 arch/mips/pnx833x/include/mach/topology.h create mode 100644 arch/mips/pnx833x/include/mach/war.h diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 56d6519..9a149e7 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -1386,6 +1386,7 @@ config SOC_PNX833X select SYS_SUPPORTS_BIG_ENDIAN select SYS_SUPPORTS_MIPS16 select CPU_MIPSR2_IRQ_VI + select HAVE_MACH_HEAD_FILES config SOC_PNX8335 bool diff --git a/arch/mips/pnx833x/Platform b/arch/mips/pnx833x/Platform index 2872606..47b905e 100644 --- a/arch/mips/pnx833x/Platform +++ b/arch/mips/pnx833x/Platform @@ -1,5 +1,5 @@ # NXP STB225 platform-$(CONFIG_SOC_PNX833X) += pnx833x/ -cflags-$(CONFIG_SOC_PNX833X) += -I$(srctree)/arch/mips/include/asm/mach-pnx833x +cflags-$(CONFIG_SOC_PNX833X) += -I$(srctree)/arch/mips/pnx833x/include load-$(CONFIG_NXP_STB220) += 0xffffffff80001000 load-$(CONFIG_NXP_STB225) += 0xffffffff80001000 diff --git a/arch/mips/pnx833x/common/interrupts.c b/arch/mips/pnx833x/common/interrupts.c index 2fbbabc..66f3a03 100644 --- a/arch/mips/pnx833x/common/interrupts.c +++ b/arch/mips/pnx833x/common/interrupts.c @@ -13,9 +13,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include static int mips_cpu_timer_irq; diff --git a/arch/mips/pnx833x/common/platform.c b/arch/mips/pnx833x/common/platform.c index 5fa0373..fbaf109 100644 --- a/arch/mips/pnx833x/common/platform.c +++ b/arch/mips/pnx833x/common/platform.c @@ -19,9 +19,9 @@ #include #include -#include -#include -#include +#include +#include +#include static u64 uart_dmamask = DMA_BIT_MASK(32); diff --git a/arch/mips/pnx833x/common/reset.c b/arch/mips/pnx833x/common/reset.c index b48e83b..9bd5b2a 100644 --- a/arch/mips/pnx833x/common/reset.c +++ b/arch/mips/pnx833x/common/reset.c @@ -10,7 +10,7 @@ * Nikita Youshchenko , based on PNX8550 code. */ #include -#include +#include void pnx833x_machine_restart(char *command) { diff --git a/arch/mips/pnx833x/common/setup.c b/arch/mips/pnx833x/common/setup.c index abf68d9..b188c66 100644 --- a/arch/mips/pnx833x/common/setup.c +++ b/arch/mips/pnx833x/common/setup.c @@ -15,8 +15,8 @@ #include #include #include -#include -#include +#include +#include extern void pnx833x_board_setup(void); extern void pnx833x_machine_restart(char *); diff --git a/arch/mips/pnx833x/include/mach/cpu-feature-overrides.h b/arch/mips/pnx833x/include/mach/cpu-feature-overrides.h new file mode 100644 index 0000000..f3e0e12 --- /dev/null +++ b/arch/mips/pnx833x/include/mach/cpu-feature-overrides.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-pnx833x/gpio.h b/arch/mips/pnx833x/include/mach/gpio.h similarity index 99% rename from arch/mips/include/asm/mach-pnx833x/gpio.h rename to arch/mips/pnx833x/include/mach/gpio.h index 85b5b8e..c60decb0 100644 --- a/arch/mips/include/asm/mach-pnx833x/gpio.h +++ b/arch/mips/pnx833x/include/mach/gpio.h @@ -17,7 +17,7 @@ - including locking between different uses */ -#include +#include #define SET_REG_BIT(reg, bit) do { (reg |= (1 << (bit))); } while (0) #define CLEAR_REG_BIT(reg, bit) do { (reg &= ~(1 << (bit))); } while (0) diff --git a/arch/mips/pnx833x/include/mach/ioremap.h b/arch/mips/pnx833x/include/mach/ioremap.h new file mode 100644 index 0000000..2369393 --- /dev/null +++ b/arch/mips/pnx833x/include/mach/ioremap.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-pnx833x/irq-mapping.h b/arch/mips/pnx833x/include/mach/irq-mapping.h similarity index 99% rename from arch/mips/include/asm/mach-pnx833x/irq-mapping.h rename to arch/mips/pnx833x/include/mach/irq-mapping.h index 32d8063..ebb2d66 100644 --- a/arch/mips/include/asm/mach-pnx833x/irq-mapping.h +++ b/arch/mips/pnx833x/include/mach/irq-mapping.h @@ -24,7 +24,7 @@ * numbers 65..80 for (virtual) GPIO interrupts. * */ -#include +#include #define PNX833X_TIMER_IRQ (MIPS_CPU_IRQ_BASE + 7) diff --git a/arch/mips/include/asm/mach-pnx833x/irq.h b/arch/mips/pnx833x/include/mach/irq.h similarity index 100% rename from arch/mips/include/asm/mach-pnx833x/irq.h rename to arch/mips/pnx833x/include/mach/irq.h diff --git a/arch/mips/pnx833x/include/mach/kernel-entry-init.h b/arch/mips/pnx833x/include/mach/kernel-entry-init.h new file mode 100644 index 0000000..19b872be --- /dev/null +++ b/arch/mips/pnx833x/include/mach/kernel-entry-init.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/pnx833x/include/mach/kmalloc.h b/arch/mips/pnx833x/include/mach/kmalloc.h new file mode 100644 index 0000000..4f056db --- /dev/null +++ b/arch/mips/pnx833x/include/mach/kmalloc.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/pnx833x/include/mach/mangle-port.h b/arch/mips/pnx833x/include/mach/mangle-port.h new file mode 100644 index 0000000..b9736e3 --- /dev/null +++ b/arch/mips/pnx833x/include/mach/mangle-port.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/pnx833x/include/mach/mc146818rtc.h b/arch/mips/pnx833x/include/mach/mc146818rtc.h new file mode 100644 index 0000000..7284af8 --- /dev/null +++ b/arch/mips/pnx833x/include/mach/mc146818rtc.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-pnx833x/pnx833x.h b/arch/mips/pnx833x/include/mach/pnx833x.h similarity index 100% rename from arch/mips/include/asm/mach-pnx833x/pnx833x.h rename to arch/mips/pnx833x/include/mach/pnx833x.h diff --git a/arch/mips/pnx833x/include/mach/spaces.h b/arch/mips/pnx833x/include/mach/spaces.h new file mode 100644 index 0000000..39a4d72 --- /dev/null +++ b/arch/mips/pnx833x/include/mach/spaces.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/pnx833x/include/mach/topology.h b/arch/mips/pnx833x/include/mach/topology.h new file mode 100644 index 0000000..86e585b --- /dev/null +++ b/arch/mips/pnx833x/include/mach/topology.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/pnx833x/include/mach/war.h b/arch/mips/pnx833x/include/mach/war.h new file mode 100644 index 0000000..5b0422a --- /dev/null +++ b/arch/mips/pnx833x/include/mach/war.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/pnx833x/stb22x/board.c b/arch/mips/pnx833x/stb22x/board.c index 93d8e7b..14c333c 100644 --- a/arch/mips/pnx833x/stb22x/board.c +++ b/arch/mips/pnx833x/stb22x/board.c @@ -12,8 +12,8 @@ #include #include #include -#include -#include +#include +#include /* endianess twiddlers */ #define PNX8335_DEBUG0 0x4400 diff --git a/drivers/watchdog/pnx833x_wdt.c b/drivers/watchdog/pnx833x_wdt.c index 4097d07..18bb8a5 100644 --- a/drivers/watchdog/pnx833x_wdt.c +++ b/drivers/watchdog/pnx833x_wdt.c @@ -26,7 +26,7 @@ #include #include #include -#include +#include #define WATCHDOG_TIMEOUT 30 /* 30 sec Maximum timeout */ #define WATCHDOG_COUNT_FREQUENCY 68000000U /* Watchdog counts at 68MHZ. */ From patchwork Mon Mar 30 09:00:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bibo Mao X-Patchwork-Id: 11464993 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 D14AC159A for ; Mon, 30 Mar 2020 09:00:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AEE4E20658 for ; Mon, 30 Mar 2020 09:00:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729846AbgC3JAe (ORCPT ); Mon, 30 Mar 2020 05:00:34 -0400 Received: from mail.loongson.cn ([114.242.206.163]:33780 "EHLO loongson.cn" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729768AbgC3JAd (ORCPT ); Mon, 30 Mar 2020 05:00:33 -0400 Received: from kvm-dev1.localdomain (unknown [10.2.5.134]) by mail.loongson.cn (Coremail) with SMTP id AQAAf9Dxv90ltYFeAZohAA--.24S2; Mon, 30 Mar 2020 17:00:21 +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 29/39] MIPS: vr41xx: Add header file path prefix Date: Mon, 30 Mar 2020 05:00:21 -0400 Message-Id: <1585558821-5350-1-git-send-email-maobibo@loongson.cn> X-Mailer: git-send-email 1.8.3.1 X-CM-TRANSID: AQAAf9Dxv90ltYFeAZohAA--.24S2 X-Coremail-Antispam: 1UD129KBjvJXoW3GF1xtw48AryrZFyrXw4DCFg_yoWxJw1rpa nrA3WkKF4UuryjkryrZFy2qr43Jan8GrWq9ry5u3WUZ3WSqF1UJFs5Ar90yFyxXF45t3WF gFZIgr1Utw4v9aUanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUkIb7Iv0xC_KF4lb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rw A2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Xr0_Ar1l84ACjcxK6xII jxv20xvEc7CjxVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26F4UJVW0owA2z4x0Y4 vEx4A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xv F2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jw0_WrylYx0Ex4A2jsIE14v26F4j6r 4UJwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lc2xSY4AK6svPMxAIw28I cxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2 IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAVWUtwCIc40Y0x0EwIxGrwCI 42IY6xIIjxv20xvE14v26r4j6ryUMIIF0xvE2Ix0cI8IcVCY1x0267AKxVWxJVW8Jr1lIx AIcVCF04k26cxKx2IYs7xG6r1I6r4UMIIF0xvEx4A2jsIE14v26F4j6r4UJwCI42IY6I8E 87Iv6xkF7I0E14v26r4UJVWxJrUvcSsGvfC2KfnxnUUI43ZEXa7IU8IeHDUUUUU== 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-vr41xx to arch/mips/vr41xx/include/mach Signed-off-by: bibo mao --- arch/mips/Kconfig | 1 + arch/mips/vr41xx/Platform | 2 +- arch/mips/vr41xx/include/mach/cpu-feature-overrides.h | 2 ++ arch/mips/vr41xx/include/mach/ide.h | 2 ++ arch/mips/vr41xx/include/mach/ioremap.h | 2 ++ arch/mips/{include/asm/mach-vr41xx => vr41xx/include/mach}/irq.h | 0 arch/mips/vr41xx/include/mach/kernel-entry-init.h | 2 ++ arch/mips/vr41xx/include/mach/kmalloc.h | 2 ++ arch/mips/vr41xx/include/mach/mangle-port.h | 2 ++ arch/mips/vr41xx/include/mach/mc146818rtc.h | 2 ++ arch/mips/vr41xx/include/mach/spaces.h | 2 ++ arch/mips/vr41xx/include/mach/topology.h | 2 ++ arch/mips/vr41xx/include/mach/war.h | 2 ++ 13 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 arch/mips/vr41xx/include/mach/cpu-feature-overrides.h create mode 100644 arch/mips/vr41xx/include/mach/ide.h create mode 100644 arch/mips/vr41xx/include/mach/ioremap.h rename arch/mips/{include/asm/mach-vr41xx => vr41xx/include/mach}/irq.h (100%) create mode 100644 arch/mips/vr41xx/include/mach/kernel-entry-init.h create mode 100644 arch/mips/vr41xx/include/mach/kmalloc.h create mode 100644 arch/mips/vr41xx/include/mach/mangle-port.h create mode 100644 arch/mips/vr41xx/include/mach/mc146818rtc.h create mode 100644 arch/mips/vr41xx/include/mach/spaces.h create mode 100644 arch/mips/vr41xx/include/mach/topology.h create mode 100644 arch/mips/vr41xx/include/mach/war.h diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 9a149e7..30b520c 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -625,6 +625,7 @@ config MACH_VR41XX select SYS_HAS_CPU_VR41XX select SYS_SUPPORTS_MIPS16 select GPIOLIB + select HAVE_MACH_HEAD_FILES config NXP_STB220 bool "NXP STB220 board" diff --git a/arch/mips/vr41xx/Platform b/arch/mips/vr41xx/Platform index b6c8d5c..d21dcc60 100644 --- a/arch/mips/vr41xx/Platform +++ b/arch/mips/vr41xx/Platform @@ -2,7 +2,7 @@ # NEC VR4100 series based machines # platform-$(CONFIG_MACH_VR41XX) += vr41xx/common/ -cflags-$(CONFIG_MACH_VR41XX) += -I$(srctree)/arch/mips/include/asm/mach-vr41xx +cflags-$(CONFIG_MACH_VR41XX) += -I$(srctree)/arch/mips/vr41xx/include # # CASIO CASSIPEIA E-55/65 (VR4111) diff --git a/arch/mips/vr41xx/include/mach/cpu-feature-overrides.h b/arch/mips/vr41xx/include/mach/cpu-feature-overrides.h new file mode 100644 index 0000000..f3e0e12 --- /dev/null +++ b/arch/mips/vr41xx/include/mach/cpu-feature-overrides.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/vr41xx/include/mach/ide.h b/arch/mips/vr41xx/include/mach/ide.h new file mode 100644 index 0000000..1251c0c --- /dev/null +++ b/arch/mips/vr41xx/include/mach/ide.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/vr41xx/include/mach/ioremap.h b/arch/mips/vr41xx/include/mach/ioremap.h new file mode 100644 index 0000000..2369393 --- /dev/null +++ b/arch/mips/vr41xx/include/mach/ioremap.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-vr41xx/irq.h b/arch/mips/vr41xx/include/mach/irq.h similarity index 100% rename from arch/mips/include/asm/mach-vr41xx/irq.h rename to arch/mips/vr41xx/include/mach/irq.h diff --git a/arch/mips/vr41xx/include/mach/kernel-entry-init.h b/arch/mips/vr41xx/include/mach/kernel-entry-init.h new file mode 100644 index 0000000..19b872be --- /dev/null +++ b/arch/mips/vr41xx/include/mach/kernel-entry-init.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/vr41xx/include/mach/kmalloc.h b/arch/mips/vr41xx/include/mach/kmalloc.h new file mode 100644 index 0000000..4f056db --- /dev/null +++ b/arch/mips/vr41xx/include/mach/kmalloc.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/vr41xx/include/mach/mangle-port.h b/arch/mips/vr41xx/include/mach/mangle-port.h new file mode 100644 index 0000000..b9736e3 --- /dev/null +++ b/arch/mips/vr41xx/include/mach/mangle-port.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/vr41xx/include/mach/mc146818rtc.h b/arch/mips/vr41xx/include/mach/mc146818rtc.h new file mode 100644 index 0000000..7284af8 --- /dev/null +++ b/arch/mips/vr41xx/include/mach/mc146818rtc.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/vr41xx/include/mach/spaces.h b/arch/mips/vr41xx/include/mach/spaces.h new file mode 100644 index 0000000..39a4d72 --- /dev/null +++ b/arch/mips/vr41xx/include/mach/spaces.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/vr41xx/include/mach/topology.h b/arch/mips/vr41xx/include/mach/topology.h new file mode 100644 index 0000000..86e585b --- /dev/null +++ b/arch/mips/vr41xx/include/mach/topology.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/vr41xx/include/mach/war.h b/arch/mips/vr41xx/include/mach/war.h new file mode 100644 index 0000000..5b0422a --- /dev/null +++ b/arch/mips/vr41xx/include/mach/war.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include From patchwork Mon Mar 30 09:00:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bibo Mao X-Patchwork-Id: 11464997 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 9E56781 for ; Mon, 30 Mar 2020 09:00:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 73AAA20658 for ; Mon, 30 Mar 2020 09:00:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729928AbgC3JAb (ORCPT ); Mon, 30 Mar 2020 05:00:31 -0400 Received: from mail.loongson.cn ([114.242.206.163]:33804 "EHLO loongson.cn" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729829AbgC3JAb (ORCPT ); Mon, 30 Mar 2020 05:00:31 -0400 Received: from kvm-dev1.localdomain (unknown [10.2.5.134]) by mail.loongson.cn (Coremail) with SMTP id AQAAf9Ax1ukrtYFeA5ohAA--.23S2; Mon, 30 Mar 2020 17:00:27 +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 30/39] MIPS: txx9: Add header file path prefix Date: Mon, 30 Mar 2020 05:00:26 -0400 Message-Id: <1585558826-12235-1-git-send-email-maobibo@loongson.cn> X-Mailer: git-send-email 1.8.3.1 X-CM-TRANSID: AQAAf9Ax1ukrtYFeA5ohAA--.23S2 X-Coremail-Antispam: 1UD129KBjvAXoW3ZryUXFWxtF47CrW3ur13CFg_yoW8JrWkto Z3KF1DKr4xJFZ3JF45uFy3CF18Zr1vqrsYq34rXrWUJasxZa47Aw1IgF1jgF4YkF1xJwnr WrW5ZryDJwnYqFWkn29KB7ZKAUJUUUU8529EdanIXcx71UUUUU7v73VFW2AGmfu7bjvjm3 AaLaJ3UjIYCTnIWjp_UUUYn7k0a2IF6w4xM7kC6x804xWl14x267AKxVWUJVW8JwAFc2x0 x2IEx4CE42xK8VAvwI8IcIk0rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2ocxC64kIII0Yj4 1l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26ryj6F1UM28EF7xvwVC0 I7IYx2IY6xkF7I0E14v26r4UJVWxJr1l84ACjcxK6I8E87Iv67AKxVWxJr0_GcWl84ACjc xK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVAC Y4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1q6rW5McIj6I8E87Iv67AKxVW8Jr 0_Cr1UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCY02Avz4vE-syl42xK 82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGw C20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r1DMIIYrxkI7VAKI48J MIIF0xvE2Ix0cI8IcVAFwI0_Gr0_Xr1lIxAIcVC0I7IYx2IY6xkF7I0E14v26F4j6r4UJw CI42IY6xAIw20EY4v20xvaj40_JFI_Gr1lIxAIcVC2z280aVAFwI0_Cr0_Gr1UMIIF0xvE x4A2jsIEc7CjxVAFwI0_Gr1j6F4UJbIYCTnIWIevJa73UjIFyTuYvjxUccTmDUUUU 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-tx39xx to arch/mips/txx9/tx39xx/include/mach on tx39xx platform. Remove header files from arch/mips/include/asm/mach-tx49xx to arch/mips/txx9/tx49xx/include/mach on tx49xx platform. Signed-off-by: bibo mao --- arch/mips/include/asm/txx9irq.h | 2 +- arch/mips/txx9/Kconfig | 2 ++ arch/mips/txx9/Platform | 4 ++-- arch/mips/txx9/tx39xx/include/mach/cpu-feature-overrides.h | 2 ++ arch/mips/txx9/tx39xx/include/mach/ide.h | 2 ++ .../{include/asm/mach-tx39xx => txx9/tx39xx/include/mach}/ioremap.h | 0 arch/mips/txx9/tx39xx/include/mach/irq.h | 2 ++ arch/mips/txx9/tx39xx/include/mach/kernel-entry-init.h | 2 ++ arch/mips/txx9/tx39xx/include/mach/kmalloc.h | 2 ++ .../asm/mach-tx39xx => txx9/tx39xx/include/mach}/mangle-port.h | 0 arch/mips/txx9/tx39xx/include/mach/mc146818rtc.h | 2 ++ .../{include/asm/mach-tx39xx => txx9/tx39xx/include/mach}/spaces.h | 0 arch/mips/txx9/tx39xx/include/mach/topology.h | 2 ++ arch/mips/txx9/tx39xx/include/mach/war.h | 2 ++ .../mach-tx49xx => txx9/tx49xx/include/mach}/cpu-feature-overrides.h | 0 arch/mips/txx9/tx49xx/include/mach/ide.h | 2 ++ .../{include/asm/mach-tx49xx => txx9/tx49xx/include/mach}/ioremap.h | 0 arch/mips/txx9/tx49xx/include/mach/irq.h | 2 ++ arch/mips/txx9/tx49xx/include/mach/kernel-entry-init.h | 2 ++ .../{include/asm/mach-tx49xx => txx9/tx49xx/include/mach}/kmalloc.h | 0 .../asm/mach-tx49xx => txx9/tx49xx/include/mach}/mangle-port.h | 0 arch/mips/txx9/tx49xx/include/mach/mc146818rtc.h | 2 ++ .../{include/asm/mach-tx49xx => txx9/tx49xx/include/mach}/spaces.h | 0 arch/mips/txx9/tx49xx/include/mach/topology.h | 2 ++ arch/mips/{include/asm/mach-tx49xx => txx9/tx49xx/include/mach}/war.h | 0 25 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 arch/mips/txx9/tx39xx/include/mach/cpu-feature-overrides.h create mode 100644 arch/mips/txx9/tx39xx/include/mach/ide.h rename arch/mips/{include/asm/mach-tx39xx => txx9/tx39xx/include/mach}/ioremap.h (100%) create mode 100644 arch/mips/txx9/tx39xx/include/mach/irq.h create mode 100644 arch/mips/txx9/tx39xx/include/mach/kernel-entry-init.h create mode 100644 arch/mips/txx9/tx39xx/include/mach/kmalloc.h rename arch/mips/{include/asm/mach-tx39xx => txx9/tx39xx/include/mach}/mangle-port.h (100%) create mode 100644 arch/mips/txx9/tx39xx/include/mach/mc146818rtc.h rename arch/mips/{include/asm/mach-tx39xx => txx9/tx39xx/include/mach}/spaces.h (100%) create mode 100644 arch/mips/txx9/tx39xx/include/mach/topology.h create mode 100644 arch/mips/txx9/tx39xx/include/mach/war.h rename arch/mips/{include/asm/mach-tx49xx => txx9/tx49xx/include/mach}/cpu-feature-overrides.h (100%) create mode 100644 arch/mips/txx9/tx49xx/include/mach/ide.h rename arch/mips/{include/asm/mach-tx49xx => txx9/tx49xx/include/mach}/ioremap.h (100%) create mode 100644 arch/mips/txx9/tx49xx/include/mach/irq.h create mode 100644 arch/mips/txx9/tx49xx/include/mach/kernel-entry-init.h rename arch/mips/{include/asm/mach-tx49xx => txx9/tx49xx/include/mach}/kmalloc.h (100%) rename arch/mips/{include/asm/mach-tx49xx => txx9/tx49xx/include/mach}/mangle-port.h (100%) create mode 100644 arch/mips/txx9/tx49xx/include/mach/mc146818rtc.h rename arch/mips/{include/asm/mach-tx49xx => txx9/tx49xx/include/mach}/spaces.h (100%) create mode 100644 arch/mips/txx9/tx49xx/include/mach/topology.h rename arch/mips/{include/asm/mach-tx49xx => txx9/tx49xx/include/mach}/war.h (100%) diff --git a/arch/mips/include/asm/txx9irq.h b/arch/mips/include/asm/txx9irq.h index 68a6650..d45b837 100644 --- a/arch/mips/include/asm/txx9irq.h +++ b/arch/mips/include/asm/txx9irq.h @@ -9,7 +9,7 @@ #ifndef __ASM_TXX9IRQ_H #define __ASM_TXX9IRQ_H -#include +#include #ifdef CONFIG_IRQ_MIPS_CPU #define TXX9_IRQ_BASE (MIPS_CPU_IRQ_BASE + 8) diff --git a/arch/mips/txx9/Kconfig b/arch/mips/txx9/Kconfig index 9a22a18..12dbce7 100644 --- a/arch/mips/txx9/Kconfig +++ b/arch/mips/txx9/Kconfig @@ -3,6 +3,7 @@ config MACH_TX39XX bool select MACH_TXX9 select SYS_HAS_CPU_TX39XX + select HAVE_MACH_HEAD_FILES config MACH_TX49XX bool @@ -12,6 +13,7 @@ config MACH_TX49XX select IRQ_MIPS_CPU select SYS_HAS_CPU_TX49XX select SYS_SUPPORTS_64BIT_KERNEL + select HAVE_MACH_HEAD_FILES config MACH_TXX9 bool diff --git a/arch/mips/txx9/Platform b/arch/mips/txx9/Platform index a176d1fd..e17141d 100644 --- a/arch/mips/txx9/Platform +++ b/arch/mips/txx9/Platform @@ -2,9 +2,9 @@ platform-$(CONFIG_MACH_TX39XX) += txx9/ platform-$(CONFIG_MACH_TX49XX) += txx9/ cflags-$(CONFIG_MACH_TX39XX) += \ - -I$(srctree)/arch/mips/include/asm/mach-tx39xx + -I$(srctree)/arch/mips/txx9/tx39xx/include cflags-$(CONFIG_MACH_TX49XX) += \ - -I$(srctree)/arch/mips/include/asm/mach-tx49xx + -I$(srctree)/arch/mips/txx9/tx49xx/include load-$(CONFIG_MACH_TX39XX) += 0xffffffff80050000 load-$(CONFIG_MACH_TX49XX) += 0xffffffff80100000 diff --git a/arch/mips/txx9/tx39xx/include/mach/cpu-feature-overrides.h b/arch/mips/txx9/tx39xx/include/mach/cpu-feature-overrides.h new file mode 100644 index 0000000..f3e0e12 --- /dev/null +++ b/arch/mips/txx9/tx39xx/include/mach/cpu-feature-overrides.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/txx9/tx39xx/include/mach/ide.h b/arch/mips/txx9/tx39xx/include/mach/ide.h new file mode 100644 index 0000000..1251c0c --- /dev/null +++ b/arch/mips/txx9/tx39xx/include/mach/ide.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-tx39xx/ioremap.h b/arch/mips/txx9/tx39xx/include/mach/ioremap.h similarity index 100% rename from arch/mips/include/asm/mach-tx39xx/ioremap.h rename to arch/mips/txx9/tx39xx/include/mach/ioremap.h diff --git a/arch/mips/txx9/tx39xx/include/mach/irq.h b/arch/mips/txx9/tx39xx/include/mach/irq.h new file mode 100644 index 0000000..bb5ccce --- /dev/null +++ b/arch/mips/txx9/tx39xx/include/mach/irq.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/txx9/tx39xx/include/mach/kernel-entry-init.h b/arch/mips/txx9/tx39xx/include/mach/kernel-entry-init.h new file mode 100644 index 0000000..19b872be --- /dev/null +++ b/arch/mips/txx9/tx39xx/include/mach/kernel-entry-init.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/txx9/tx39xx/include/mach/kmalloc.h b/arch/mips/txx9/tx39xx/include/mach/kmalloc.h new file mode 100644 index 0000000..4f056db --- /dev/null +++ b/arch/mips/txx9/tx39xx/include/mach/kmalloc.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-tx39xx/mangle-port.h b/arch/mips/txx9/tx39xx/include/mach/mangle-port.h similarity index 100% rename from arch/mips/include/asm/mach-tx39xx/mangle-port.h rename to arch/mips/txx9/tx39xx/include/mach/mangle-port.h diff --git a/arch/mips/txx9/tx39xx/include/mach/mc146818rtc.h b/arch/mips/txx9/tx39xx/include/mach/mc146818rtc.h new file mode 100644 index 0000000..7284af8 --- /dev/null +++ b/arch/mips/txx9/tx39xx/include/mach/mc146818rtc.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-tx39xx/spaces.h b/arch/mips/txx9/tx39xx/include/mach/spaces.h similarity index 100% rename from arch/mips/include/asm/mach-tx39xx/spaces.h rename to arch/mips/txx9/tx39xx/include/mach/spaces.h diff --git a/arch/mips/txx9/tx39xx/include/mach/topology.h b/arch/mips/txx9/tx39xx/include/mach/topology.h new file mode 100644 index 0000000..86e585b --- /dev/null +++ b/arch/mips/txx9/tx39xx/include/mach/topology.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/txx9/tx39xx/include/mach/war.h b/arch/mips/txx9/tx39xx/include/mach/war.h new file mode 100644 index 0000000..5b0422a --- /dev/null +++ b/arch/mips/txx9/tx39xx/include/mach/war.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-tx49xx/cpu-feature-overrides.h b/arch/mips/txx9/tx49xx/include/mach/cpu-feature-overrides.h similarity index 100% rename from arch/mips/include/asm/mach-tx49xx/cpu-feature-overrides.h rename to arch/mips/txx9/tx49xx/include/mach/cpu-feature-overrides.h diff --git a/arch/mips/txx9/tx49xx/include/mach/ide.h b/arch/mips/txx9/tx49xx/include/mach/ide.h new file mode 100644 index 0000000..1251c0c --- /dev/null +++ b/arch/mips/txx9/tx49xx/include/mach/ide.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-tx49xx/ioremap.h b/arch/mips/txx9/tx49xx/include/mach/ioremap.h similarity index 100% rename from arch/mips/include/asm/mach-tx49xx/ioremap.h rename to arch/mips/txx9/tx49xx/include/mach/ioremap.h diff --git a/arch/mips/txx9/tx49xx/include/mach/irq.h b/arch/mips/txx9/tx49xx/include/mach/irq.h new file mode 100644 index 0000000..bb5ccce --- /dev/null +++ b/arch/mips/txx9/tx49xx/include/mach/irq.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/txx9/tx49xx/include/mach/kernel-entry-init.h b/arch/mips/txx9/tx49xx/include/mach/kernel-entry-init.h new file mode 100644 index 0000000..19b872be --- /dev/null +++ b/arch/mips/txx9/tx49xx/include/mach/kernel-entry-init.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-tx49xx/kmalloc.h b/arch/mips/txx9/tx49xx/include/mach/kmalloc.h similarity index 100% rename from arch/mips/include/asm/mach-tx49xx/kmalloc.h rename to arch/mips/txx9/tx49xx/include/mach/kmalloc.h diff --git a/arch/mips/include/asm/mach-tx49xx/mangle-port.h b/arch/mips/txx9/tx49xx/include/mach/mangle-port.h similarity index 100% rename from arch/mips/include/asm/mach-tx49xx/mangle-port.h rename to arch/mips/txx9/tx49xx/include/mach/mangle-port.h diff --git a/arch/mips/txx9/tx49xx/include/mach/mc146818rtc.h b/arch/mips/txx9/tx49xx/include/mach/mc146818rtc.h new file mode 100644 index 0000000..7284af8 --- /dev/null +++ b/arch/mips/txx9/tx49xx/include/mach/mc146818rtc.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-tx49xx/spaces.h b/arch/mips/txx9/tx49xx/include/mach/spaces.h similarity index 100% rename from arch/mips/include/asm/mach-tx49xx/spaces.h rename to arch/mips/txx9/tx49xx/include/mach/spaces.h diff --git a/arch/mips/txx9/tx49xx/include/mach/topology.h b/arch/mips/txx9/tx49xx/include/mach/topology.h new file mode 100644 index 0000000..86e585b --- /dev/null +++ b/arch/mips/txx9/tx49xx/include/mach/topology.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-tx49xx/war.h b/arch/mips/txx9/tx49xx/include/mach/war.h similarity index 100% rename from arch/mips/include/asm/mach-tx49xx/war.h rename to arch/mips/txx9/tx49xx/include/mach/war.h From patchwork Mon Mar 30 09:00:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bibo Mao X-Patchwork-Id: 11464995 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 7018A159A for ; Mon, 30 Mar 2020 09:00:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4F0B720776 for ; Mon, 30 Mar 2020 09:00:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729822AbgC3JAi (ORCPT ); Mon, 30 Mar 2020 05:00:38 -0400 Received: from mail.loongson.cn ([114.242.206.163]:33844 "EHLO loongson.cn" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728759AbgC3JAh (ORCPT ); Mon, 30 Mar 2020 05:00:37 -0400 Received: from kvm-dev1.localdomain (unknown [10.2.5.134]) by mail.loongson.cn (Coremail) with SMTP id AQAAf9DxP2gxtYFeBZohAA--.15S2; Mon, 30 Mar 2020 17:00:33 +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 31/39] MIPS: sibyte: Add header file path prefix Date: Mon, 30 Mar 2020 05:00:33 -0400 Message-Id: <1585558833-12425-1-git-send-email-maobibo@loongson.cn> X-Mailer: git-send-email 1.8.3.1 X-CM-TRANSID: AQAAf9DxP2gxtYFeBZohAA--.15S2 X-Coremail-Antispam: 1UD129KBjvJXoW3JFy8AF45JrWrtr4rXw18Xwb_yoWxXFW3pa 1DA3WkKF4ruryUAw4rZF47WF43Ka98WrWjvFyYg34UZ3WIq3WUJrsayr98A34xJay8Ka18 WrZxXF1rtw4kZaDanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUkSb7Iv0xC_tr1lb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rw A2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Xr0_Ar1l84ACjcxK6xII jxv20xvEc7CjxVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26F4UJVW0owA2z4x0Y4 vEx4A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xv F2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jw0_WrylYx0Ex4A2jsIE14v26r4UJV WxJr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JMxkIecxEwVCm-wCF04k2 0xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI 8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2Ij64vIr41l IxAIcVC0I7IYx2IY67AKxVW5JVW7JwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJw CI42IY6xAIw20EY4v20xvaj40_JFI_Gr1lIxAIcVC2z280aVAFwI0_Cr0_Gr1UMIIF0xvE x4A2jsIEc7CjxVAFwI0_Gr1j6F4UJbIYCTnIWIevJa73UjIFyTuYvjxUcYL9UUUUU 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-sibyte to arch/mips/sibyte/include/mach Signed-off-by: bibo mao --- arch/mips/sibyte/Platform | 8 ++++---- .../mach-sibyte => sibyte/include/mach}/cpu-feature-overrides.h | 0 arch/mips/sibyte/include/mach/ide.h | 2 ++ arch/mips/sibyte/include/mach/ioremap.h | 2 ++ arch/mips/sibyte/include/mach/irq.h | 2 ++ arch/mips/sibyte/include/mach/kernel-entry-init.h | 2 ++ arch/mips/sibyte/include/mach/kmalloc.h | 2 ++ arch/mips/sibyte/include/mach/mangle-port.h | 2 ++ arch/mips/sibyte/include/mach/mc146818rtc.h | 2 ++ arch/mips/sibyte/include/mach/spaces.h | 2 ++ arch/mips/sibyte/include/mach/topology.h | 2 ++ arch/mips/{include/asm/mach-sibyte => sibyte/include/mach}/war.h | 0 12 files changed, 22 insertions(+), 4 deletions(-) rename arch/mips/{include/asm/mach-sibyte => sibyte/include/mach}/cpu-feature-overrides.h (100%) create mode 100644 arch/mips/sibyte/include/mach/ide.h create mode 100644 arch/mips/sibyte/include/mach/ioremap.h create mode 100644 arch/mips/sibyte/include/mach/irq.h create mode 100644 arch/mips/sibyte/include/mach/kernel-entry-init.h create mode 100644 arch/mips/sibyte/include/mach/kmalloc.h create mode 100644 arch/mips/sibyte/include/mach/mangle-port.h create mode 100644 arch/mips/sibyte/include/mach/mc146818rtc.h create mode 100644 arch/mips/sibyte/include/mach/spaces.h create mode 100644 arch/mips/sibyte/include/mach/topology.h rename arch/mips/{include/asm/mach-sibyte => sibyte/include/mach}/war.h (100%) diff --git a/arch/mips/sibyte/Platform b/arch/mips/sibyte/Platform index af11733..8b5c39e 100644 --- a/arch/mips/sibyte/Platform +++ b/arch/mips/sibyte/Platform @@ -10,19 +10,19 @@ platform-$(CONFIG_SIBYTE_BCM1x80) += sibyte/ # Sibyte SB1250 / BCM1480 family of SOCs # cflags-$(CONFIG_SIBYTE_BCM112X) += \ - -I$(srctree)/arch/mips/include/asm/mach-sibyte \ + -I$(srctree)/arch/mips/sibyte/include \ -DSIBYTE_HDR_FEATURES=SIBYTE_HDR_FMASK_1250_112x_ALL cflags-$(CONFIG_SIBYTE_SB1250) += \ - -I$(srctree)/arch/mips/include/asm/mach-sibyte \ + -I$(srctree)/arch/mips/sibyte/include \ -DSIBYTE_HDR_FEATURES=SIBYTE_HDR_FMASK_1250_112x_ALL cflags-$(CONFIG_SIBYTE_BCM1x55) += \ - -I$(srctree)/arch/mips/include/asm/mach-sibyte \ + -I$(srctree)/arch/mips/sibyte/include \ -DSIBYTE_HDR_FEATURES=SIBYTE_HDR_FMASK_1480_ALL cflags-$(CONFIG_SIBYTE_BCM1x80) += \ - -I$(srctree)/arch/mips/include/asm/mach-sibyte \ + -I$(srctree)/arch/mips/sibyte/include \ -DSIBYTE_HDR_FEATURES=SIBYTE_HDR_FMASK_1480_ALL # diff --git a/arch/mips/include/asm/mach-sibyte/cpu-feature-overrides.h b/arch/mips/sibyte/include/mach/cpu-feature-overrides.h similarity index 100% rename from arch/mips/include/asm/mach-sibyte/cpu-feature-overrides.h rename to arch/mips/sibyte/include/mach/cpu-feature-overrides.h diff --git a/arch/mips/sibyte/include/mach/ide.h b/arch/mips/sibyte/include/mach/ide.h new file mode 100644 index 0000000..1251c0c --- /dev/null +++ b/arch/mips/sibyte/include/mach/ide.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/sibyte/include/mach/ioremap.h b/arch/mips/sibyte/include/mach/ioremap.h new file mode 100644 index 0000000..2369393 --- /dev/null +++ b/arch/mips/sibyte/include/mach/ioremap.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/sibyte/include/mach/irq.h b/arch/mips/sibyte/include/mach/irq.h new file mode 100644 index 0000000..bb5ccce --- /dev/null +++ b/arch/mips/sibyte/include/mach/irq.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/sibyte/include/mach/kernel-entry-init.h b/arch/mips/sibyte/include/mach/kernel-entry-init.h new file mode 100644 index 0000000..19b872be --- /dev/null +++ b/arch/mips/sibyte/include/mach/kernel-entry-init.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/sibyte/include/mach/kmalloc.h b/arch/mips/sibyte/include/mach/kmalloc.h new file mode 100644 index 0000000..4f056db --- /dev/null +++ b/arch/mips/sibyte/include/mach/kmalloc.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/sibyte/include/mach/mangle-port.h b/arch/mips/sibyte/include/mach/mangle-port.h new file mode 100644 index 0000000..b9736e3 --- /dev/null +++ b/arch/mips/sibyte/include/mach/mangle-port.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/sibyte/include/mach/mc146818rtc.h b/arch/mips/sibyte/include/mach/mc146818rtc.h new file mode 100644 index 0000000..7284af8 --- /dev/null +++ b/arch/mips/sibyte/include/mach/mc146818rtc.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/sibyte/include/mach/spaces.h b/arch/mips/sibyte/include/mach/spaces.h new file mode 100644 index 0000000..39a4d72 --- /dev/null +++ b/arch/mips/sibyte/include/mach/spaces.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/sibyte/include/mach/topology.h b/arch/mips/sibyte/include/mach/topology.h new file mode 100644 index 0000000..86e585b --- /dev/null +++ b/arch/mips/sibyte/include/mach/topology.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-sibyte/war.h b/arch/mips/sibyte/include/mach/war.h similarity index 100% rename from arch/mips/include/asm/mach-sibyte/war.h rename to arch/mips/sibyte/include/mach/war.h From patchwork Mon Mar 30 09:00:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bibo Mao X-Patchwork-Id: 11464999 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 D11551805 for ; Mon, 30 Mar 2020 09:00:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B005120757 for ; Mon, 30 Mar 2020 09:00:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728759AbgC3JAn (ORCPT ); Mon, 30 Mar 2020 05:00:43 -0400 Received: from mail.loongson.cn ([114.242.206.163]:33882 "EHLO loongson.cn" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729816AbgC3JAm (ORCPT ); Mon, 30 Mar 2020 05:00:42 -0400 Received: from kvm-dev1.localdomain (unknown [10.2.5.134]) by mail.loongson.cn (Coremail) with SMTP id AQAAf9Dxfes2tYFeB5ohAA--.28S2; Mon, 30 Mar 2020 17:00:38 +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 32/39] MIPS: rb532: Add header file path prefix Date: Mon, 30 Mar 2020 05:00:38 -0400 Message-Id: <1585558838-12570-1-git-send-email-maobibo@loongson.cn> X-Mailer: git-send-email 1.8.3.1 X-CM-TRANSID: AQAAf9Dxfes2tYFeB5ohAA--.28S2 X-Coremail-Antispam: 1UD129KBjv3XoW7WryDtFyktw1DJoXrpr43ur47pa1DAa1kGr 4Uur1jkF15ZrW7Kr43Jan8ury5KFWF9347Z3Waq3WUJrs3Jrn0yryktF4DKFy09rW3XF4D Ja1qvw7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy29KBjDU0x BIdaVrnRJUUUkSb7Iv0xC_Kw4lb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I20VC2zVCF 04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rwA2F7IY1V AKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Xr0_Ar1l84ACjcxK6xIIjxv20xvE c7CjxVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26F4UJVW0owA2z4x0Y4vEx4A2js IEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IEw4CE 5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jw0_WrylYx0Ex4A2jsIE14v26r4UJVWxJr1lOx 8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JMxkIecxEwVCm-wCF04k20xvY0x0E wIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E74 80Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2Ij64vIr41lIxAIcVC0 I7IYx2IY67AKxVW5JVW7JwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJwCI42IY6x AIw20EY4v20xvaj40_JFI_Gr1lIxAIcVC2z280aVAFwI0_Cr0_Gr1UMIIF0xvEx4A2jsIE c7CjxVAFwI0_Gr1j6F4UJbIYCTnIWIevJa73UjIFyTuYvjxUgTKuUUUUU 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-rc32434 to arch/mips/rb532/include/mach Signed-off-by: bibo mao --- arch/mips/Kconfig | 1 + arch/mips/pci/fixup-rc32434.c | 4 ++-- arch/mips/pci/ops-rc32434.c | 4 ++-- arch/mips/pci/pci-rc32434.c | 4 ++-- arch/mips/rb532/Platform | 2 +- arch/mips/rb532/devices.c | 16 ++++++++-------- arch/mips/rb532/gpio.c | 4 ++-- .../include/mach}/cpu-feature-overrides.h | 0 .../asm/mach-rc32434 => rb532/include/mach}/ddr.h | 2 +- .../asm/mach-rc32434 => rb532/include/mach}/dma.h | 2 +- .../asm/mach-rc32434 => rb532/include/mach}/dma_v.h | 4 ++-- .../asm/mach-rc32434 => rb532/include/mach}/eth.h | 0 .../asm/mach-rc32434 => rb532/include/mach}/gpio.h | 0 arch/mips/rb532/include/mach/ide.h | 2 ++ .../asm/mach-rc32434 => rb532/include/mach}/integ.h | 2 +- arch/mips/rb532/include/mach/ioremap.h | 2 ++ .../asm/mach-rc32434 => rb532/include/mach}/irq.h | 2 +- arch/mips/rb532/include/mach/kernel-entry-init.h | 2 ++ arch/mips/rb532/include/mach/kmalloc.h | 2 ++ arch/mips/rb532/include/mach/mangle-port.h | 2 ++ arch/mips/rb532/include/mach/mc146818rtc.h | 2 ++ .../asm/mach-rc32434 => rb532/include/mach}/pci.h | 0 .../asm/mach-rc32434 => rb532/include/mach}/prom.h | 0 .../asm/mach-rc32434 => rb532/include/mach}/rb.h | 0 .../asm/mach-rc32434 => rb532/include/mach}/rc32434.h | 0 arch/mips/rb532/include/mach/spaces.h | 2 ++ .../asm/mach-rc32434 => rb532/include/mach}/timer.h | 2 +- arch/mips/rb532/include/mach/topology.h | 2 ++ .../asm/mach-rc32434 => rb532/include/mach}/war.h | 0 arch/mips/rb532/irq.c | 4 ++-- arch/mips/rb532/prom.c | 4 ++-- arch/mips/rb532/serial.c | 2 +- arch/mips/rb532/setup.c | 4 ++-- arch/mips/rb532/time.c | 2 +- drivers/ata/pata_rb532_cf.c | 2 +- drivers/input/misc/rb532_button.c | 4 ++-- drivers/leds/leds-rb532.c | 4 ++-- drivers/net/ethernet/korina.c | 8 ++++---- drivers/watchdog/rc32434_wdt.c | 2 +- 39 files changed, 59 insertions(+), 42 deletions(-) rename arch/mips/{include/asm/mach-rc32434 => rb532/include/mach}/cpu-feature-overrides.h (100%) rename arch/mips/{include/asm/mach-rc32434 => rb532/include/mach}/ddr.h (99%) rename arch/mips/{include/asm/mach-rc32434 => rb532/include/mach}/dma.h (98%) rename arch/mips/{include/asm/mach-rc32434 => rb532/include/mach}/dma_v.h (93%) rename arch/mips/{include/asm/mach-rc32434 => rb532/include/mach}/eth.h (100%) rename arch/mips/{include/asm/mach-rc32434 => rb532/include/mach}/gpio.h (100%) create mode 100644 arch/mips/rb532/include/mach/ide.h rename arch/mips/{include/asm/mach-rc32434 => rb532/include/mach}/integ.h (98%) create mode 100644 arch/mips/rb532/include/mach/ioremap.h rename arch/mips/{include/asm/mach-rc32434 => rb532/include/mach}/irq.h (96%) create mode 100644 arch/mips/rb532/include/mach/kernel-entry-init.h create mode 100644 arch/mips/rb532/include/mach/kmalloc.h create mode 100644 arch/mips/rb532/include/mach/mangle-port.h create mode 100644 arch/mips/rb532/include/mach/mc146818rtc.h rename arch/mips/{include/asm/mach-rc32434 => rb532/include/mach}/pci.h (100%) rename arch/mips/{include/asm/mach-rc32434 => rb532/include/mach}/prom.h (100%) rename arch/mips/{include/asm/mach-rc32434 => rb532/include/mach}/rb.h (100%) rename arch/mips/{include/asm/mach-rc32434 => rb532/include/mach}/rc32434.h (100%) create mode 100644 arch/mips/rb532/include/mach/spaces.h rename arch/mips/{include/asm/mach-rc32434 => rb532/include/mach}/timer.h (98%) create mode 100644 arch/mips/rb532/include/mach/topology.h rename arch/mips/{include/asm/mach-rc32434 => rb532/include/mach}/war.h (100%) diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 30b520c..7a4ff6c 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -981,6 +981,7 @@ config MIKROTIK_RB532 select BOOT_RAW select GPIOLIB select MIPS_L1_CACHE_SHIFT_4 + select HAVE_MACH_HEAD_FILES help Support the Mikrotik(tm) RouterBoard 532 series, based on the IDT RC32434 SoC. diff --git a/arch/mips/pci/fixup-rc32434.c b/arch/mips/pci/fixup-rc32434.c index 7fcafd5..c1334b5 100644 --- a/arch/mips/pci/fixup-rc32434.c +++ b/arch/mips/pci/fixup-rc32434.c @@ -28,8 +28,8 @@ #include #include -#include -#include +#include +#include static int irq_map[2][12] = { {0, 0, 2, 3, 2, 3, 0, 0, 0, 0, 0, 1}, diff --git a/arch/mips/pci/ops-rc32434.c b/arch/mips/pci/ops-rc32434.c index 874ed6d..8a1fe0e 100644 --- a/arch/mips/pci/ops-rc32434.c +++ b/arch/mips/pci/ops-rc32434.c @@ -31,8 +31,8 @@ #include #include -#include -#include +#include +#include #define PCI_ACCESS_READ 0 #define PCI_ACCESS_WRITE 1 diff --git a/arch/mips/pci/pci-rc32434.c b/arch/mips/pci/pci-rc32434.c index 7f6ce6d..6cda27d 100644 --- a/arch/mips/pci/pci-rc32434.c +++ b/arch/mips/pci/pci-rc32434.c @@ -30,8 +30,8 @@ #include #include -#include -#include +#include +#include #define PCI_ACCESS_READ 0 #define PCI_ACCESS_WRITE 1 diff --git a/arch/mips/rb532/Platform b/arch/mips/rb532/Platform index aeec45a..20bd9db 100644 --- a/arch/mips/rb532/Platform +++ b/arch/mips/rb532/Platform @@ -3,5 +3,5 @@ # platform-$(CONFIG_MIKROTIK_RB532) += rb532/ cflags-$(CONFIG_MIKROTIK_RB532) += \ - -I$(srctree)/arch/mips/include/asm/mach-rc32434 + -I$(srctree)/arch/mips/rb532/include load-$(CONFIG_MIKROTIK_RB532) += 0xffffffff80101000 diff --git a/arch/mips/rb532/devices.c b/arch/mips/rb532/devices.c index dd34f1b..5b2694b 100644 --- a/arch/mips/rb532/devices.c +++ b/arch/mips/rb532/devices.c @@ -21,14 +21,14 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #define ETH0_RX_DMA_ADDR (DMA0_BASE_ADDR + 0 * DMA_CHAN_OFFSET) #define ETH0_TX_DMA_ADDR (DMA0_BASE_ADDR + 1 * DMA_CHAN_OFFSET) diff --git a/arch/mips/rb532/gpio.c b/arch/mips/rb532/gpio.c index 94f02ad..0225d42 100644 --- a/arch/mips/rb532/gpio.c +++ b/arch/mips/rb532/gpio.c @@ -34,8 +34,8 @@ #include #include -#include -#include +#include +#include struct rb532_gpio_chip { struct gpio_chip chip; diff --git a/arch/mips/include/asm/mach-rc32434/cpu-feature-overrides.h b/arch/mips/rb532/include/mach/cpu-feature-overrides.h similarity index 100% rename from arch/mips/include/asm/mach-rc32434/cpu-feature-overrides.h rename to arch/mips/rb532/include/mach/cpu-feature-overrides.h diff --git a/arch/mips/include/asm/mach-rc32434/ddr.h b/arch/mips/rb532/include/mach/ddr.h similarity index 99% rename from arch/mips/include/asm/mach-rc32434/ddr.h rename to arch/mips/rb532/include/mach/ddr.h index e1cad0c..c24b2b5 100644 --- a/arch/mips/include/asm/mach-rc32434/ddr.h +++ b/arch/mips/rb532/include/mach/ddr.h @@ -29,7 +29,7 @@ #ifndef _ASM_RC32434_DDR_H_ #define _ASM_RC32434_DDR_H_ -#include +#include /* DDR register structure */ struct ddr_ram { diff --git a/arch/mips/include/asm/mach-rc32434/dma.h b/arch/mips/rb532/include/mach/dma.h similarity index 98% rename from arch/mips/include/asm/mach-rc32434/dma.h rename to arch/mips/rb532/include/mach/dma.h index 44dc87b..e4ef0c3 100644 --- a/arch/mips/include/asm/mach-rc32434/dma.h +++ b/arch/mips/rb532/include/mach/dma.h @@ -12,7 +12,7 @@ #ifndef __ASM_RC32434_DMA_H #define __ASM_RC32434_DMA_H -#include +#include #define DMA0_BASE_ADDR 0x18040000 diff --git a/arch/mips/include/asm/mach-rc32434/dma_v.h b/arch/mips/rb532/include/mach/dma_v.h similarity index 93% rename from arch/mips/include/asm/mach-rc32434/dma_v.h rename to arch/mips/rb532/include/mach/dma_v.h index 37d73b9..d675fb1 100644 --- a/arch/mips/include/asm/mach-rc32434/dma_v.h +++ b/arch/mips/rb532/include/mach/dma_v.h @@ -12,8 +12,8 @@ #ifndef _ASM_RC32434_DMA_V_H_ #define _ASM_RC32434_DMA_V_H_ -#include -#include +#include +#include #define DMA_CHAN_OFFSET 0x14 #define IS_DMA_USED(X) (((X) & \ diff --git a/arch/mips/include/asm/mach-rc32434/eth.h b/arch/mips/rb532/include/mach/eth.h similarity index 100% rename from arch/mips/include/asm/mach-rc32434/eth.h rename to arch/mips/rb532/include/mach/eth.h diff --git a/arch/mips/include/asm/mach-rc32434/gpio.h b/arch/mips/rb532/include/mach/gpio.h similarity index 100% rename from arch/mips/include/asm/mach-rc32434/gpio.h rename to arch/mips/rb532/include/mach/gpio.h diff --git a/arch/mips/rb532/include/mach/ide.h b/arch/mips/rb532/include/mach/ide.h new file mode 100644 index 0000000..1251c0c --- /dev/null +++ b/arch/mips/rb532/include/mach/ide.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-rc32434/integ.h b/arch/mips/rb532/include/mach/integ.h similarity index 98% rename from arch/mips/include/asm/mach-rc32434/integ.h rename to arch/mips/rb532/include/mach/integ.h index fa65bc3..b270514 100644 --- a/arch/mips/include/asm/mach-rc32434/integ.h +++ b/arch/mips/rb532/include/mach/integ.h @@ -29,7 +29,7 @@ #ifndef __RC32434_INTEG_H__ #define __RC32434_INTEG_H__ -#include +#include #define INTEG0_BASE_ADDR 0x18030030 diff --git a/arch/mips/rb532/include/mach/ioremap.h b/arch/mips/rb532/include/mach/ioremap.h new file mode 100644 index 0000000..2369393 --- /dev/null +++ b/arch/mips/rb532/include/mach/ioremap.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-rc32434/irq.h b/arch/mips/rb532/include/mach/irq.h similarity index 96% rename from arch/mips/include/asm/mach-rc32434/irq.h rename to arch/mips/rb532/include/mach/irq.h index ebe32bd..e1902b4 100644 --- a/arch/mips/include/asm/mach-rc32434/irq.h +++ b/arch/mips/rb532/include/mach/irq.h @@ -5,7 +5,7 @@ #define NR_IRQS 256 #include -#include +#include /* Interrupt Controller */ #define IC_GROUP0_PEND (REGBASE + 0x38000) diff --git a/arch/mips/rb532/include/mach/kernel-entry-init.h b/arch/mips/rb532/include/mach/kernel-entry-init.h new file mode 100644 index 0000000..19b872be --- /dev/null +++ b/arch/mips/rb532/include/mach/kernel-entry-init.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/rb532/include/mach/kmalloc.h b/arch/mips/rb532/include/mach/kmalloc.h new file mode 100644 index 0000000..4f056db --- /dev/null +++ b/arch/mips/rb532/include/mach/kmalloc.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/rb532/include/mach/mangle-port.h b/arch/mips/rb532/include/mach/mangle-port.h new file mode 100644 index 0000000..b9736e3 --- /dev/null +++ b/arch/mips/rb532/include/mach/mangle-port.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/rb532/include/mach/mc146818rtc.h b/arch/mips/rb532/include/mach/mc146818rtc.h new file mode 100644 index 0000000..7284af8 --- /dev/null +++ b/arch/mips/rb532/include/mach/mc146818rtc.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-rc32434/pci.h b/arch/mips/rb532/include/mach/pci.h similarity index 100% rename from arch/mips/include/asm/mach-rc32434/pci.h rename to arch/mips/rb532/include/mach/pci.h diff --git a/arch/mips/include/asm/mach-rc32434/prom.h b/arch/mips/rb532/include/mach/prom.h similarity index 100% rename from arch/mips/include/asm/mach-rc32434/prom.h rename to arch/mips/rb532/include/mach/prom.h diff --git a/arch/mips/include/asm/mach-rc32434/rb.h b/arch/mips/rb532/include/mach/rb.h similarity index 100% rename from arch/mips/include/asm/mach-rc32434/rb.h rename to arch/mips/rb532/include/mach/rb.h diff --git a/arch/mips/include/asm/mach-rc32434/rc32434.h b/arch/mips/rb532/include/mach/rc32434.h similarity index 100% rename from arch/mips/include/asm/mach-rc32434/rc32434.h rename to arch/mips/rb532/include/mach/rc32434.h diff --git a/arch/mips/rb532/include/mach/spaces.h b/arch/mips/rb532/include/mach/spaces.h new file mode 100644 index 0000000..39a4d72 --- /dev/null +++ b/arch/mips/rb532/include/mach/spaces.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-rc32434/timer.h b/arch/mips/rb532/include/mach/timer.h similarity index 98% rename from arch/mips/include/asm/mach-rc32434/timer.h rename to arch/mips/rb532/include/mach/timer.h index cda26bb9..f4f1500 100644 --- a/arch/mips/include/asm/mach-rc32434/timer.h +++ b/arch/mips/rb532/include/mach/timer.h @@ -29,7 +29,7 @@ #ifndef __ASM_RC32434_TIMER_H #define __ASM_RC32434_TIMER_H -#include +#include #define TIMER0_BASE_ADDR 0x18028000 #define TIMER_COUNT 3 diff --git a/arch/mips/rb532/include/mach/topology.h b/arch/mips/rb532/include/mach/topology.h new file mode 100644 index 0000000..86e585b --- /dev/null +++ b/arch/mips/rb532/include/mach/topology.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-rc32434/war.h b/arch/mips/rb532/include/mach/war.h similarity index 100% rename from arch/mips/include/asm/mach-rc32434/war.h rename to arch/mips/rb532/include/mach/war.h diff --git a/arch/mips/rb532/irq.c b/arch/mips/rb532/irq.c index 25cc250..7a2af1c 100644 --- a/arch/mips/rb532/irq.c +++ b/arch/mips/rb532/irq.c @@ -42,8 +42,8 @@ #include #include -#include -#include +#include +#include struct intr_group { u32 mask; /* mask of valid bits in pending/mask registers */ diff --git a/arch/mips/rb532/prom.c b/arch/mips/rb532/prom.c index 303cc3d..6c4755e 100644 --- a/arch/mips/rb532/prom.c +++ b/arch/mips/rb532/prom.c @@ -19,8 +19,8 @@ #include #include -#include -#include +#include +#include unsigned int idt_cpu_freq = 132000000; EXPORT_SYMBOL(idt_cpu_freq); diff --git a/arch/mips/rb532/serial.c b/arch/mips/rb532/serial.c index 7048254..8af04a1 100644 --- a/arch/mips/rb532/serial.c +++ b/arch/mips/rb532/serial.c @@ -32,7 +32,7 @@ #include #include -#include +#include extern unsigned int idt_cpu_freq; diff --git a/arch/mips/rb532/setup.c b/arch/mips/rb532/setup.c index 51af9d3..d8f7b0b 100644 --- a/arch/mips/rb532/setup.c +++ b/arch/mips/rb532/setup.c @@ -11,8 +11,8 @@ #include #include -#include -#include +#include +#include struct pci_reg __iomem *pci_reg; EXPORT_SYMBOL(pci_reg); diff --git a/arch/mips/rb532/time.c b/arch/mips/rb532/time.c index 68713dd..0ccb5414 100644 --- a/arch/mips/rb532/time.c +++ b/arch/mips/rb532/time.c @@ -17,7 +17,7 @@ #include #include -#include +#include extern unsigned int idt_cpu_freq; diff --git a/drivers/ata/pata_rb532_cf.c b/drivers/ata/pata_rb532_cf.c index 479c4b2..90ba838 100644 --- a/drivers/ata/pata_rb532_cf.c +++ b/drivers/ata/pata_rb532_cf.c @@ -28,7 +28,7 @@ #include #include -#include +#include #define DRV_NAME "pata-rb532-cf" #define DRV_VERSION "0.1.0" diff --git a/drivers/input/misc/rb532_button.c b/drivers/input/misc/rb532_button.c index 190a80e..5d2f2f0 100644 --- a/drivers/input/misc/rb532_button.c +++ b/drivers/input/misc/rb532_button.c @@ -10,8 +10,8 @@ #include #include -#include -#include +#include +#include #define DRV_NAME "rb532-button" diff --git a/drivers/leds/leds-rb532.c b/drivers/leds/leds-rb532.c index b6447c1..413ef32 100644 --- a/drivers/leds/leds-rb532.c +++ b/drivers/leds/leds-rb532.c @@ -13,8 +13,8 @@ #include #include -#include -#include +#include +#include static void rb532_led_set(struct led_classdev *cdev, enum led_brightness brightness) diff --git a/drivers/net/ethernet/korina.c b/drivers/net/ethernet/korina.c index f1d8492..b3ee4c8 100644 --- a/drivers/net/ethernet/korina.c +++ b/drivers/net/ethernet/korina.c @@ -60,10 +60,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #define DRV_NAME "korina" #define DRV_VERSION "0.20" diff --git a/drivers/watchdog/rc32434_wdt.c b/drivers/watchdog/rc32434_wdt.c index aee3c2e..555bab4 100644 --- a/drivers/watchdog/rc32434_wdt.c +++ b/drivers/watchdog/rc32434_wdt.c @@ -28,7 +28,7 @@ #include /* For copy_to_user/put_user/... */ #include /* For devm_ioremap */ -#include /* For the Watchdog registers */ +#include /* For the Watchdog registers */ #define VERSION "1.0" From patchwork Mon Mar 30 09:00:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bibo Mao X-Patchwork-Id: 11465001 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 02F4A1805 for ; Mon, 30 Mar 2020 09:00:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C2C0320757 for ; Mon, 30 Mar 2020 09:00:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729852AbgC3JAu (ORCPT ); Mon, 30 Mar 2020 05:00:50 -0400 Received: from mail.loongson.cn ([114.242.206.163]:33912 "EHLO loongson.cn" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729816AbgC3JAt (ORCPT ); Mon, 30 Mar 2020 05:00:49 -0400 Received: from kvm-dev1.localdomain (unknown [10.2.5.134]) by mail.loongson.cn (Coremail) with SMTP id AQAAf9DxX2o8tYFeCZohAA--.38S2; Mon, 30 Mar 2020 17:00:45 +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 33/39] MIPS: ralink: Add header file path prefix Date: Mon, 30 Mar 2020 05:00:44 -0400 Message-Id: <1585558844-14320-1-git-send-email-maobibo@loongson.cn> X-Mailer: git-send-email 1.8.3.1 X-CM-TRANSID: AQAAf9DxX2o8tYFeCZohAA--.38S2 X-Coremail-Antispam: 1UD129KBjvAXoWfJF48uFWDKF43Gr1xZw47urg_yoW8CFyxZo Z7tFn7Kr4fJFW7JFy3ZFy3Aay8Zr92qFWrXw15XrZ8GasrZ3srJw1F9w4jqF15Gr1ftw17 GrWrZryUXryfKaykn29KB7ZKAUJUUUU8529EdanIXcx71UUUUU7v73VFW2AGmfu7bjvjm3 AaLaJ3UjIYCTnIWjp_UUUYe7k0a2IF6w4kM7kC6x804xWl14x267AKxVWUJVW8JwAFc2x0 x2IEx4CE42xK8VAvwI8IcIk0rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2ocxC64kIII0Yj4 1l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26ryj6F1UM28EF7xvwVC0 I7IYx2IY6xkF7I0E14v26r4UJVWxJr1l84ACjcxK6I8E87Iv67AKxVWxJr0_GcWl84ACjc xK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVAC Y4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1q6rW5McIj6I8E87Iv67AKxVW8Jr 0_Cr1UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCY02Avz4vE-syl42xK 82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGw C20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r1DMIIYrxkI7VAKI48J MIIF0xvE2Ix0cI8IcVAFwI0_Xr0_Ar1lIxAIcVC0I7IYx2IY6xkF7I0E14v26r4UJVWxJr 1lIxAIcVCF04k26cxKx2IYs7xG6r1I6r4UMIIF0xvEx4A2jsIE14v26F4j6r4UJwCI42IY 6I8E87Iv6xkF7I0E14v26r4UJVWxJrUvcSsGvfC2KfnxnUUI43ZEXa7IU59iSJUUUUU== 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-ralink to arch/mips/ralink/include/mach Signed-off-by: bibo mao --- arch/mips/Kconfig | 1 + arch/mips/pci/pci-mt7620.c | 4 ++-- arch/mips/pci/pci-rt3883.c | 4 ++-- arch/mips/ralink/Platform | 7 +------ arch/mips/ralink/cevt-rt3352.c | 2 +- arch/mips/ralink/ill_acc.c | 2 +- arch/mips/ralink/include/mach/cpu-feature-overrides.h | 14 ++++++++++++++ arch/mips/ralink/include/mach/ide.h | 2 ++ arch/mips/ralink/include/mach/ioremap.h | 2 ++ .../{include/asm/mach-ralink => ralink/include/mach}/irq.h | 0 arch/mips/ralink/include/mach/kernel-entry-init.h | 2 ++ arch/mips/ralink/include/mach/kmalloc.h | 2 ++ arch/mips/ralink/include/mach/mangle-port.h | 2 ++ arch/mips/ralink/include/mach/mc146818rtc.h | 2 ++ .../asm/mach-ralink => ralink/include/mach}/mt7620.h | 0 .../include/mach}/mt7620/cpu-feature-overrides.h | 0 .../asm/mach-ralink => ralink/include/mach}/mt7621.h | 0 .../include/mach}/mt7621/cpu-feature-overrides.h | 0 .../asm/mach-ralink => ralink/include/mach}/pinmux.h | 0 .../asm/mach-ralink => ralink/include/mach}/ralink_regs.h | 0 .../asm/mach-ralink => ralink/include/mach}/rt288x.h | 0 .../include/mach}/rt288x/cpu-feature-overrides.h | 0 .../asm/mach-ralink => ralink/include/mach}/rt305x.h | 0 .../include/mach}/rt305x/cpu-feature-overrides.h | 0 .../asm/mach-ralink => ralink/include/mach}/rt3883.h | 0 .../include/mach}/rt3883/cpu-feature-overrides.h | 0 arch/mips/ralink/include/mach/spaces.h | 2 ++ arch/mips/ralink/include/mach/topology.h | 2 ++ arch/mips/ralink/include/mach/war.h | 2 ++ arch/mips/ralink/mt7620.c | 6 +++--- arch/mips/ralink/mt7621.c | 4 ++-- arch/mips/ralink/prom.c | 2 +- arch/mips/ralink/reset.c | 2 +- arch/mips/ralink/rt288x.c | 6 +++--- arch/mips/ralink/rt305x.c | 6 +++--- arch/mips/ralink/rt3883.c | 6 +++--- arch/mips/ralink/timer.c | 2 +- 37 files changed, 57 insertions(+), 29 deletions(-) create mode 100644 arch/mips/ralink/include/mach/cpu-feature-overrides.h create mode 100644 arch/mips/ralink/include/mach/ide.h create mode 100644 arch/mips/ralink/include/mach/ioremap.h rename arch/mips/{include/asm/mach-ralink => ralink/include/mach}/irq.h (100%) create mode 100644 arch/mips/ralink/include/mach/kernel-entry-init.h create mode 100644 arch/mips/ralink/include/mach/kmalloc.h create mode 100644 arch/mips/ralink/include/mach/mangle-port.h create mode 100644 arch/mips/ralink/include/mach/mc146818rtc.h rename arch/mips/{include/asm/mach-ralink => ralink/include/mach}/mt7620.h (100%) rename arch/mips/{include/asm/mach-ralink => ralink/include/mach}/mt7620/cpu-feature-overrides.h (100%) rename arch/mips/{include/asm/mach-ralink => ralink/include/mach}/mt7621.h (100%) rename arch/mips/{include/asm/mach-ralink => ralink/include/mach}/mt7621/cpu-feature-overrides.h (100%) rename arch/mips/{include/asm/mach-ralink => ralink/include/mach}/pinmux.h (100%) rename arch/mips/{include/asm/mach-ralink => ralink/include/mach}/ralink_regs.h (100%) rename arch/mips/{include/asm/mach-ralink => ralink/include/mach}/rt288x.h (100%) rename arch/mips/{include/asm/mach-ralink => ralink/include/mach}/rt288x/cpu-feature-overrides.h (100%) rename arch/mips/{include/asm/mach-ralink => ralink/include/mach}/rt305x.h (100%) rename arch/mips/{include/asm/mach-ralink => ralink/include/mach}/rt305x/cpu-feature-overrides.h (100%) rename arch/mips/{include/asm/mach-ralink => ralink/include/mach}/rt3883.h (100%) rename arch/mips/{include/asm/mach-ralink => ralink/include/mach}/rt3883/cpu-feature-overrides.h (100%) create mode 100644 arch/mips/ralink/include/mach/spaces.h create mode 100644 arch/mips/ralink/include/mach/topology.h create mode 100644 arch/mips/ralink/include/mach/war.h diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 7a4ff6c..0687b94 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -682,6 +682,7 @@ config RALINK select CLKDEV_LOOKUP select ARCH_HAS_RESET_CONTROLLER select RESET_CONTROLLER + select HAVE_MACH_HEAD_FILES config SGI_IP22 bool "SGI IP22 (Indy/Indigo2)" diff --git a/arch/mips/pci/pci-mt7620.c b/arch/mips/pci/pci-mt7620.c index d360616..1fe6829 100644 --- a/arch/mips/pci/pci-mt7620.c +++ b/arch/mips/pci/pci-mt7620.c @@ -18,8 +18,8 @@ #include #include -#include -#include +#include +#include #define RALINK_PCI_IO_MAP_BASE 0x10160000 #define RALINK_PCI_MEMORY_BASE 0x0 diff --git a/arch/mips/pci/pci-rt3883.c b/arch/mips/pci/pci-rt3883.c index 0ac6346..241cbe9 100644 --- a/arch/mips/pci/pci-rt3883.c +++ b/arch/mips/pci/pci-rt3883.c @@ -18,8 +18,8 @@ #include #include -#include -#include +#include +#include #define RT3883_MEMORY_BASE 0x00000000 #define RT3883_MEMORY_SIZE 0x02000000 diff --git a/arch/mips/ralink/Platform b/arch/mips/ralink/Platform index 6095fcc..35e8b1b 100644 --- a/arch/mips/ralink/Platform +++ b/arch/mips/ralink/Platform @@ -2,33 +2,28 @@ # Ralink SoC common stuff # core-$(CONFIG_RALINK) += arch/mips/ralink/ -cflags-$(CONFIG_RALINK) += -I$(srctree)/arch/mips/include/asm/mach-ralink +cflags-$(CONFIG_RALINK) += -I$(srctree)/arch/mips/ralink/include # # Ralink RT288x # load-$(CONFIG_SOC_RT288X) += 0xffffffff88000000 -cflags-$(CONFIG_SOC_RT288X) += -I$(srctree)/arch/mips/include/asm/mach-ralink/rt288x # # Ralink RT305x # load-$(CONFIG_SOC_RT305X) += 0xffffffff80000000 -cflags-$(CONFIG_SOC_RT305X) += -I$(srctree)/arch/mips/include/asm/mach-ralink/rt305x # # Ralink RT3883 # load-$(CONFIG_SOC_RT3883) += 0xffffffff80000000 -cflags-$(CONFIG_SOC_RT3883) += -I$(srctree)/arch/mips/include/asm/mach-ralink/rt3883 # # Ralink MT7620 # load-$(CONFIG_SOC_MT7620) += 0xffffffff80000000 -cflags-$(CONFIG_SOC_MT7620) += -I$(srctree)/arch/mips/include/asm/mach-ralink/mt7620 # Ralink MT7621 # load-$(CONFIG_SOC_MT7621) += 0xffffffff80001000 -cflags-$(CONFIG_SOC_MT7621) += -I$(srctree)/arch/mips/include/asm/mach-ralink/mt7621 diff --git a/arch/mips/ralink/cevt-rt3352.c b/arch/mips/ralink/cevt-rt3352.c index 269d4877..1522581 100644 --- a/arch/mips/ralink/cevt-rt3352.c +++ b/arch/mips/ralink/cevt-rt3352.c @@ -16,7 +16,7 @@ #include #include -#include +#include #define SYSTICK_FREQ (50 * 1000) diff --git a/arch/mips/ralink/ill_acc.c b/arch/mips/ralink/ill_acc.c index bdf5380..43948e9 100644 --- a/arch/mips/ralink/ill_acc.c +++ b/arch/mips/ralink/ill_acc.c @@ -8,7 +8,7 @@ #include #include -#include +#include #define REG_ILL_ACC_ADDR 0x10 #define REG_ILL_ACC_TYPE 0x14 diff --git a/arch/mips/ralink/include/mach/cpu-feature-overrides.h b/arch/mips/ralink/include/mach/cpu-feature-overrides.h new file mode 100644 index 0000000..2a1c986 --- /dev/null +++ b/arch/mips/ralink/include/mach/cpu-feature-overrides.h @@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifdef CONFIG_SOC_RT288X +#include +#elif defined(CONFIG_SOC_RT305X) +#include +#elif defined(CONFIG_SOC_RT3883) +#include +#elif defined(CONFIG_SOC_MT7620) +#include +#elif defined(CONFIG_SOC_MT7621) +#include +#else +#include +#endif diff --git a/arch/mips/ralink/include/mach/ide.h b/arch/mips/ralink/include/mach/ide.h new file mode 100644 index 0000000..1251c0c --- /dev/null +++ b/arch/mips/ralink/include/mach/ide.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/ralink/include/mach/ioremap.h b/arch/mips/ralink/include/mach/ioremap.h new file mode 100644 index 0000000..2369393 --- /dev/null +++ b/arch/mips/ralink/include/mach/ioremap.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-ralink/irq.h b/arch/mips/ralink/include/mach/irq.h similarity index 100% rename from arch/mips/include/asm/mach-ralink/irq.h rename to arch/mips/ralink/include/mach/irq.h diff --git a/arch/mips/ralink/include/mach/kernel-entry-init.h b/arch/mips/ralink/include/mach/kernel-entry-init.h new file mode 100644 index 0000000..19b872be --- /dev/null +++ b/arch/mips/ralink/include/mach/kernel-entry-init.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/ralink/include/mach/kmalloc.h b/arch/mips/ralink/include/mach/kmalloc.h new file mode 100644 index 0000000..4f056db --- /dev/null +++ b/arch/mips/ralink/include/mach/kmalloc.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/ralink/include/mach/mangle-port.h b/arch/mips/ralink/include/mach/mangle-port.h new file mode 100644 index 0000000..b9736e3 --- /dev/null +++ b/arch/mips/ralink/include/mach/mangle-port.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/ralink/include/mach/mc146818rtc.h b/arch/mips/ralink/include/mach/mc146818rtc.h new file mode 100644 index 0000000..7284af8 --- /dev/null +++ b/arch/mips/ralink/include/mach/mc146818rtc.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-ralink/mt7620.h b/arch/mips/ralink/include/mach/mt7620.h similarity index 100% rename from arch/mips/include/asm/mach-ralink/mt7620.h rename to arch/mips/ralink/include/mach/mt7620.h diff --git a/arch/mips/include/asm/mach-ralink/mt7620/cpu-feature-overrides.h b/arch/mips/ralink/include/mach/mt7620/cpu-feature-overrides.h similarity index 100% rename from arch/mips/include/asm/mach-ralink/mt7620/cpu-feature-overrides.h rename to arch/mips/ralink/include/mach/mt7620/cpu-feature-overrides.h diff --git a/arch/mips/include/asm/mach-ralink/mt7621.h b/arch/mips/ralink/include/mach/mt7621.h similarity index 100% rename from arch/mips/include/asm/mach-ralink/mt7621.h rename to arch/mips/ralink/include/mach/mt7621.h diff --git a/arch/mips/include/asm/mach-ralink/mt7621/cpu-feature-overrides.h b/arch/mips/ralink/include/mach/mt7621/cpu-feature-overrides.h similarity index 100% rename from arch/mips/include/asm/mach-ralink/mt7621/cpu-feature-overrides.h rename to arch/mips/ralink/include/mach/mt7621/cpu-feature-overrides.h diff --git a/arch/mips/include/asm/mach-ralink/pinmux.h b/arch/mips/ralink/include/mach/pinmux.h similarity index 100% rename from arch/mips/include/asm/mach-ralink/pinmux.h rename to arch/mips/ralink/include/mach/pinmux.h diff --git a/arch/mips/include/asm/mach-ralink/ralink_regs.h b/arch/mips/ralink/include/mach/ralink_regs.h similarity index 100% rename from arch/mips/include/asm/mach-ralink/ralink_regs.h rename to arch/mips/ralink/include/mach/ralink_regs.h diff --git a/arch/mips/include/asm/mach-ralink/rt288x.h b/arch/mips/ralink/include/mach/rt288x.h similarity index 100% rename from arch/mips/include/asm/mach-ralink/rt288x.h rename to arch/mips/ralink/include/mach/rt288x.h diff --git a/arch/mips/include/asm/mach-ralink/rt288x/cpu-feature-overrides.h b/arch/mips/ralink/include/mach/rt288x/cpu-feature-overrides.h similarity index 100% rename from arch/mips/include/asm/mach-ralink/rt288x/cpu-feature-overrides.h rename to arch/mips/ralink/include/mach/rt288x/cpu-feature-overrides.h diff --git a/arch/mips/include/asm/mach-ralink/rt305x.h b/arch/mips/ralink/include/mach/rt305x.h similarity index 100% rename from arch/mips/include/asm/mach-ralink/rt305x.h rename to arch/mips/ralink/include/mach/rt305x.h diff --git a/arch/mips/include/asm/mach-ralink/rt305x/cpu-feature-overrides.h b/arch/mips/ralink/include/mach/rt305x/cpu-feature-overrides.h similarity index 100% rename from arch/mips/include/asm/mach-ralink/rt305x/cpu-feature-overrides.h rename to arch/mips/ralink/include/mach/rt305x/cpu-feature-overrides.h diff --git a/arch/mips/include/asm/mach-ralink/rt3883.h b/arch/mips/ralink/include/mach/rt3883.h similarity index 100% rename from arch/mips/include/asm/mach-ralink/rt3883.h rename to arch/mips/ralink/include/mach/rt3883.h diff --git a/arch/mips/include/asm/mach-ralink/rt3883/cpu-feature-overrides.h b/arch/mips/ralink/include/mach/rt3883/cpu-feature-overrides.h similarity index 100% rename from arch/mips/include/asm/mach-ralink/rt3883/cpu-feature-overrides.h rename to arch/mips/ralink/include/mach/rt3883/cpu-feature-overrides.h diff --git a/arch/mips/ralink/include/mach/spaces.h b/arch/mips/ralink/include/mach/spaces.h new file mode 100644 index 0000000..39a4d72 --- /dev/null +++ b/arch/mips/ralink/include/mach/spaces.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/ralink/include/mach/topology.h b/arch/mips/ralink/include/mach/topology.h new file mode 100644 index 0000000..86e585b --- /dev/null +++ b/arch/mips/ralink/include/mach/topology.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/ralink/include/mach/war.h b/arch/mips/ralink/include/mach/war.h new file mode 100644 index 0000000..5b0422a --- /dev/null +++ b/arch/mips/ralink/include/mach/war.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/ralink/mt7620.c b/arch/mips/ralink/mt7620.c index fcf0100..0b911f8 100644 --- a/arch/mips/ralink/mt7620.c +++ b/arch/mips/ralink/mt7620.c @@ -13,9 +13,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include "common.h" diff --git a/arch/mips/ralink/mt7621.c b/arch/mips/ralink/mt7621.c index 0accb80..b9f68c6 100644 --- a/arch/mips/ralink/mt7621.c +++ b/arch/mips/ralink/mt7621.c @@ -13,8 +13,8 @@ #include #include #include -#include -#include +#include +#include #include diff --git a/arch/mips/ralink/prom.c b/arch/mips/ralink/prom.c index 02e7878..9672735 100644 --- a/arch/mips/ralink/prom.c +++ b/arch/mips/ralink/prom.c @@ -13,7 +13,7 @@ #include #include -#include +#include #include "common.h" diff --git a/arch/mips/ralink/reset.c b/arch/mips/ralink/reset.c index 8126f12..40ed566 100644 --- a/arch/mips/ralink/reset.c +++ b/arch/mips/ralink/reset.c @@ -14,7 +14,7 @@ #include -#include +#include /* Reset Control */ #define SYSC_REG_RESET_CTRL 0x034 diff --git a/arch/mips/ralink/rt288x.c b/arch/mips/ralink/rt288x.c index 3f09689..f92a8791 100644 --- a/arch/mips/ralink/rt288x.c +++ b/arch/mips/ralink/rt288x.c @@ -12,9 +12,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include "common.h" diff --git a/arch/mips/ralink/rt305x.c b/arch/mips/ralink/rt305x.c index 496f966..a4cba53 100644 --- a/arch/mips/ralink/rt305x.c +++ b/arch/mips/ralink/rt305x.c @@ -14,9 +14,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include "common.h" diff --git a/arch/mips/ralink/rt3883.c b/arch/mips/ralink/rt3883.c index 8f3fe31..61786c5 100644 --- a/arch/mips/ralink/rt3883.c +++ b/arch/mips/ralink/rt3883.c @@ -12,9 +12,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include "common.h" diff --git a/arch/mips/ralink/timer.c b/arch/mips/ralink/timer.c index 652424d..e8d42c3 100644 --- a/arch/mips/ralink/timer.c +++ b/arch/mips/ralink/timer.c @@ -12,7 +12,7 @@ #include #include -#include +#include #define TIMER_REG_TMRSTAT 0x00 #define TIMER_REG_TMR0LOAD 0x10 From patchwork Mon Mar 30 09:00:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bibo Mao X-Patchwork-Id: 11465003 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 DA2441805 for ; Mon, 30 Mar 2020 09:00:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C29D220784 for ; Mon, 30 Mar 2020 09:00:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729865AbgC3JA4 (ORCPT ); Mon, 30 Mar 2020 05:00:56 -0400 Received: from mail.loongson.cn ([114.242.206.163]:33946 "EHLO loongson.cn" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729816AbgC3JAz (ORCPT ); Mon, 30 Mar 2020 05:00:55 -0400 Received: from kvm-dev1.localdomain (unknown [10.2.5.134]) by mail.loongson.cn (Coremail) with SMTP id AQAAf9Ax1ulDtYFeCpohAA--.24S2; Mon, 30 Mar 2020 17:00: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 34/39] MIPS: sni: Add header file path prefix Date: Mon, 30 Mar 2020 05:00:50 -0400 Message-Id: <1585558850-15693-1-git-send-email-maobibo@loongson.cn> X-Mailer: git-send-email 1.8.3.1 X-CM-TRANSID: AQAAf9Ax1ulDtYFeCpohAA--.24S2 X-Coremail-Antispam: 1UD129KBjvJXoWxuFyDZFyDtw13Jw1UCrWfZrb_yoWxCFy3pa 1DA3WkGF4ruryUA3s3Za47WF43JwsxGrWq9Fy5W342v3WSqF1UJrs3tr98AryxJF4Dt3W0 gay3ur1Utr4vvaUanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUkSb7Iv0xC_Kw4lb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rw A2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6xII jxv20xvEc7CjxVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26F4UJVW0owA2z4x0Y4 vEx4A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xv F2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jw0_WrylYx0Ex4A2jsIE14v26r4UJV WxJr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JMxkIecxEwVCm-wCF04k2 0xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI 8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2Ij64vIr41l IxAIcVC0I7IYx2IY67AKxVW5JVW7JwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJw CI42IY6xAIw20EY4v20xvaj40_JFI_Gr1lIxAIcVC2z280aVAFwI0_Cr0_Gr1UMIIF0xvE x4A2jsIEc7CjxVAFwI0_Gr1j6F4UJbIYCTnIWIevJa73UjIFyTuYvjxUgTKuUUUUU 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-rm to arch/mips/sni/include/mach Signed-off-by: bibo mao --- arch/mips/Kconfig | 1 + arch/mips/pci/fixup-sni.c | 2 +- arch/mips/sni/Platform | 2 +- .../{include/asm/mach-rm => sni/include/mach}/cpu-feature-overrides.h | 0 arch/mips/sni/include/mach/floppy.h | 2 ++ arch/mips/sni/include/mach/ide.h | 2 ++ arch/mips/sni/include/mach/ioremap.h | 2 ++ arch/mips/sni/include/mach/irq.h | 2 ++ arch/mips/sni/include/mach/kernel-entry-init.h | 2 ++ arch/mips/sni/include/mach/kmalloc.h | 2 ++ arch/mips/sni/include/mach/mangle-port.h | 2 ++ arch/mips/{include/asm/mach-rm => sni/include/mach}/mc146818rtc.h | 0 arch/mips/sni/include/mach/spaces.h | 2 ++ arch/mips/sni/include/mach/topology.h | 2 ++ arch/mips/{include/asm/mach-rm => sni/include/mach}/war.h | 0 15 files changed, 21 insertions(+), 2 deletions(-) rename arch/mips/{include/asm/mach-rm => sni/include/mach}/cpu-feature-overrides.h (100%) create mode 100644 arch/mips/sni/include/mach/floppy.h create mode 100644 arch/mips/sni/include/mach/ide.h create mode 100644 arch/mips/sni/include/mach/ioremap.h create mode 100644 arch/mips/sni/include/mach/irq.h create mode 100644 arch/mips/sni/include/mach/kernel-entry-init.h create mode 100644 arch/mips/sni/include/mach/kmalloc.h create mode 100644 arch/mips/sni/include/mach/mangle-port.h rename arch/mips/{include/asm/mach-rm => sni/include/mach}/mc146818rtc.h (100%) create mode 100644 arch/mips/sni/include/mach/spaces.h create mode 100644 arch/mips/sni/include/mach/topology.h rename arch/mips/{include/asm/mach-rm => sni/include/mach}/war.h (100%) diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 0687b94..19fbcfa 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -956,6 +956,7 @@ config SNI_RM select SYS_SUPPORTS_BIG_ENDIAN select SYS_SUPPORTS_HIGHMEM select SYS_SUPPORTS_LITTLE_ENDIAN + select HAVE_MACH_HEAD_FILES help The SNI RM200/300/400 are MIPS-based machines manufactured by Siemens Nixdorf Informationssysteme (SNI), parent company of Pyramid diff --git a/arch/mips/pci/fixup-sni.c b/arch/mips/pci/fixup-sni.c index adb9a58..3ccbd46 100644 --- a/arch/mips/pci/fixup-sni.c +++ b/arch/mips/pci/fixup-sni.c @@ -14,7 +14,7 @@ #include #include -#include +#include /* * PCIMT Shortcuts ... diff --git a/arch/mips/sni/Platform b/arch/mips/sni/Platform index 2644a9d..925ed55 100644 --- a/arch/mips/sni/Platform +++ b/arch/mips/sni/Platform @@ -2,7 +2,7 @@ # SNI RM # platform-$(CONFIG_SNI_RM) += sni/ -cflags-$(CONFIG_SNI_RM) += -I$(srctree)/arch/mips/include/asm/mach-rm +cflags-$(CONFIG_SNI_RM) += -I$(srctree)/arch/mips/sni/include ifdef CONFIG_CPU_LITTLE_ENDIAN load-$(CONFIG_SNI_RM) += 0xffffffff80600000 else diff --git a/arch/mips/include/asm/mach-rm/cpu-feature-overrides.h b/arch/mips/sni/include/mach/cpu-feature-overrides.h similarity index 100% rename from arch/mips/include/asm/mach-rm/cpu-feature-overrides.h rename to arch/mips/sni/include/mach/cpu-feature-overrides.h diff --git a/arch/mips/sni/include/mach/floppy.h b/arch/mips/sni/include/mach/floppy.h new file mode 100644 index 0000000..8e17183 --- /dev/null +++ b/arch/mips/sni/include/mach/floppy.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/sni/include/mach/ide.h b/arch/mips/sni/include/mach/ide.h new file mode 100644 index 0000000..1251c0c --- /dev/null +++ b/arch/mips/sni/include/mach/ide.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/sni/include/mach/ioremap.h b/arch/mips/sni/include/mach/ioremap.h new file mode 100644 index 0000000..2369393 --- /dev/null +++ b/arch/mips/sni/include/mach/ioremap.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/sni/include/mach/irq.h b/arch/mips/sni/include/mach/irq.h new file mode 100644 index 0000000..bb5ccce --- /dev/null +++ b/arch/mips/sni/include/mach/irq.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/sni/include/mach/kernel-entry-init.h b/arch/mips/sni/include/mach/kernel-entry-init.h new file mode 100644 index 0000000..19b872be --- /dev/null +++ b/arch/mips/sni/include/mach/kernel-entry-init.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/sni/include/mach/kmalloc.h b/arch/mips/sni/include/mach/kmalloc.h new file mode 100644 index 0000000..4f056db --- /dev/null +++ b/arch/mips/sni/include/mach/kmalloc.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/sni/include/mach/mangle-port.h b/arch/mips/sni/include/mach/mangle-port.h new file mode 100644 index 0000000..b9736e3 --- /dev/null +++ b/arch/mips/sni/include/mach/mangle-port.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-rm/mc146818rtc.h b/arch/mips/sni/include/mach/mc146818rtc.h similarity index 100% rename from arch/mips/include/asm/mach-rm/mc146818rtc.h rename to arch/mips/sni/include/mach/mc146818rtc.h diff --git a/arch/mips/sni/include/mach/spaces.h b/arch/mips/sni/include/mach/spaces.h new file mode 100644 index 0000000..39a4d72 --- /dev/null +++ b/arch/mips/sni/include/mach/spaces.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/sni/include/mach/topology.h b/arch/mips/sni/include/mach/topology.h new file mode 100644 index 0000000..86e585b --- /dev/null +++ b/arch/mips/sni/include/mach/topology.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-rm/war.h b/arch/mips/sni/include/mach/war.h similarity index 100% rename from arch/mips/include/asm/mach-rm/war.h rename to arch/mips/sni/include/mach/war.h From patchwork Mon Mar 30 09:00:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bibo Mao X-Patchwork-Id: 11465005 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 38D5F13A4 for ; Mon, 30 Mar 2020 09:01:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 215B720757 for ; Mon, 30 Mar 2020 09:01:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729860AbgC3JBC (ORCPT ); Mon, 30 Mar 2020 05:01:02 -0400 Received: from mail.loongson.cn ([114.242.206.163]:33972 "EHLO loongson.cn" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729816AbgC3JBC (ORCPT ); Mon, 30 Mar 2020 05:01:02 -0400 Received: from kvm-dev1.localdomain (unknown [10.2.5.134]) by mail.loongson.cn (Coremail) with SMTP id AQAAf9AxT+hItYFeDZohAA--.37S2; Mon, 30 Mar 2020 17:00:56 +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 35/39] MIPS: paravirt: Add header file path prefix Date: Mon, 30 Mar 2020 05:00:56 -0400 Message-Id: <1585558856-17317-1-git-send-email-maobibo@loongson.cn> X-Mailer: git-send-email 1.8.3.1 X-CM-TRANSID: AQAAf9AxT+hItYFeDZohAA--.37S2 X-Coremail-Antispam: 1UD129KBjvJXoW3Gw47CF15Wr43Gr4fCFWxZwb_yoWxCry7pa 1DA3WkWa1UuFyUArs5uF47Cr43Jan8GFWjyr15Ww1YvasFq3Wjqrs5Grs8AryfAF4qy3W8 WrZxXr4UJws7Zw7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUkSb7Iv0xC_Kw4lb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rw A2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6xII jxv20xvEc7CjxVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26F4UJVW0owA2z4x0Y4 vEx4A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xv F2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jw0_WrylYx0Ex4A2jsIE14v26r4UJV WxJr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JMxkIecxEwVCm-wCF04k2 0xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI 8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2Ij64vIr41l IxAIcVC0I7IYx2IY67AKxVW5JVW7JwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJw CI42IY6xAIw20EY4v20xvaj40_JFI_Gr1lIxAIcVC2z280aVAFwI0_Cr0_Gr1UMIIF0xvE x4A2jsIEc7CjxVAFwI0_Gr1j6F4UJbIYCTnIWIevJa73UjIFyTuYvjxUgTKuUUUUU 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-paravirt to arch/mips/paravirt/include/mach Signed-off-by: bibo mao --- arch/mips/Kconfig | 1 + arch/mips/paravirt/Platform | 2 +- .../asm/mach-paravirt => paravirt/include/mach}/cpu-feature-overrides.h | 0 arch/mips/paravirt/include/mach/floppy.h | 2 ++ arch/mips/paravirt/include/mach/ide.h | 2 ++ arch/mips/paravirt/include/mach/ioremap.h | 2 ++ arch/mips/{include/asm/mach-paravirt => paravirt/include/mach}/irq.h | 0 .../asm/mach-paravirt => paravirt/include/mach}/kernel-entry-init.h | 0 arch/mips/paravirt/include/mach/kmalloc.h | 2 ++ arch/mips/paravirt/include/mach/mangle-port.h | 2 ++ arch/mips/paravirt/include/mach/mc146818rtc.h | 2 ++ arch/mips/paravirt/include/mach/spaces.h | 2 ++ arch/mips/paravirt/include/mach/topology.h | 2 ++ arch/mips/paravirt/include/mach/war.h | 2 ++ 14 files changed, 20 insertions(+), 1 deletion(-) rename arch/mips/{include/asm/mach-paravirt => paravirt/include/mach}/cpu-feature-overrides.h (100%) create mode 100644 arch/mips/paravirt/include/mach/floppy.h create mode 100644 arch/mips/paravirt/include/mach/ide.h create mode 100644 arch/mips/paravirt/include/mach/ioremap.h rename arch/mips/{include/asm/mach-paravirt => paravirt/include/mach}/irq.h (100%) rename arch/mips/{include/asm/mach-paravirt => paravirt/include/mach}/kernel-entry-init.h (100%) create mode 100644 arch/mips/paravirt/include/mach/kmalloc.h create mode 100644 arch/mips/paravirt/include/mach/mangle-port.h create mode 100644 arch/mips/paravirt/include/mach/mc146818rtc.h create mode 100644 arch/mips/paravirt/include/mach/spaces.h create mode 100644 arch/mips/paravirt/include/mach/topology.h create mode 100644 arch/mips/paravirt/include/mach/war.h diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 19fbcfa..862306c9 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -1100,6 +1100,7 @@ config MIPS_PARAVIRT select SYS_HAS_CPU_CAVIUM_OCTEON select HAVE_PCI select SWAP_IO_SPACE + select HAVE_MACH_HEAD_FILES help This option supports guest running under ???? diff --git a/arch/mips/paravirt/Platform b/arch/mips/paravirt/Platform index 7e76ef2..ca91528 100644 --- a/arch/mips/paravirt/Platform +++ b/arch/mips/paravirt/Platform @@ -3,6 +3,6 @@ # platform-$(CONFIG_MIPS_PARAVIRT) += paravirt/ cflags-$(CONFIG_MIPS_PARAVIRT) += \ - -I$(srctree)/arch/mips/include/asm/mach-paravirt + -I$(srctree)/arch/mips/paravirt/include load-$(CONFIG_MIPS_PARAVIRT) = 0xffffffff80010000 diff --git a/arch/mips/include/asm/mach-paravirt/cpu-feature-overrides.h b/arch/mips/paravirt/include/mach/cpu-feature-overrides.h similarity index 100% rename from arch/mips/include/asm/mach-paravirt/cpu-feature-overrides.h rename to arch/mips/paravirt/include/mach/cpu-feature-overrides.h diff --git a/arch/mips/paravirt/include/mach/floppy.h b/arch/mips/paravirt/include/mach/floppy.h new file mode 100644 index 0000000..8e17183 --- /dev/null +++ b/arch/mips/paravirt/include/mach/floppy.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/paravirt/include/mach/ide.h b/arch/mips/paravirt/include/mach/ide.h new file mode 100644 index 0000000..1251c0c --- /dev/null +++ b/arch/mips/paravirt/include/mach/ide.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/paravirt/include/mach/ioremap.h b/arch/mips/paravirt/include/mach/ioremap.h new file mode 100644 index 0000000..2369393 --- /dev/null +++ b/arch/mips/paravirt/include/mach/ioremap.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-paravirt/irq.h b/arch/mips/paravirt/include/mach/irq.h similarity index 100% rename from arch/mips/include/asm/mach-paravirt/irq.h rename to arch/mips/paravirt/include/mach/irq.h diff --git a/arch/mips/include/asm/mach-paravirt/kernel-entry-init.h b/arch/mips/paravirt/include/mach/kernel-entry-init.h similarity index 100% rename from arch/mips/include/asm/mach-paravirt/kernel-entry-init.h rename to arch/mips/paravirt/include/mach/kernel-entry-init.h diff --git a/arch/mips/paravirt/include/mach/kmalloc.h b/arch/mips/paravirt/include/mach/kmalloc.h new file mode 100644 index 0000000..4f056db --- /dev/null +++ b/arch/mips/paravirt/include/mach/kmalloc.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/paravirt/include/mach/mangle-port.h b/arch/mips/paravirt/include/mach/mangle-port.h new file mode 100644 index 0000000..b9736e3 --- /dev/null +++ b/arch/mips/paravirt/include/mach/mangle-port.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/paravirt/include/mach/mc146818rtc.h b/arch/mips/paravirt/include/mach/mc146818rtc.h new file mode 100644 index 0000000..7284af8 --- /dev/null +++ b/arch/mips/paravirt/include/mach/mc146818rtc.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/paravirt/include/mach/spaces.h b/arch/mips/paravirt/include/mach/spaces.h new file mode 100644 index 0000000..39a4d72 --- /dev/null +++ b/arch/mips/paravirt/include/mach/spaces.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/paravirt/include/mach/topology.h b/arch/mips/paravirt/include/mach/topology.h new file mode 100644 index 0000000..86e585b --- /dev/null +++ b/arch/mips/paravirt/include/mach/topology.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/paravirt/include/mach/war.h b/arch/mips/paravirt/include/mach/war.h new file mode 100644 index 0000000..5b0422a --- /dev/null +++ b/arch/mips/paravirt/include/mach/war.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include From patchwork Mon Mar 30 09:01: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: 11465007 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 CDCC3912 for ; Mon, 30 Mar 2020 09:01:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B674B20733 for ; Mon, 30 Mar 2020 09:01:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729839AbgC3JBJ (ORCPT ); Mon, 30 Mar 2020 05:01:09 -0400 Received: from mail.loongson.cn ([114.242.206.163]:34010 "EHLO loongson.cn" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729816AbgC3JBJ (ORCPT ); Mon, 30 Mar 2020 05:01:09 -0400 Received: from kvm-dev1.localdomain (unknown [10.2.5.134]) by mail.loongson.cn (Coremail) with SMTP id AQAAf9AxT+hOtYFeEJohAA--.38S2; Mon, 30 Mar 2020 17:01:03 +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 36/39] MIPS: netlogic: Add header file path prefix Date: Mon, 30 Mar 2020 05:01:02 -0400 Message-Id: <1585558862-24429-1-git-send-email-maobibo@loongson.cn> X-Mailer: git-send-email 1.8.3.1 X-CM-TRANSID: AQAAf9AxT+hOtYFeEJohAA--.38S2 X-Coremail-Antispam: 1UD129KBjvJXoWxtr4xWr43CF1kGw13Ar18Xwb_yoWfJrW5pa ykA3WkKF47u34jyw1fZF4Iqr43Ja98WrWjkryY9w17Z3WSqF18Jrsakwn8AryfAFWDK3Wr WrZxXr13Jws5uw7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUkSb7Iv0xC_Kw4lb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rw A2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6xII jxv20xvEc7CjxVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26F4UJVW0owA2z4x0Y4 vEx4A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xv F2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jw0_WrylYx0Ex4A2jsIE14v26r4UJV WxJr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JMxkIecxEwVCm-wCF04k2 0xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI 8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2Ij64vIr41l IxAIcVC0I7IYx2IY67AKxVW5JVW7JwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJw CI42IY6xAIw20EY4v20xvaj40_JFI_Gr1lIxAIcVC2z280aVAFwI0_Cr0_Gr1UMIIF0xvE x4A2jsIEc7CjxVAFwI0_Gr1j6F4UJbIYCTnIWIevJa73UjIFyTuYvjxUgTKuUUUUU 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-netlogic to arch/mips/netlogic/include/mach Signed-off-by: bibo mao --- arch/mips/Kconfig | 2 ++ arch/mips/include/asm/netlogic/common.h | 2 +- arch/mips/netlogic/Platform | 2 +- .../asm/mach-netlogic => netlogic/include/mach}/cpu-feature-overrides.h | 0 arch/mips/netlogic/include/mach/floppy.h | 2 ++ arch/mips/netlogic/include/mach/ide.h | 2 ++ arch/mips/netlogic/include/mach/ioremap.h | 2 ++ arch/mips/{include/asm/mach-netlogic => netlogic/include/mach}/irq.h | 2 +- arch/mips/netlogic/include/mach/kernel-entry-init.h | 2 ++ arch/mips/netlogic/include/mach/kmalloc.h | 2 ++ arch/mips/netlogic/include/mach/mangle-port.h | 2 ++ arch/mips/netlogic/include/mach/mc146818rtc.h | 2 ++ .../{include/asm/mach-netlogic => netlogic/include/mach}/multi-node.h | 0 arch/mips/netlogic/include/mach/spaces.h | 2 ++ arch/mips/netlogic/include/mach/topology.h | 2 ++ arch/mips/netlogic/include/mach/war.h | 2 ++ 16 files changed, 25 insertions(+), 3 deletions(-) rename arch/mips/{include/asm/mach-netlogic => netlogic/include/mach}/cpu-feature-overrides.h (100%) create mode 100644 arch/mips/netlogic/include/mach/floppy.h create mode 100644 arch/mips/netlogic/include/mach/ide.h create mode 100644 arch/mips/netlogic/include/mach/ioremap.h rename arch/mips/{include/asm/mach-netlogic => netlogic/include/mach}/irq.h (91%) create mode 100644 arch/mips/netlogic/include/mach/kernel-entry-init.h create mode 100644 arch/mips/netlogic/include/mach/kmalloc.h create mode 100644 arch/mips/netlogic/include/mach/mangle-port.h create mode 100644 arch/mips/netlogic/include/mach/mc146818rtc.h rename arch/mips/{include/asm/mach-netlogic => netlogic/include/mach}/multi-node.h (100%) create mode 100644 arch/mips/netlogic/include/mach/spaces.h create mode 100644 arch/mips/netlogic/include/mach/topology.h create mode 100644 arch/mips/netlogic/include/mach/war.h diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 862306c9..e539ff3 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -1053,6 +1053,7 @@ config NLM_XLR_BOARD select SYS_HAS_EARLY_PRINTK select SYS_SUPPORTS_ZBOOT select SYS_SUPPORTS_ZBOOT_UART16550 + select HAVE_MACH_HEAD_FILES help Support for systems based on Netlogic XLR and XLS processors. Say Y here if you have a XLR or XLS based board. @@ -1081,6 +1082,7 @@ config NLM_XLP_BOARD select USE_OF select SYS_SUPPORTS_ZBOOT select SYS_SUPPORTS_ZBOOT_UART16550 + select HAVE_MACH_HEAD_FILES help This board is based on Netlogic XLP Processor. Say Y here if you have a XLP based board. diff --git a/arch/mips/include/asm/netlogic/common.h b/arch/mips/include/asm/netlogic/common.h index 5761664..6bab414 100644 --- a/arch/mips/include/asm/netlogic/common.h +++ b/arch/mips/include/asm/netlogic/common.h @@ -54,7 +54,7 @@ #include #include #include -#include +#include struct irq_desc; void nlm_smp_function_ipi_handler(struct irq_desc *desc); diff --git a/arch/mips/netlogic/Platform b/arch/mips/netlogic/Platform index fb8eb4c..8086f28 100644 --- a/arch/mips/netlogic/Platform +++ b/arch/mips/netlogic/Platform @@ -1,7 +1,7 @@ # # NETLOGIC includes # -cflags-$(CONFIG_NLM_COMMON) += -I$(srctree)/arch/mips/include/asm/mach-netlogic +cflags-$(CONFIG_NLM_COMMON) += -I$(srctree)/arch/mips/netlogic/include cflags-$(CONFIG_NLM_COMMON) += -I$(srctree)/arch/mips/include/asm/netlogic # diff --git a/arch/mips/include/asm/mach-netlogic/cpu-feature-overrides.h b/arch/mips/netlogic/include/mach/cpu-feature-overrides.h similarity index 100% rename from arch/mips/include/asm/mach-netlogic/cpu-feature-overrides.h rename to arch/mips/netlogic/include/mach/cpu-feature-overrides.h diff --git a/arch/mips/netlogic/include/mach/floppy.h b/arch/mips/netlogic/include/mach/floppy.h new file mode 100644 index 0000000..8e17183 --- /dev/null +++ b/arch/mips/netlogic/include/mach/floppy.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/netlogic/include/mach/ide.h b/arch/mips/netlogic/include/mach/ide.h new file mode 100644 index 0000000..1251c0c --- /dev/null +++ b/arch/mips/netlogic/include/mach/ide.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/netlogic/include/mach/ioremap.h b/arch/mips/netlogic/include/mach/ioremap.h new file mode 100644 index 0000000..2369393 --- /dev/null +++ b/arch/mips/netlogic/include/mach/ioremap.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-netlogic/irq.h b/arch/mips/netlogic/include/mach/irq.h similarity index 91% rename from arch/mips/include/asm/mach-netlogic/irq.h rename to arch/mips/netlogic/include/mach/irq.h index c0dbd53..de9d4c5 100644 --- a/arch/mips/include/asm/mach-netlogic/irq.h +++ b/arch/mips/netlogic/include/mach/irq.h @@ -8,7 +8,7 @@ #ifndef __ASM_NETLOGIC_IRQ_H #define __ASM_NETLOGIC_IRQ_H -#include +#include #define NLM_IRQS_PER_NODE 1024 #define NR_IRQS (NLM_IRQS_PER_NODE * NLM_NR_NODES) diff --git a/arch/mips/netlogic/include/mach/kernel-entry-init.h b/arch/mips/netlogic/include/mach/kernel-entry-init.h new file mode 100644 index 0000000..19b872be --- /dev/null +++ b/arch/mips/netlogic/include/mach/kernel-entry-init.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/netlogic/include/mach/kmalloc.h b/arch/mips/netlogic/include/mach/kmalloc.h new file mode 100644 index 0000000..4f056db --- /dev/null +++ b/arch/mips/netlogic/include/mach/kmalloc.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/netlogic/include/mach/mangle-port.h b/arch/mips/netlogic/include/mach/mangle-port.h new file mode 100644 index 0000000..b9736e3 --- /dev/null +++ b/arch/mips/netlogic/include/mach/mangle-port.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/netlogic/include/mach/mc146818rtc.h b/arch/mips/netlogic/include/mach/mc146818rtc.h new file mode 100644 index 0000000..7284af8 --- /dev/null +++ b/arch/mips/netlogic/include/mach/mc146818rtc.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-netlogic/multi-node.h b/arch/mips/netlogic/include/mach/multi-node.h similarity index 100% rename from arch/mips/include/asm/mach-netlogic/multi-node.h rename to arch/mips/netlogic/include/mach/multi-node.h diff --git a/arch/mips/netlogic/include/mach/spaces.h b/arch/mips/netlogic/include/mach/spaces.h new file mode 100644 index 0000000..39a4d72 --- /dev/null +++ b/arch/mips/netlogic/include/mach/spaces.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/netlogic/include/mach/topology.h b/arch/mips/netlogic/include/mach/topology.h new file mode 100644 index 0000000..86e585b --- /dev/null +++ b/arch/mips/netlogic/include/mach/topology.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/netlogic/include/mach/war.h b/arch/mips/netlogic/include/mach/war.h new file mode 100644 index 0000000..5b0422a --- /dev/null +++ b/arch/mips/netlogic/include/mach/war.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include From patchwork Mon Mar 30 09:01: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: 11465009 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 4D8AA912 for ; Mon, 30 Mar 2020 09:01:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 36A6120774 for ; Mon, 30 Mar 2020 09:01:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729901AbgC3JBO (ORCPT ); Mon, 30 Mar 2020 05:01:14 -0400 Received: from mail.loongson.cn ([114.242.206.163]:34032 "EHLO loongson.cn" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729816AbgC3JBO (ORCPT ); Mon, 30 Mar 2020 05:01:14 -0400 Received: from kvm-dev1.localdomain (unknown [10.2.5.134]) by mail.loongson.cn (Coremail) with SMTP id AQAAf9DxfetVtYFeF5ohAA--.30S2; Mon, 30 Mar 2020 17:01: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 37/39] MIPS: malta: Add header file path prefix Date: Mon, 30 Mar 2020 05:01:09 -0400 Message-Id: <1585558869-32180-1-git-send-email-maobibo@loongson.cn> X-Mailer: git-send-email 1.8.3.1 X-CM-TRANSID: AQAAf9DxfetVtYFeF5ohAA--.30S2 X-Coremail-Antispam: 1UD129KBjvJXoW3Aw18XFWxKryDAF4kGrWDCFg_yoWfAw1rpF 4qy3Z7KF4ruFyUuF1rZrW7Kr43tws5GrW5ta4Ygw48Z3ZaqF15Jrs5Grn0yryxJFWqqF18 uFySqF13Jw4kuw7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUkSb7Iv0xC_Kw4lb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rw A2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6xII jxv20xvEc7CjxVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26F4UJVW0owA2z4x0Y4 vEx4A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xv F2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jw0_WrylYx0Ex4A2jsIE14v26r4UJV WxJr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JMxkIecxEwVCm-wCF04k2 0xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI 8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2Ij64vIr41l IxAIcVC0I7IYx2IY67AKxVW5JVW7JwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJw CI42IY6xAIw20EY4v20xvaj40_JFI_Gr1lIxAIcVC2z280aVAFwI0_Cr0_Gr1UMIIF0xvE x4A2jsIEc7CjxVAFwI0_Gr1j6F4UJbIYCTnIWIevJa73UjIFyTuYvjxUgTKuUUUUU 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-malta to arch/mips/mti-malta/include/mach Signed-off-by: bibo mao --- arch/mips/Kconfig | 1 + arch/mips/include/asm/rtlx.h | 2 +- arch/mips/mti-malta/Platform | 2 +- .../asm/mach-malta => mti-malta/include/mach}/cpu-feature-overrides.h | 0 arch/mips/mti-malta/include/mach/floppy.h | 2 ++ arch/mips/mti-malta/include/mach/ide.h | 2 ++ arch/mips/mti-malta/include/mach/ioremap.h | 2 ++ arch/mips/{include/asm/mach-malta => mti-malta/include/mach}/irq.h | 0 .../asm/mach-malta => mti-malta/include/mach}/kernel-entry-init.h | 0 arch/mips/mti-malta/include/mach/kmalloc.h | 2 ++ .../{include/asm/mach-malta => mti-malta/include/mach}/mach-gt64120.h | 0 .../{include/asm/mach-malta => mti-malta/include/mach}/malta-dtshim.h | 0 arch/mips/{include/asm/mach-malta => mti-malta/include/mach}/malta-pm.h | 0 arch/mips/mti-malta/include/mach/mangle-port.h | 2 ++ .../{include/asm/mach-malta => mti-malta/include/mach}/mc146818rtc.h | 0 arch/mips/{include/asm/mach-malta => mti-malta/include/mach}/spaces.h | 0 arch/mips/mti-malta/include/mach/topology.h | 2 ++ arch/mips/{include/asm/mach-malta => mti-malta/include/mach}/war.h | 0 arch/mips/mti-malta/malta-setup.c | 2 +- 19 files changed, 16 insertions(+), 3 deletions(-) rename arch/mips/{include/asm/mach-malta => mti-malta/include/mach}/cpu-feature-overrides.h (100%) create mode 100644 arch/mips/mti-malta/include/mach/floppy.h create mode 100644 arch/mips/mti-malta/include/mach/ide.h create mode 100644 arch/mips/mti-malta/include/mach/ioremap.h rename arch/mips/{include/asm/mach-malta => mti-malta/include/mach}/irq.h (100%) rename arch/mips/{include/asm/mach-malta => mti-malta/include/mach}/kernel-entry-init.h (100%) create mode 100644 arch/mips/mti-malta/include/mach/kmalloc.h rename arch/mips/{include/asm/mach-malta => mti-malta/include/mach}/mach-gt64120.h (100%) rename arch/mips/{include/asm/mach-malta => mti-malta/include/mach}/malta-dtshim.h (100%) rename arch/mips/{include/asm/mach-malta => mti-malta/include/mach}/malta-pm.h (100%) create mode 100644 arch/mips/mti-malta/include/mach/mangle-port.h rename arch/mips/{include/asm/mach-malta => mti-malta/include/mach}/mc146818rtc.h (100%) rename arch/mips/{include/asm/mach-malta => mti-malta/include/mach}/spaces.h (100%) create mode 100644 arch/mips/mti-malta/include/mach/topology.h rename arch/mips/{include/asm/mach-malta => mti-malta/include/mach}/war.h (100%) diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index e539ff3..898e875 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -598,6 +598,7 @@ config MIPS_MALTA select SYS_SUPPORTS_ZBOOT select USE_OF select ZONE_DMA32 if 64BIT + select HAVE_MACH_HEAD_FILES help This enables support for the MIPS Technologies Malta evaluation board. diff --git a/arch/mips/include/asm/rtlx.h b/arch/mips/include/asm/rtlx.h index c102065..8ec9ca6 100644 --- a/arch/mips/include/asm/rtlx.h +++ b/arch/mips/include/asm/rtlx.h @@ -9,7 +9,7 @@ #ifndef __ASM_RTLX_H_ #define __ASM_RTLX_H_ -#include +#include #define RTLX_MODULE_NAME "rtlx" diff --git a/arch/mips/mti-malta/Platform b/arch/mips/mti-malta/Platform index 2cc72c9..3a0e361 100644 --- a/arch/mips/mti-malta/Platform +++ b/arch/mips/mti-malta/Platform @@ -2,7 +2,7 @@ # MIPS Malta board # platform-$(CONFIG_MIPS_MALTA) += mti-malta/ -cflags-$(CONFIG_MIPS_MALTA) += -I$(srctree)/arch/mips/include/asm/mach-malta +cflags-$(CONFIG_MIPS_MALTA) += -I$(srctree)/arch/mips/mti-malta/include ifdef CONFIG_KVM_GUEST load-$(CONFIG_MIPS_MALTA) += 0x0000000040100000 else diff --git a/arch/mips/include/asm/mach-malta/cpu-feature-overrides.h b/arch/mips/mti-malta/include/mach/cpu-feature-overrides.h similarity index 100% rename from arch/mips/include/asm/mach-malta/cpu-feature-overrides.h rename to arch/mips/mti-malta/include/mach/cpu-feature-overrides.h diff --git a/arch/mips/mti-malta/include/mach/floppy.h b/arch/mips/mti-malta/include/mach/floppy.h new file mode 100644 index 0000000..8e17183 --- /dev/null +++ b/arch/mips/mti-malta/include/mach/floppy.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/mti-malta/include/mach/ide.h b/arch/mips/mti-malta/include/mach/ide.h new file mode 100644 index 0000000..1251c0c --- /dev/null +++ b/arch/mips/mti-malta/include/mach/ide.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/mti-malta/include/mach/ioremap.h b/arch/mips/mti-malta/include/mach/ioremap.h new file mode 100644 index 0000000..2369393 --- /dev/null +++ b/arch/mips/mti-malta/include/mach/ioremap.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-malta/irq.h b/arch/mips/mti-malta/include/mach/irq.h similarity index 100% rename from arch/mips/include/asm/mach-malta/irq.h rename to arch/mips/mti-malta/include/mach/irq.h diff --git a/arch/mips/include/asm/mach-malta/kernel-entry-init.h b/arch/mips/mti-malta/include/mach/kernel-entry-init.h similarity index 100% rename from arch/mips/include/asm/mach-malta/kernel-entry-init.h rename to arch/mips/mti-malta/include/mach/kernel-entry-init.h diff --git a/arch/mips/mti-malta/include/mach/kmalloc.h b/arch/mips/mti-malta/include/mach/kmalloc.h new file mode 100644 index 0000000..4f056db --- /dev/null +++ b/arch/mips/mti-malta/include/mach/kmalloc.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-malta/mach-gt64120.h b/arch/mips/mti-malta/include/mach/mach-gt64120.h similarity index 100% rename from arch/mips/include/asm/mach-malta/mach-gt64120.h rename to arch/mips/mti-malta/include/mach/mach-gt64120.h diff --git a/arch/mips/include/asm/mach-malta/malta-dtshim.h b/arch/mips/mti-malta/include/mach/malta-dtshim.h similarity index 100% rename from arch/mips/include/asm/mach-malta/malta-dtshim.h rename to arch/mips/mti-malta/include/mach/malta-dtshim.h diff --git a/arch/mips/include/asm/mach-malta/malta-pm.h b/arch/mips/mti-malta/include/mach/malta-pm.h similarity index 100% rename from arch/mips/include/asm/mach-malta/malta-pm.h rename to arch/mips/mti-malta/include/mach/malta-pm.h diff --git a/arch/mips/mti-malta/include/mach/mangle-port.h b/arch/mips/mti-malta/include/mach/mangle-port.h new file mode 100644 index 0000000..b9736e3 --- /dev/null +++ b/arch/mips/mti-malta/include/mach/mangle-port.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-malta/mc146818rtc.h b/arch/mips/mti-malta/include/mach/mc146818rtc.h similarity index 100% rename from arch/mips/include/asm/mach-malta/mc146818rtc.h rename to arch/mips/mti-malta/include/mach/mc146818rtc.h diff --git a/arch/mips/include/asm/mach-malta/spaces.h b/arch/mips/mti-malta/include/mach/spaces.h similarity index 100% rename from arch/mips/include/asm/mach-malta/spaces.h rename to arch/mips/mti-malta/include/mach/spaces.h diff --git a/arch/mips/mti-malta/include/mach/topology.h b/arch/mips/mti-malta/include/mach/topology.h new file mode 100644 index 0000000..86e585b --- /dev/null +++ b/arch/mips/mti-malta/include/mach/topology.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/include/asm/mach-malta/war.h b/arch/mips/mti-malta/include/mach/war.h similarity index 100% rename from arch/mips/include/asm/mach-malta/war.h rename to arch/mips/mti-malta/include/mach/war.h diff --git a/arch/mips/mti-malta/malta-setup.c b/arch/mips/mti-malta/malta-setup.c index c4ad5a9..5571b5d 100644 --- a/arch/mips/mti-malta/malta-setup.c +++ b/arch/mips/mti-malta/malta-setup.c @@ -16,7 +16,7 @@ #include #include -#include +#include #include #include #include From patchwork Mon Mar 30 09:01:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bibo Mao X-Patchwork-Id: 11465011 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 50B95912 for ; Mon, 30 Mar 2020 09:01:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2F07020658 for ; Mon, 30 Mar 2020 09:01:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729899AbgC3JBU (ORCPT ); Mon, 30 Mar 2020 05:01:20 -0400 Received: from mail.loongson.cn ([114.242.206.163]:34058 "EHLO loongson.cn" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729816AbgC3JBU (ORCPT ); Mon, 30 Mar 2020 05:01:20 -0400 Received: from kvm-dev1.localdomain (unknown [10.2.5.134]) by mail.loongson.cn (Coremail) with SMTP id AQAAf9Dxr2pbtYFeGpohAA--.37S2; Mon, 30 Mar 2020 17:01:15 +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 38/39] MIPS: generic: Add header file path prefix Date: Mon, 30 Mar 2020 05:01:15 -0400 Message-Id: <1585558875-7530-1-git-send-email-maobibo@loongson.cn> X-Mailer: git-send-email 1.8.3.1 X-CM-TRANSID: AQAAf9Dxr2pbtYFeGpohAA--.37S2 X-Coremail-Antispam: 1UD129KBjvJXoWxKr4xuw17AF15Gw4fJFWrKrg_yoWxZFy3pa 1v9r1kKF4Uu348Ar4rZFy7Wr43AanxWrWYkr15W347Z3WSq3W8XFZ5XrWvyryxAa1jya1F gr9xWryUtr4kZaUanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUkSb7Iv0xC_Kw4lb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rw A2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6xII jxv20xvEc7CjxVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26F4UJVW0owA2z4x0Y4 vEx4A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xv F2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jw0_WrylYx0Ex4A2jsIE14v26r4UJV WxJr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JMxkIecxEwVCm-wCF04k2 0xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI 8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2Ij64vIr41l IxAIcVC0I7IYx2IY67AKxVW5JVW7JwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJw CI42IY6xAIw20EY4v20xvaj40_JFI_Gr1lIxAIcVC2z280aVAFwI0_Cr0_Gr1UMIIF0xvE x4A2jsIEc7CjxVAFwI0_Gr1j6F4UJbIYCTnIWIevJa73UjIFyTuYvjxUgTKuUUUUU X-CM-SenderInfo: xpdruxter6z05rqj20fqof0/ Sender: linux-mips-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org Add header files for mips generic platform, it is located at arch/mips/generic/include/mach/ Signed-off-by: bibo mao --- arch/mips/Kconfig | 1 + arch/mips/generic/Platform | 2 +- arch/mips/generic/include/mach/cpu-feature-overrides.h | 2 ++ arch/mips/generic/include/mach/floppy.h | 2 ++ arch/mips/generic/include/mach/ide.h | 2 ++ arch/mips/generic/include/mach/ioremap.h | 2 ++ arch/mips/generic/include/mach/irq.h | 2 ++ arch/mips/generic/include/mach/kernel-entry-init.h | 2 ++ arch/mips/generic/include/mach/kmalloc.h | 2 ++ arch/mips/generic/include/mach/mangle-port.h | 2 ++ arch/mips/generic/include/mach/mc146818rtc.h | 2 ++ arch/mips/generic/include/mach/spaces.h | 2 ++ arch/mips/generic/include/mach/topology.h | 2 ++ arch/mips/generic/include/mach/war.h | 2 ++ 14 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 arch/mips/generic/include/mach/cpu-feature-overrides.h create mode 100644 arch/mips/generic/include/mach/floppy.h create mode 100644 arch/mips/generic/include/mach/ide.h create mode 100644 arch/mips/generic/include/mach/ioremap.h create mode 100644 arch/mips/generic/include/mach/irq.h create mode 100644 arch/mips/generic/include/mach/kernel-entry-init.h create mode 100644 arch/mips/generic/include/mach/kmalloc.h create mode 100644 arch/mips/generic/include/mach/mangle-port.h create mode 100644 arch/mips/generic/include/mach/mc146818rtc.h create mode 100644 arch/mips/generic/include/mach/spaces.h create mode 100644 arch/mips/generic/include/mach/topology.h create mode 100644 arch/mips/generic/include/mach/war.h diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 898e875..3c85656 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -144,6 +144,7 @@ config MIPS_GENERIC select USB_UHCI_BIG_ENDIAN_DESC if CPU_BIG_ENDIAN select USB_UHCI_BIG_ENDIAN_MMIO if CPU_BIG_ENDIAN select USE_OF + select HAVE_MACH_HEAD_FILES help Select this to build a kernel which aims to support multiple boards, generally using a flattened device tree passed from the bootloader diff --git a/arch/mips/generic/Platform b/arch/mips/generic/Platform index eaa19d1..98308c9 100644 --- a/arch/mips/generic/Platform +++ b/arch/mips/generic/Platform @@ -9,7 +9,7 @@ # platform-$(CONFIG_MIPS_GENERIC) += generic/ -cflags-$(CONFIG_MIPS_GENERIC) += -I$(srctree)/arch/mips/include/asm/mach-generic +cflags-$(CONFIG_MIPS_GENERIC) += -I$(srctree)/arch/mips/generic/include load-$(CONFIG_MIPS_GENERIC) += 0xffffffff80100000 all-$(CONFIG_MIPS_GENERIC) := vmlinux.gz.itb diff --git a/arch/mips/generic/include/mach/cpu-feature-overrides.h b/arch/mips/generic/include/mach/cpu-feature-overrides.h new file mode 100644 index 0000000..f3e0e12 --- /dev/null +++ b/arch/mips/generic/include/mach/cpu-feature-overrides.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/generic/include/mach/floppy.h b/arch/mips/generic/include/mach/floppy.h new file mode 100644 index 0000000..8e17183 --- /dev/null +++ b/arch/mips/generic/include/mach/floppy.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/generic/include/mach/ide.h b/arch/mips/generic/include/mach/ide.h new file mode 100644 index 0000000..1251c0c --- /dev/null +++ b/arch/mips/generic/include/mach/ide.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/generic/include/mach/ioremap.h b/arch/mips/generic/include/mach/ioremap.h new file mode 100644 index 0000000..2369393 --- /dev/null +++ b/arch/mips/generic/include/mach/ioremap.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/generic/include/mach/irq.h b/arch/mips/generic/include/mach/irq.h new file mode 100644 index 0000000..bb5ccce --- /dev/null +++ b/arch/mips/generic/include/mach/irq.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/generic/include/mach/kernel-entry-init.h b/arch/mips/generic/include/mach/kernel-entry-init.h new file mode 100644 index 0000000..19b872be --- /dev/null +++ b/arch/mips/generic/include/mach/kernel-entry-init.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/generic/include/mach/kmalloc.h b/arch/mips/generic/include/mach/kmalloc.h new file mode 100644 index 0000000..4f056db --- /dev/null +++ b/arch/mips/generic/include/mach/kmalloc.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/generic/include/mach/mangle-port.h b/arch/mips/generic/include/mach/mangle-port.h new file mode 100644 index 0000000..b9736e3 --- /dev/null +++ b/arch/mips/generic/include/mach/mangle-port.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/generic/include/mach/mc146818rtc.h b/arch/mips/generic/include/mach/mc146818rtc.h new file mode 100644 index 0000000..7284af8 --- /dev/null +++ b/arch/mips/generic/include/mach/mc146818rtc.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/generic/include/mach/spaces.h b/arch/mips/generic/include/mach/spaces.h new file mode 100644 index 0000000..39a4d72 --- /dev/null +++ b/arch/mips/generic/include/mach/spaces.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/generic/include/mach/topology.h b/arch/mips/generic/include/mach/topology.h new file mode 100644 index 0000000..86e585b --- /dev/null +++ b/arch/mips/generic/include/mach/topology.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include diff --git a/arch/mips/generic/include/mach/war.h b/arch/mips/generic/include/mach/war.h new file mode 100644 index 0000000..5b0422a --- /dev/null +++ b/arch/mips/generic/include/mach/war.h @@ -0,0 +1,2 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include From patchwork Mon Mar 30 09:01:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bibo Mao X-Patchwork-Id: 11465013 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 D543A912 for ; Mon, 30 Mar 2020 09:01:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AA9B520733 for ; Mon, 30 Mar 2020 09:01:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729777AbgC3JB0 (ORCPT ); Mon, 30 Mar 2020 05:01:26 -0400 Received: from mail.loongson.cn ([114.242.206.163]:34102 "EHLO loongson.cn" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729704AbgC3JBZ (ORCPT ); Mon, 30 Mar 2020 05:01:25 -0400 Received: from kvm-dev1.localdomain (unknown [10.2.5.134]) by mail.loongson.cn (Coremail) with SMTP id AQAAf9Dxz91htYFeHZohAA--.15S2; Mon, 30 Mar 2020 17:01:21 +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 39/39] MIPS: Remove HAVE_MACH_HEAD_FILES option Date: Mon, 30 Mar 2020 05:01:21 -0400 Message-Id: <1585558881-15961-1-git-send-email-maobibo@loongson.cn> X-Mailer: git-send-email 1.8.3.1 X-CM-TRANSID: AQAAf9Dxz91htYFeHZohAA--.15S2 X-Coremail-Antispam: 1UD129KBjvAXoW3ZF4DKr13Cr4fWw4fKFy7trb_yoW8Cr1kZo Z7K3Z2kr4Fy3yfGF13WF1YkayrZF9agr48Za9xGwsrJF9xJa43t34F9a4jqFy5Gr1ft3sr WrWfuFW5Jr18Xa4kn29KB7ZKAUJUUUU8529EdanIXcx71UUUUU7v73VFW2AGmfu7bjvjm3 AaLaJ3UjIYCTnIWjp_UUUYe7k0a2IF6w4kM7kC6x804xWl14x267AKxVWUJVW8JwAFc2x0 x2IEx4CE42xK8VAvwI8IcIk0rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2ocxC64kIII0Yj4 1l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26F1j6w1UM28EF7xvwVC0 I7IYx2IY6xkF7I0E14v26r4UJVWxJr1l84ACjcxK6I8E87Iv67AKxVWxJr0_GcWl84ACjc xK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVAC Y4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1q6rW5McIj6I8E87Iv67AKxVW8Jr 0_Cr1UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCY02Avz4vE-syl42xK 82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGw C20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r1DMIIYrxkI7VAKI48J MIIF0xvE2Ix0cI8IcVAFwI0_Xr0_Ar1lIxAIcVC0I7IYx2IY6xkF7I0E14v26r4UJVWxJr 1lIxAIcVCF04k26cxKx2IYs7xG6r1I6r4UMIIF0xvEx4A2jsIE14v26F4j6r4UJwCI42IY 6I8E87Iv6xkF7I0E14v26r4UJVWxJrUvcSsGvfC2KfnxnUUI43ZEXa7IU59iSJUUUUU== X-CM-SenderInfo: xpdruxter6z05rqj20fqof0/ Sender: linux-mips-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org All platform has HAVE_MACH_HEAD_FILES option enabled, now remove this option Signed-off-by: bibo mao --- arch/mips/Kconfig | 40 ------------------------------------ arch/mips/Makefile | 3 --- 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 | 4 ---- 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 ---- arch/mips/txx9/Kconfig | 2 -- drivers/gpio/gpio-loongson.c | 4 ---- 19 files changed, 110 deletions(-) diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 3c85656..a1f973c 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -144,7 +144,6 @@ config MIPS_GENERIC select USB_UHCI_BIG_ENDIAN_DESC if CPU_BIG_ENDIAN select USB_UHCI_BIG_ENDIAN_MMIO if CPU_BIG_ENDIAN select USE_OF - select HAVE_MACH_HEAD_FILES help Select this to build a kernel which aims to support multiple boards, generally using a flattened device tree passed from the bootloader @@ -164,7 +163,6 @@ config MIPS_ALCHEMY select GPIOLIB select SYS_SUPPORTS_ZBOOT select COMMON_CLK - select HAVE_MACH_HEAD_FILES config AR7 bool "Texas Instruments AR7" @@ -184,7 +182,6 @@ 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. @@ -200,7 +197,6 @@ 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 @@ -225,7 +221,6 @@ 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. @@ -260,7 +255,6 @@ config BMIPS_GENERIC select USB_OHCI_BIG_ENDIAN_DESC if CPU_BIG_ENDIAN select USB_OHCI_BIG_ENDIAN_MMIO if CPU_BIG_ENDIAN select HARDIRQS_SW_RESEND - select HAVE_MACH_HEAD_FILES help Build a generic DT-based kernel image that boots on select BCM33xx cable modem chips, BCM63xx DSL chips, and BCM7xxx set-top @@ -288,7 +282,6 @@ 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 @@ -308,7 +301,6 @@ 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 @@ -330,7 +322,6 @@ config MIPS_COBALT select SYS_SUPPORTS_64BIT_KERNEL select SYS_SUPPORTS_LITTLE_ENDIAN select USE_GENERIC_EARLY_PRINTK_8250 - select HAVE_MACH_HEAD_FILES config MACH_DECSTATION bool "DECstations" @@ -354,7 +345,6 @@ config MACH_DECSTATION select SYS_SUPPORTS_256HZ select SYS_SUPPORTS_1024HZ select MIPS_L1_CACHE_SHIFT_4 - select HAVE_MACH_HEAD_FILES help This enables support for DEC's MIPS based workstations. For details see the Linux/MIPS FAQ on and the @@ -392,7 +382,6 @@ config MACH_JAZZ select SYS_SUPPORTS_32BIT_KERNEL select SYS_SUPPORTS_64BIT_KERNEL select SYS_SUPPORTS_100HZ - select HAVE_MACH_HEAD_FILES help This a family of machines based on the MIPS R4030 chipset which was used by several vendors to build RISC/os and Windows NT workstations. @@ -413,7 +402,6 @@ config MACH_INGENIC select GENERIC_IRQ_CHIP select BUILTIN_DTB if MIPS_NO_APPENDED_DTB select USE_OF - select HAVE_MACH_HEAD_FILES config LANTIQ bool "Lantiq based platforms" @@ -438,7 +426,6 @@ config LANTIQ select PINCTRL_LANTIQ select ARCH_HAS_RESET_CONTROLLER select RESET_CONTROLLER - select HAVE_MACH_HEAD_FILES config LASAT bool "LASAT Networks platforms" @@ -456,12 +443,10 @@ config LASAT select SYS_SUPPORTS_32BIT_KERNEL select SYS_SUPPORTS_64BIT_KERNEL if BROKEN select SYS_SUPPORTS_LITTLE_ENDIAN - select HAVE_MACH_HEAD_FILES config MACH_LOONGSON32 bool "Loongson 32-bit family of machines" select SYS_SUPPORTS_ZBOOT - select HAVE_MACH_HEAD_FILES help This enables support for the Loongson-1 family of machines. @@ -472,7 +457,6 @@ 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. @@ -507,7 +491,6 @@ 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. @@ -542,7 +525,6 @@ config MACH_PISTACHIO select SYS_HAS_EARLY_PRINTK select USE_GENERIC_EARLY_PRINTK_8250 select USE_OF - select HAVE_MACH_HEAD_FILES help This enables support for the IMG Pistachio SoC platform. @@ -599,14 +581,12 @@ config MIPS_MALTA select SYS_SUPPORTS_ZBOOT select USE_OF select ZONE_DMA32 if 64BIT - select HAVE_MACH_HEAD_FILES help This enables support for the MIPS Technologies Malta evaluation board. config MACH_PIC32 bool "Microchip PIC32 Family" - select HAVE_MACH_HEAD_FILES help This enables support for the Microchip PIC32 family of platforms. @@ -627,7 +607,6 @@ config MACH_VR41XX select SYS_HAS_CPU_VR41XX select SYS_SUPPORTS_MIPS16 select GPIOLIB - select HAVE_MACH_HEAD_FILES config NXP_STB220 bool "NXP STB220 board" @@ -660,7 +639,6 @@ config PMC_MSP select SERIAL_8250_CONSOLE select USB_EHCI_BIG_ENDIAN_MMIO select USB_EHCI_BIG_ENDIAN_DESC - select HAVE_MACH_HEAD_FILES help This adds support for the PMC-Sierra family of Multi-Service Processor System-On-A-Chips. These parts include a number @@ -684,7 +662,6 @@ config RALINK select CLKDEV_LOOKUP select ARCH_HAS_RESET_CONTROLLER select RESET_CONTROLLER - select HAVE_MACH_HEAD_FILES config SGI_IP22 bool "SGI IP22 (Indy/Indigo2)" @@ -718,7 +695,6 @@ config SGI_IP22 select SYS_SUPPORTS_64BIT_KERNEL select SYS_SUPPORTS_BIG_ENDIAN select MIPS_L1_CACHE_SHIFT_7 - select HAVE_MACH_HEAD_FILES help This are the SGI Indy, Challenge S and Indigo2, as well as certain OEM variants like the Tandem CMN B006S. To compile a Linux kernel @@ -746,7 +722,6 @@ config SGI_IP27 select SYS_SUPPORTS_NUMA select SYS_SUPPORTS_SMP select MIPS_L1_CACHE_SHIFT_7 - select HAVE_MACH_HEAD_FILES help This are the SGI Origin 200, Origin 2000 and Onyx 2 Graphics workstations. To compile a Linux kernel that runs on these, say Y @@ -781,7 +756,6 @@ config SGI_IP28 select SYS_SUPPORTS_64BIT_KERNEL select SYS_SUPPORTS_BIG_ENDIAN select MIPS_L1_CACHE_SHIFT_7 - select HAVE_MACH_HEAD_FILES help This is the SGI Indigo2 with R10000 processor. To compile a Linux kernel that runs on these, say Y here. @@ -809,7 +783,6 @@ config SGI_IP30 select SYS_SUPPORTS_SMP select MIPS_L1_CACHE_SHIFT_7 select ARC_MEMORY - select HAVE_MACH_HEAD_FILES help These are the SGI Octane and Octane2 graphics workstations. To compile a Linux kernel that runs on these, say Y here. @@ -835,7 +808,6 @@ config SGI_IP32 select SYS_HAS_CPU_NEVADA select SYS_SUPPORTS_64BIT_KERNEL select SYS_SUPPORTS_BIG_ENDIAN - select HAVE_MACH_HEAD_FILES help If you want this kernel to run on SGI O2 workstation, say Y here. @@ -958,7 +930,6 @@ config SNI_RM select SYS_SUPPORTS_BIG_ENDIAN select SYS_SUPPORTS_HIGHMEM select SYS_SUPPORTS_LITTLE_ENDIAN - select HAVE_MACH_HEAD_FILES help The SNI RM200/300/400 are MIPS-based machines manufactured by Siemens Nixdorf Informationssysteme (SNI), parent company of Pyramid @@ -985,7 +956,6 @@ config MIKROTIK_RB532 select BOOT_RAW select GPIOLIB select MIPS_L1_CACHE_SHIFT_4 - select HAVE_MACH_HEAD_FILES help Support the Mikrotik(tm) RouterBoard 532 series, based on the IDT RC32434 SoC. @@ -1055,7 +1025,6 @@ config NLM_XLR_BOARD select SYS_HAS_EARLY_PRINTK select SYS_SUPPORTS_ZBOOT select SYS_SUPPORTS_ZBOOT_UART16550 - select HAVE_MACH_HEAD_FILES help Support for systems based on Netlogic XLR and XLS processors. Say Y here if you have a XLR or XLS based board. @@ -1084,7 +1053,6 @@ config NLM_XLP_BOARD select USE_OF select SYS_SUPPORTS_ZBOOT select SYS_SUPPORTS_ZBOOT_UART16550 - select HAVE_MACH_HEAD_FILES help This board is based on Netlogic XLP Processor. Say Y here if you have a XLP based board. @@ -1104,7 +1072,6 @@ config MIPS_PARAVIRT select SYS_HAS_CPU_CAVIUM_OCTEON select HAVE_PCI select SWAP_IO_SPACE - select HAVE_MACH_HEAD_FILES help This option supports guest running under ???? @@ -1150,10 +1117,6 @@ 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. # @@ -1381,7 +1344,6 @@ config SOC_EMMA2RH select SYS_SUPPORTS_32BIT_KERNEL select SYS_SUPPORTS_64BIT_KERNEL select SYS_SUPPORTS_BIG_ENDIAN - select HAVE_MACH_HEAD_FILES config SOC_PNX833X bool @@ -1395,7 +1357,6 @@ config SOC_PNX833X select SYS_SUPPORTS_BIG_ENDIAN select SYS_SUPPORTS_MIPS16 select CPU_MIPSR2_IRQ_VI - select HAVE_MACH_HEAD_FILES config SOC_PNX8335 bool @@ -1807,7 +1768,6 @@ config CPU_CAVIUM_OCTEON select USB_OHCI_BIG_ENDIAN_MMIO if CPU_BIG_ENDIAN select MIPS_L1_CACHE_SHIFT_7 select HAVE_KVM - select HAVE_MACH_HEAD_FILES help The Cavium Octeon processor is a highly integrated chip containing many ethernet hardware widgets for networking tasks. The processor diff --git a/arch/mips/Makefile b/arch/mips/Makefile index dae3d53..d6f35a5 100644 --- a/arch/mips/Makefile +++ b/arch/mips/Makefile @@ -263,9 +263,6 @@ 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 9cf7926..cb7ce7f 100644 --- a/arch/mips/include/asm/addrspace.h +++ b/arch/mips/include/asm/addrspace.h @@ -10,11 +10,7 @@ #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 a0867f9..722eb4d 100644 --- a/arch/mips/include/asm/cache.h +++ b/arch/mips/include/asm/cache.h @@ -9,11 +9,7 @@ #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 facd189..c49be09 100644 --- a/arch/mips/include/asm/cpu-features.h +++ b/arch/mips/include/asm/cpu-features.h @@ -12,11 +12,7 @@ #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 1723929..ba08b10 100644 --- a/arch/mips/include/asm/fixmap.h +++ b/arch/mips/include/asm/fixmap.h @@ -14,11 +14,7 @@ #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 55fb950..86d37c6 100644 --- a/arch/mips/include/asm/floppy.h +++ b/arch/mips/include/asm/floppy.h @@ -51,10 +51,6 @@ 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 f9b6518..868c4ca 100644 --- a/arch/mips/include/asm/i8259.h +++ b/arch/mips/include/asm/i8259.h @@ -14,11 +14,7 @@ #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 1302c7d..d89933d 100644 --- a/arch/mips/include/asm/ide.h +++ b/arch/mips/include/asm/ide.h @@ -8,11 +8,7 @@ #ifndef __ASM_IDE_H #define __ASM_IDE_H -#ifdef CONFIG_HAVE_MACH_HEAD_FILES #include -#else -#include -#endif diff --git a/arch/mips/include/asm/io.h b/arch/mips/include/asm/io.h index fe8f4a9..f5db090 100644 --- a/arch/mips/include/asm/io.h +++ b/arch/mips/include/asm/io.h @@ -31,13 +31,8 @@ #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 c8cab02..ce213e2 100644 --- a/arch/mips/include/asm/irq.h +++ b/arch/mips/include/asm/irq.h @@ -15,11 +15,7 @@ #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 a0e1d91..9f61732 100644 --- a/arch/mips/include/asm/mc146818rtc.h +++ b/arch/mips/include/asm/mc146818rtc.h @@ -11,10 +11,6 @@ #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 043f88c..9bf755b 100644 --- a/arch/mips/include/asm/mmzone.h +++ b/arch/mips/include/asm/mmzone.h @@ -9,11 +9,7 @@ #include #ifdef CONFIG_NEED_MULTIPLE_NODES -#ifdef CONFIG_HAVE_MACH_HEAD_FILES #include -#else -# include -#endif #endif #ifndef pa_to_nid diff --git a/arch/mips/include/asm/page.h b/arch/mips/include/asm/page.h index 4fb4ee2..e697da0 100644 --- a/arch/mips/include/asm/page.h +++ b/arch/mips/include/asm/page.h @@ -9,11 +9,7 @@ #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 ed955bb..71c7e1a 100644 --- a/arch/mips/include/asm/topology.h +++ b/arch/mips/include/asm/topology.h @@ -8,11 +8,7 @@ #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 66264e1..5cdf44c 100644 --- a/arch/mips/include/asm/war.h +++ b/arch/mips/include/asm/war.h @@ -9,11 +9,7 @@ #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 a45cdae..b3491db 100644 --- a/arch/mips/kernel/head.S +++ b/arch/mips/kernel/head.S @@ -24,11 +24,7 @@ #include #include -#ifdef CONFIG_HAVE_MACH_HEAD_FILES #include -#else -#include -#endif /* * For the moment disable interrupts, mark the kernel mode and diff --git a/arch/mips/txx9/Kconfig b/arch/mips/txx9/Kconfig index 12dbce7..9a22a18 100644 --- a/arch/mips/txx9/Kconfig +++ b/arch/mips/txx9/Kconfig @@ -3,7 +3,6 @@ config MACH_TX39XX bool select MACH_TXX9 select SYS_HAS_CPU_TX39XX - select HAVE_MACH_HEAD_FILES config MACH_TX49XX bool @@ -13,7 +12,6 @@ config MACH_TX49XX select IRQ_MIPS_CPU select SYS_HAS_CPU_TX49XX select SYS_SUPPORTS_64BIT_KERNEL - select HAVE_MACH_HEAD_FILES config MACH_TXX9 bool diff --git a/drivers/gpio/gpio-loongson.c b/drivers/gpio/gpio-loongson.c index ebcd75a..ca22ad0 100644 --- a/drivers/gpio/gpio-loongson.c +++ b/drivers/gpio/gpio-loongson.c @@ -17,11 +17,7 @@ #include #include #include -#ifdef CONFIG_HAVE_MACH_HEAD_FILES #include -#else -#include -#endif #define STLS2F_N_GPIO 4 #define STLS3A_N_GPIO 16