From patchwork Fri Oct 18 16:29:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 176901 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp1093732ill; Fri, 18 Oct 2019 09:32:10 -0700 (PDT) X-Google-Smtp-Source: APXvYqxV21u1/BxxnPuNC9A1lCjYZCIGyL0CVtR4xCjwjdtvdID1onoExWf1uuNjBkVRga3WAKnr X-Received: by 2002:a50:f704:: with SMTP id g4mr10415605edn.255.1571416330548; Fri, 18 Oct 2019 09:32:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571416330; cv=none; d=google.com; s=arc-20160816; b=Y58rQpvFLJfx09SLgA1aU5vpdBLEV86iDLFOSvcHT/IYVPCnd2ZxHnxXj581qsKZXI 3TngktqcRyNs6aE4Xo7cyC5UvAIRcYDHAJ6WL54zy9Tgy++xFq02LY+7G8NK9cvFXlKJ jT91FkDBMmsQT1UEMdo3CfZHA31/kY133DbBPtn4jYvUjc4WnmvMQ+VC+TebhRrPHTPi Pg/PjiImIKhWQMBecZxijeikp10f5Rkm75cIRIEFkmblxQOA8VFS6Gai8YEhrUkZMZZt nnVFDMCZ9UhUFgsJ9YGMi1trlrVQqRJBSCFFn1ffJOaBXhKU6+B8bTRGDsrMTFqbbIpN 7G3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=6MmLTzRCOrIYLwisT0HU8dCGKY7anuzilaOjQtBO94w=; b=JU5f5liuL7hxLl2IKayF1pJQ6QS+kq+pLkS081BOHGgpxQXhK2jOrIUhM6YVJpF+Ts /yM/LmMoXBMEzMXxKcBXGT1v6M6V/7QMMu5Gxpwsj6VkyRX2EZPz06dhsyFmMc9sGw3Q O+5TIAziTzJp/cfSJFnBoHXWS9rhaeddMeOI1w6/3Fpz6SyDEIf3/ZDdE6WpDxLBwVCu NN0PxDk16COgmupRVykTjeZCpYJLTYJ9gyT2YjostEfw+TvheKbOr7TYP6WtZnVXyf+n UrwJ+rY7fBWV/Xq0wDdRKdsw29mfRlTBlx2kkkQqdJQIjHkUKWzU7cMg7oOrCHkAtDi5 RszQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f2si3708617ejw.335.2019.10.18.09.32.10; Fri, 18 Oct 2019 09:32:10 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2502751AbfJRQcC (ORCPT + 26 others); Fri, 18 Oct 2019 12:32:02 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:33381 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2443054AbfJRQbd (ORCPT ); Fri, 18 Oct 2019 12:31:33 -0400 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.145]) with ESMTPA (Nemesis) id 1Mrggc-1hiqw143z2-00nfbo; Fri, 18 Oct 2019 18:30:50 +0200 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org, Arnd Bergmann , Linus Walleij , Liviu Dudau , Sudeep Holla , Lorenzo Pieralisi , Russell King Subject: [PATCH 1/6] ARM: versatile: move integrator/realview/vexpress to versatile Date: Fri, 18 Oct 2019 18:29:14 +0200 Message-Id: <20191018163047.1284736-1-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:I+/9pbKfxz4+JWNzZgaDP53mode4OFLqi2uQKwSEPfSkeBgeZt9 KIvX9Aw7F8qr4kTkdgNw2mbsx2DXHV3rzBDDwib1j4HOFxD2WPt9rq3/czntYcARHUANayl OiPhR0LxY6XwiGjuy+apmpgKcqsJoDtw+/5ghftOISqeQOxPFy4avhq1imBHgi0Of7j6q38 kVXMFRmGjlQ/DOLO/47Ww== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:BtcrccKziqQ=:+MB8+f5OPRcGdv+fKt+THO V6BwqgK0Ns7lIcf+Dh21Ms0ABuS9eI2uPpywJfQ1sLnp0tcsDyE81EWrj629lA25LXR+nla8N JMlO3NnzJ0pIhHupYMxbuXOvDi6MvSGmt9inIrJVXS6yYw2eSfvFJSRElj22h1tTOnRZ+TBRO bV2Z81DjnHcNtM2gjaLS1nUy3zUmIwF5kFwgtajW3BmoybjIyCR5gjmcMwwodxZpBZnFIcJKA 2mZqDP15MMdmg7sjOsFvUnl4mxAONNacT9xMwYztS5cXT7tK+m5UAAbZ8jpeYGSOdgPebn49g uGHEm2XckRFa9P14tg6eXrzrEmd+jC4XmCWB0lNjRf9olklIpx+95R7esuX0DfqDBGdeI9GX3 iIYMFc7f15NCrB7hH1lAuGkDLtHxN1dT83lDcQNyCEZQwudoCwiAOxh/cJLJo3+yCGRQCwT1O fCz4rQkQXcU7qVmxzt77Zk9SICbnF4U97J4BZgDxR5UI7TFconFTh3RawrWtoRJp8nX7Y5FTU Ply3AnCBcNNAGGzkKu1Xm37TFJ/nKZzKyaun+46Q98ULbvr69C1zG3WMxmiPgFcggUy7zdEVR F4yDI/R54F/9G6IvCxSXOSMccggOnaVU25BJKKgjML6gc1ApffWMb9Cumtel9JK4gwfcgoH7J Huz8kWRDL+lm8H+b/LrHMfQZvSkYI6o1yBNif7OaCXSRRmjTf1p/oQNXTE0pa4S8XOOOdwlwe W5MGjimkpmVFUikoPNYys3YLefJ4Vey9VO+jSbMbOcrzNlJ//1XWKHSsVo+j9oxXUDfEjZmjs DqslNn629uKAuNHSfV2cHQeU/1XIRkTMBZq3OvqtIM7L+q/Z3qfHd0yuvpDts5xBnaVtk3J70 h4qFVCMDRVKsE1OmQ99Q== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org These are all fairly small platforms by now, and they are closely related. Just move them all into a single directory. Cc: Linus Walleij Cc: Liviu Dudau Cc: Sudeep Holla Cc: Lorenzo Pieralisi Signed-off-by: Arnd Bergmann --- arch/arm/Kconfig | 7 - arch/arm/Makefile | 7 +- arch/arm/mach-integrator/Kconfig | 161 -------- arch/arm/mach-integrator/Makefile | 11 - arch/arm/mach-realview/Kconfig | 113 ------ arch/arm/mach-realview/Makefile | 8 - arch/arm/mach-versatile/Kconfig | 360 ++++++++++++++++++ arch/arm/mach-versatile/Makefile | 34 +- .../Makefile.boot | 0 .../{mach-integrator => mach-versatile}/cm.h | 0 .../common.h | 0 .../core.c | 2 - .../{mach-vexpress => mach-versatile}/core.h | 0 .../{mach-vexpress => mach-versatile}/dcscb.c | 2 +- .../dcscb_setup.S | 2 - .../hardware.h | 0 .../headsmp.S | 2 - .../hotplug.c | 2 +- .../impd1.c | 2 - .../impd1.h | 0 .../integrator_ap.c | 2 - .../integrator_cp.c | 2 - .../{mach-integrator => mach-versatile}/lm.c | 2 - .../{mach-integrator => mach-versatile}/lm.h | 0 .../platsmp-realview.c} | 2 +- .../platsmp-vexpress.c} | 5 +- .../platsmp.c | 4 +- .../include/plat => mach-versatile}/platsmp.h | 2 - .../realview-dt.c | 0 .../sched-clock.c | 4 +- .../plat => mach-versatile}/sched_clock.h | 0 .../{mach-vexpress => mach-versatile}/spc.c | 0 .../{mach-vexpress => mach-versatile}/spc.h | 0 .../tc2_pm.c | 2 - .../v2m-mps2.c | 0 .../{mach-vexpress => mach-versatile}/v2m.c | 0 arch/arm/mach-vexpress/Kconfig | 84 ---- arch/arm/mach-vexpress/Makefile | 19 - arch/arm/plat-versatile/Kconfig | 7 - arch/arm/plat-versatile/Makefile | 6 - 40 files changed, 400 insertions(+), 454 deletions(-) delete mode 100644 arch/arm/mach-integrator/Kconfig delete mode 100644 arch/arm/mach-integrator/Makefile delete mode 100644 arch/arm/mach-realview/Kconfig delete mode 100644 arch/arm/mach-realview/Makefile rename arch/arm/{mach-vexpress => mach-versatile}/Makefile.boot (100%) rename arch/arm/{mach-integrator => mach-versatile}/cm.h (100%) rename arch/arm/{mach-integrator => mach-versatile}/common.h (100%) rename arch/arm/{mach-integrator => mach-versatile}/core.c (97%) rename arch/arm/{mach-vexpress => mach-versatile}/core.h (100%) rename arch/arm/{mach-vexpress => mach-versatile}/dcscb.c (98%) rename arch/arm/{mach-vexpress => mach-versatile}/dcscb_setup.S (95%) rename arch/arm/{mach-integrator => mach-versatile}/hardware.h (100%) rename arch/arm/{plat-versatile => mach-versatile}/headsmp.S (94%) rename arch/arm/{plat-versatile => mach-versatile}/hotplug.c (98%) rename arch/arm/{mach-integrator => mach-versatile}/impd1.c (99%) rename arch/arm/{mach-integrator => mach-versatile}/impd1.h (100%) rename arch/arm/{mach-integrator => mach-versatile}/integrator_ap.c (98%) rename arch/arm/{mach-integrator => mach-versatile}/integrator_cp.c (98%) rename arch/arm/{mach-integrator => mach-versatile}/lm.c (97%) rename arch/arm/{mach-integrator => mach-versatile}/lm.h (100%) rename arch/arm/{mach-realview/platsmp-dt.c => mach-versatile/platsmp-realview.c} (98%) rename arch/arm/{mach-vexpress/platsmp.c => mach-versatile/platsmp-vexpress.c} (96%) rename arch/arm/{plat-versatile => mach-versatile}/platsmp.c (97%) rename arch/arm/{plat-versatile/include/plat => mach-versatile}/platsmp.h (87%) rename arch/arm/{mach-realview => mach-versatile}/realview-dt.c (100%) rename arch/arm/{plat-versatile => mach-versatile}/sched-clock.c (86%) rename arch/arm/{plat-versatile/include/plat => mach-versatile}/sched_clock.h (100%) rename arch/arm/{mach-vexpress => mach-versatile}/spc.c (100%) rename arch/arm/{mach-vexpress => mach-versatile}/spc.h (100%) rename arch/arm/{mach-vexpress => mach-versatile}/tc2_pm.c (99%) rename arch/arm/{mach-vexpress => mach-versatile}/v2m-mps2.c (100%) rename arch/arm/{mach-vexpress => mach-versatile}/v2m.c (100%) delete mode 100644 arch/arm/mach-vexpress/Kconfig delete mode 100644 arch/arm/mach-vexpress/Makefile delete mode 100644 arch/arm/plat-versatile/Kconfig delete mode 100644 arch/arm/plat-versatile/Makefile -- 2.20.0 Acked-by: Sudeep Holla Tested-by: Sudeep Holla diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 330a1685101a..b6681b61e46c 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -647,8 +647,6 @@ source "arch/arm/mach-hisi/Kconfig" source "arch/arm/mach-imx/Kconfig" -source "arch/arm/mach-integrator/Kconfig" - source "arch/arm/mach-iop32x/Kconfig" source "arch/arm/mach-ixp4xx/Kconfig" @@ -700,8 +698,6 @@ source "arch/arm/mach-qcom/Kconfig" source "arch/arm/mach-rda/Kconfig" -source "arch/arm/mach-realview/Kconfig" - source "arch/arm/mach-rockchip/Kconfig" source "arch/arm/mach-s3c24xx/Kconfig" @@ -736,9 +732,6 @@ source "arch/arm/mach-ux500/Kconfig" source "arch/arm/mach-versatile/Kconfig" -source "arch/arm/mach-vexpress/Kconfig" -source "arch/arm/plat-versatile/Kconfig" - source "arch/arm/mach-vt8500/Kconfig" source "arch/arm/mach-zx/Kconfig" diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 09622c26a8a4..db39707fa600 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -180,7 +180,6 @@ machine-$(CONFIG_ARCH_FOOTBRIDGE) += footbridge machine-$(CONFIG_ARCH_GEMINI) += gemini machine-$(CONFIG_ARCH_HIGHBANK) += highbank machine-$(CONFIG_ARCH_HISI) += hisi -machine-$(CONFIG_ARCH_INTEGRATOR) += integrator machine-$(CONFIG_ARCH_IOP32X) += iop32x machine-$(CONFIG_ARCH_IXP4XX) += ixp4xx machine-$(CONFIG_ARCH_KEYSTONE) += keystone @@ -188,7 +187,6 @@ machine-$(CONFIG_ARCH_LPC18XX) += lpc18xx machine-$(CONFIG_ARCH_LPC32XX) += lpc32xx machine-$(CONFIG_ARCH_MESON) += meson machine-$(CONFIG_ARCH_MMP) += mmp -machine-$(CONFIG_ARCH_MPS2) += vexpress machine-$(CONFIG_ARCH_MOXART) += moxart machine-$(CONFIG_ARCH_MV78XX0) += mv78xx0 machine-$(CONFIG_ARCH_MVEBU) += mvebu @@ -207,7 +205,6 @@ machine-$(CONFIG_ARCH_PICOXCELL) += picoxcell machine-$(CONFIG_ARCH_PXA) += pxa machine-$(CONFIG_ARCH_QCOM) += qcom machine-$(CONFIG_ARCH_RDA) += rda -machine-$(CONFIG_ARCH_REALVIEW) += realview machine-$(CONFIG_ARCH_ROCKCHIP) += rockchip machine-$(CONFIG_ARCH_RPC) += rpc machine-$(CONFIG_ARCH_S3C24XX) += s3c24xx @@ -224,11 +221,10 @@ machine-$(CONFIG_ARCH_TANGO) += tango machine-$(CONFIG_ARCH_TEGRA) += tegra machine-$(CONFIG_ARCH_U300) += u300 machine-$(CONFIG_ARCH_U8500) += ux500 -machine-$(CONFIG_ARCH_VERSATILE) += versatile -machine-$(CONFIG_ARCH_VEXPRESS) += vexpress machine-$(CONFIG_ARCH_VT8500) += vt8500 machine-$(CONFIG_ARCH_ZX) += zx machine-$(CONFIG_ARCH_ZYNQ) += zynq +machine-$(CONFIG_PLAT_VERSATILE) += versatile machine-$(CONFIG_PLAT_SPEAR) += spear # Platform directory name. This list is sorted alphanumerically @@ -239,7 +235,6 @@ plat-$(CONFIG_ARCH_S3C64XX) += samsung plat-$(CONFIG_ARCH_S5PV210) += samsung plat-$(CONFIG_PLAT_ORION) += orion plat-$(CONFIG_PLAT_S3C24XX) += samsung -plat-$(CONFIG_PLAT_VERSATILE) += versatile ifeq ($(CONFIG_ARCH_EBSA110),y) # This is what happens if you forget the IOCS16 line. diff --git a/arch/arm/mach-integrator/Kconfig b/arch/arm/mach-integrator/Kconfig deleted file mode 100644 index 982eabc36163..000000000000 --- a/arch/arm/mach-integrator/Kconfig +++ /dev/null @@ -1,161 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only -menuconfig ARCH_INTEGRATOR - bool "ARM Ltd. Integrator family" - depends on ARCH_MULTI_V4T || ARCH_MULTI_V5 || ARCH_MULTI_V6 - select ARM_AMBA - select COMMON_CLK_VERSATILE - select HAVE_TCM - select ICST - select MFD_SYSCON - select PLAT_VERSATILE - select POWER_RESET - select POWER_RESET_VERSATILE - select POWER_SUPPLY - select SOC_INTEGRATOR_CM - select SPARSE_IRQ - select VERSATILE_FPGA_IRQ - help - Support for ARM's Integrator platform. - -if ARCH_INTEGRATOR - -config ARCH_INTEGRATOR_AP - bool "Support Integrator/AP and Integrator/PP2 platforms" - select INTEGRATOR_AP_TIMER - select SERIAL_AMBA_PL010 if TTY - select SERIAL_AMBA_PL010_CONSOLE if TTY - select SOC_BUS - help - Include support for the ARM(R) Integrator/AP and - Integrator/PP2 platforms. - -config INTEGRATOR_IMPD1 - bool "Include support for Integrator/IM-PD1" - depends on ARCH_INTEGRATOR_AP - select ARM_VIC - select GPIO_PL061 - select GPIOLIB - help - The IM-PD1 is an add-on logic module for the Integrator which - allows ARM(R) Ltd PrimeCells to be developed and evaluated. - The IM-PD1 can be found on the Integrator/PP2 platform. - - To compile this driver as a module, choose M here: the - module will be called impd1. - -config INTEGRATOR_CM7TDMI - bool "Integrator/CM7TDMI core module" - depends on ARCH_INTEGRATOR_AP - depends on ARCH_MULTI_V4 && !MMU - select CPU_ARM7TDMI - -config INTEGRATOR_CM720T - bool "Integrator/CM720T core module" - depends on ARCH_INTEGRATOR_AP - depends on ARCH_MULTI_V4T - select CPU_ARM720T - -config INTEGRATOR_CM740T - bool "Integrator/CM740T core module" - depends on ARCH_INTEGRATOR_AP - depends on ARCH_MULTI_V4T && !MMU - select CPU_ARM740T - -config INTEGRATOR_CM920T - bool "Integrator/CM920T core module" - depends on ARCH_INTEGRATOR_AP - depends on ARCH_MULTI_V4T - select CPU_ARM920T - -config INTEGRATOR_CM922T_XA10 - bool "Integrator/CM922T-XA10 core module" - depends on ARCH_MULTI_V4T - depends on ARCH_INTEGRATOR_AP - select CPU_ARM922T - -config INTEGRATOR_CM926EJS - bool "Integrator/CM926EJ-S core module" - depends on ARCH_INTEGRATOR_AP - depends on ARCH_MULTI_V5 - select CPU_ARM926T - -config INTEGRATOR_CM940T - bool "Integrator/CM940T core module" - depends on ARCH_INTEGRATOR_AP - depends on ARCH_MULTI_V4T && !MMU - select CPU_ARM940T - -config INTEGRATOR_CM946ES - bool "Integrator/CM946E-S core module" - depends on ARCH_INTEGRATOR_AP - depends on ARCH_MULTI_V5 && !MMU - select CPU_ARM946E - -config INTEGRATOR_CM966ES - bool "Integrator/CM966E-S core module" - depends on ARCH_INTEGRATOR_AP - depends on BROKEN # no kernel support - -config INTEGRATOR_CM10200E_REV0 - bool "Integrator/CM10200E rev.0 core module" - depends on ARCH_INTEGRATOR_AP && n - depends on ARCH_MULTI_V5 - select CPU_ARM1020 - -config INTEGRATOR_CM10200E - bool "Integrator/CM10200E core module" - depends on ARCH_INTEGRATOR_AP && n - depends on ARCH_MULTI_V5 - select CPU_ARM1020E - -config INTEGRATOR_CM10220E - bool "Integrator/CM10220E core module" - depends on ARCH_INTEGRATOR_AP - depends on ARCH_MULTI_V5 - select CPU_ARM1022 - -config INTEGRATOR_CM1026EJS - bool "Integrator/CM1026EJ-S core module" - depends on ARCH_INTEGRATOR_AP - depends on ARCH_MULTI_V5 - select CPU_ARM1026 - -config INTEGRATOR_CM1136JFS - bool "Integrator/CM1136JF-S core module" - depends on ARCH_INTEGRATOR_AP - depends on ARCH_MULTI_V6 - select CPU_V6 - -config ARCH_INTEGRATOR_CP - bool "Support Integrator/CP platform" - depends on (!MMU || ARCH_MULTI_V5 || ARCH_MULTI_V6) - select ARM_TIMER_SP804 - select SERIAL_AMBA_PL011 if TTY - select SERIAL_AMBA_PL011_CONSOLE if TTY - select SOC_BUS - help - Include support for the ARM(R) Integrator CP platform. - -config INTEGRATOR_CT7T - bool "Integrator/CT7TD (ARM7TDMI) core tile" - depends on ARCH_INTEGRATOR_CP - depends on ARCH_MULTI_V4T && !MMU - select CPU_ARM7TDMI - -config INTEGRATOR_CT926 - bool "Integrator/CT926 (ARM926EJ-S) core tile" - depends on ARCH_INTEGRATOR_CP - depends on ARCH_MULTI_V5 - select CPU_ARM926T - -config INTEGRATOR_CTB36 - bool "Integrator/CTB36 (ARM1136JF-S) core tile" - depends on ARCH_INTEGRATOR_CP - depends on ARCH_MULTI_V6 - select CPU_V6 - -config ARCH_CINTEGRATOR - depends on ARCH_INTEGRATOR_CP - def_bool y - -endif diff --git a/arch/arm/mach-integrator/Makefile b/arch/arm/mach-integrator/Makefile deleted file mode 100644 index 71b97ffe8d32..000000000000 --- a/arch/arm/mach-integrator/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -# -# Makefile for the linux kernel. -# - -# Object file lists. - -obj-y := core.o lm.o -obj-$(CONFIG_ARCH_INTEGRATOR_AP) += integrator_ap.o -obj-$(CONFIG_ARCH_INTEGRATOR_CP) += integrator_cp.o -obj-$(CONFIG_INTEGRATOR_IMPD1) += impd1.o diff --git a/arch/arm/mach-realview/Kconfig b/arch/arm/mach-realview/Kconfig deleted file mode 100644 index 44ebbf9ec673..000000000000 --- a/arch/arm/mach-realview/Kconfig +++ /dev/null @@ -1,113 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only -menuconfig ARCH_REALVIEW - bool "ARM Ltd. RealView family" - depends on ARCH_MULTI_V5 || ARCH_MULTI_V6 || ARCH_MULTI_V7 - select ARM_AMBA - select ARM_GIC - select ARM_TIMER_SP804 - select CLK_SP810 - select COMMON_CLK_VERSATILE - select GPIO_PL061 if GPIOLIB - select HAVE_ARM_SCU if SMP - select HAVE_ARM_TWD if SMP - select HAVE_PATA_PLATFORM - select HAVE_TCM - select ICST - select MACH_REALVIEW_EB if ARCH_MULTI_V5 - select MFD_SYSCON - select PLAT_VERSATILE - select PLAT_VERSATILE_SCHED_CLOCK - select POWER_RESET - select POWER_RESET_VERSATILE - select POWER_SUPPLY - select SOC_REALVIEW - select USE_OF - help - This enables support for ARM Ltd RealView boards. - -if ARCH_REALVIEW - -config MACH_REALVIEW_EB - bool "Support RealView(R) Emulation Baseboard" - select ARM_GIC - select CPU_ARM926T if ARCH_MULTI_V5 - help - Include support for the ARM(R) RealView(R) Emulation Baseboard - platform. On an ARMv5 kernel, this will include support for - the ARM926EJ-S core tile, while on an ARMv6/v7 kernel, at least - one of the ARM1136, ARM1176, ARM11MPCore or Cortex-A9MPCore - core tile options should be enabled. - -config REALVIEW_EB_ARM1136 - bool "Support ARM1136J(F)-S Tile" - depends on MACH_REALVIEW_EB && ARCH_MULTI_V6 - select CPU_V6 - help - Enable support for the ARM1136 tile fitted to the - Realview(R) Emulation Baseboard platform. - -config REALVIEW_EB_ARM1176 - bool "Support ARM1176JZ(F)-S Tile" - depends on MACH_REALVIEW_EB && ARCH_MULTI_V6 - help - Enable support for the ARM1176 tile fitted to the - Realview(R) Emulation Baseboard platform. - -config REALVIEW_EB_A9MP - bool "Support Multicore Cortex-A9 Tile" - depends on MACH_REALVIEW_EB && ARCH_MULTI_V7 - select HAVE_SMP - select MIGHT_HAVE_CACHE_L2X0 - help - Enable support for the Cortex-A9MPCore tile fitted to the - Realview(R) Emulation Baseboard platform. - -config REALVIEW_EB_ARM11MP - bool "Support ARM11MPCore Tile" - depends on MACH_REALVIEW_EB && ARCH_MULTI_V6 - select HAVE_SMP - select MIGHT_HAVE_CACHE_L2X0 - help - Enable support for the ARM11MPCore tile fitted to the Realview(R) - Emulation Baseboard platform. - -config MACH_REALVIEW_PB11MP - bool "Support RealView(R) Platform Baseboard for ARM11MPCore" - depends on ARCH_MULTI_V6 - select HAVE_SMP - select MIGHT_HAVE_CACHE_L2X0 - help - Include support for the ARM(R) RealView(R) Platform Baseboard for - the ARM11MPCore. This platform has an on-board ARM11MPCore and has - support for PCI-E and Compact Flash. - -# ARMv6 CPU without K extensions, but does have the new exclusive ops -config MACH_REALVIEW_PB1176 - bool "Support RealView(R) Platform Baseboard for ARM1176JZF-S" - depends on ARCH_MULTI_V6 - select CPU_V6 - select HAVE_TCM - select MIGHT_HAVE_CACHE_L2X0 - help - Include support for the ARM(R) RealView(R) Platform Baseboard for - ARM1176JZF-S. - -config MACH_REALVIEW_PBA8 - bool "Support RealView(R) Platform Baseboard for Cortex(tm)-A8 platform" - depends on ARCH_MULTI_V7 - help - Include support for the ARM(R) RealView Platform Baseboard for - Cortex(tm)-A8. This platform has an on-board Cortex-A8 and has - support for PCI-E and Compact Flash. - -config MACH_REALVIEW_PBX - bool "Support RealView(R) Platform Baseboard Explore for Cortex-A9" - depends on ARCH_MULTI_V7 - select HAVE_SMP - select MIGHT_HAVE_CACHE_L2X0 - select ZONE_DMA - help - Include support for the ARM(R) RealView(R) Platform Baseboard - Explore. - -endif diff --git a/arch/arm/mach-realview/Makefile b/arch/arm/mach-realview/Makefile deleted file mode 100644 index e259091591b8..000000000000 --- a/arch/arm/mach-realview/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only -# -# Makefile for the linux kernel. -# -ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/arch/arm/plat-versatile/include - -obj-y += realview-dt.o -obj-$(CONFIG_SMP) += platsmp-dt.o diff --git a/arch/arm/mach-versatile/Kconfig b/arch/arm/mach-versatile/Kconfig index f5c275434d6c..e6feca83451b 100644 --- a/arch/arm/mach-versatile/Kconfig +++ b/arch/arm/mach-versatile/Kconfig @@ -17,3 +17,363 @@ config ARCH_VERSATILE help This enables support for ARM Ltd Versatile board. +menuconfig ARCH_INTEGRATOR + bool "ARM Ltd. Integrator family" + depends on ARCH_MULTI_V4T || ARCH_MULTI_V5 || ARCH_MULTI_V6 + select ARM_AMBA + select COMMON_CLK_VERSATILE + select HAVE_TCM + select ICST + select MFD_SYSCON + select PLAT_VERSATILE + select POWER_RESET + select POWER_RESET_VERSATILE + select POWER_SUPPLY + select SOC_INTEGRATOR_CM + select SPARSE_IRQ + select VERSATILE_FPGA_IRQ + help + Support for ARM's Integrator platform. + +if ARCH_INTEGRATOR + +config ARCH_INTEGRATOR_AP + bool "Support Integrator/AP and Integrator/PP2 platforms" + select INTEGRATOR_AP_TIMER + select SERIAL_AMBA_PL010 if TTY + select SERIAL_AMBA_PL010_CONSOLE if TTY + select SOC_BUS + help + Include support for the ARM(R) Integrator/AP and + Integrator/PP2 platforms. + +config INTEGRATOR_IMPD1 + bool "Include support for Integrator/IM-PD1" + depends on ARCH_INTEGRATOR_AP + select ARM_VIC + select GPIO_PL061 + select GPIOLIB + help + The IM-PD1 is an add-on logic module for the Integrator which + allows ARM(R) Ltd PrimeCells to be developed and evaluated. + The IM-PD1 can be found on the Integrator/PP2 platform. + + To compile this driver as a module, choose M here: the + module will be called impd1. + +config INTEGRATOR_CM7TDMI + bool "Integrator/CM7TDMI core module" + depends on ARCH_INTEGRATOR_AP + depends on ARCH_MULTI_V4 && !MMU + select CPU_ARM7TDMI + +config INTEGRATOR_CM720T + bool "Integrator/CM720T core module" + depends on ARCH_INTEGRATOR_AP + depends on ARCH_MULTI_V4T + select CPU_ARM720T + +config INTEGRATOR_CM740T + bool "Integrator/CM740T core module" + depends on ARCH_INTEGRATOR_AP + depends on ARCH_MULTI_V4T && !MMU + select CPU_ARM740T + +config INTEGRATOR_CM920T + bool "Integrator/CM920T core module" + depends on ARCH_INTEGRATOR_AP + depends on ARCH_MULTI_V4T + select CPU_ARM920T + +config INTEGRATOR_CM922T_XA10 + bool "Integrator/CM922T-XA10 core module" + depends on ARCH_MULTI_V4T + depends on ARCH_INTEGRATOR_AP + select CPU_ARM922T + +config INTEGRATOR_CM926EJS + bool "Integrator/CM926EJ-S core module" + depends on ARCH_INTEGRATOR_AP + depends on ARCH_MULTI_V5 + select CPU_ARM926T + +config INTEGRATOR_CM940T + bool "Integrator/CM940T core module" + depends on ARCH_INTEGRATOR_AP + depends on ARCH_MULTI_V4T && !MMU + select CPU_ARM940T + +config INTEGRATOR_CM946ES + bool "Integrator/CM946E-S core module" + depends on ARCH_INTEGRATOR_AP + depends on ARCH_MULTI_V5 && !MMU + select CPU_ARM946E + +config INTEGRATOR_CM966ES + bool "Integrator/CM966E-S core module" + depends on ARCH_INTEGRATOR_AP + depends on BROKEN # no kernel support + +config INTEGRATOR_CM10200E_REV0 + bool "Integrator/CM10200E rev.0 core module" + depends on ARCH_INTEGRATOR_AP && n + depends on ARCH_MULTI_V5 + select CPU_ARM1020 + +config INTEGRATOR_CM10200E + bool "Integrator/CM10200E core module" + depends on ARCH_INTEGRATOR_AP && n + depends on ARCH_MULTI_V5 + select CPU_ARM1020E + +config INTEGRATOR_CM10220E + bool "Integrator/CM10220E core module" + depends on ARCH_INTEGRATOR_AP + depends on ARCH_MULTI_V5 + select CPU_ARM1022 + +config INTEGRATOR_CM1026EJS + bool "Integrator/CM1026EJ-S core module" + depends on ARCH_INTEGRATOR_AP + depends on ARCH_MULTI_V5 + select CPU_ARM1026 + +config INTEGRATOR_CM1136JFS + bool "Integrator/CM1136JF-S core module" + depends on ARCH_INTEGRATOR_AP + depends on ARCH_MULTI_V6 + select CPU_V6 + +config ARCH_INTEGRATOR_CP + bool "Support Integrator/CP platform" + depends on (!MMU || ARCH_MULTI_V5 || ARCH_MULTI_V6) + select ARM_TIMER_SP804 + select SERIAL_AMBA_PL011 if TTY + select SERIAL_AMBA_PL011_CONSOLE if TTY + select SOC_BUS + help + Include support for the ARM(R) Integrator CP platform. + +config INTEGRATOR_CT7T + bool "Integrator/CT7TD (ARM7TDMI) core tile" + depends on ARCH_INTEGRATOR_CP + depends on ARCH_MULTI_V4T && !MMU + select CPU_ARM7TDMI + +config INTEGRATOR_CT926 + bool "Integrator/CT926 (ARM926EJ-S) core tile" + depends on ARCH_INTEGRATOR_CP + depends on ARCH_MULTI_V5 + select CPU_ARM926T + +config INTEGRATOR_CTB36 + bool "Integrator/CTB36 (ARM1136JF-S) core tile" + depends on ARCH_INTEGRATOR_CP + depends on ARCH_MULTI_V6 + select CPU_V6 + +config ARCH_CINTEGRATOR + depends on ARCH_INTEGRATOR_CP + def_bool y + +endif + +menuconfig ARCH_REALVIEW + bool "ARM Ltd. RealView family" + depends on ARCH_MULTI_V5 || ARCH_MULTI_V6 || ARCH_MULTI_V7 + select ARM_AMBA + select ARM_GIC + select ARM_TIMER_SP804 + select CLK_SP810 + select COMMON_CLK_VERSATILE + select GPIO_PL061 if GPIOLIB + select HAVE_ARM_SCU if SMP + select HAVE_ARM_TWD if SMP + select HAVE_PATA_PLATFORM + select HAVE_TCM + select ICST + select MACH_REALVIEW_EB if ARCH_MULTI_V5 + select MFD_SYSCON + select PLAT_VERSATILE + select PLAT_VERSATILE_SCHED_CLOCK + select POWER_RESET + select POWER_RESET_VERSATILE + select POWER_SUPPLY + select SOC_REALVIEW + select USE_OF + help + This enables support for ARM Ltd RealView boards. + +if ARCH_REALVIEW + +config PLAT_VERSATILE_SCHED_CLOCK + bool + +config MACH_REALVIEW_EB + bool "Support RealView(R) Emulation Baseboard" + select ARM_GIC + select CPU_ARM926T if ARCH_MULTI_V5 + help + Include support for the ARM(R) RealView(R) Emulation Baseboard + platform. On an ARMv5 kernel, this will include support for + the ARM926EJ-S core tile, while on an ARMv6/v7 kernel, at least + one of the ARM1136, ARM1176, ARM11MPCore or Cortex-A9MPCore + core tile options should be enabled. + +config REALVIEW_EB_ARM1136 + bool "Support ARM1136J(F)-S Tile" + depends on MACH_REALVIEW_EB && ARCH_MULTI_V6 + select CPU_V6 + help + Enable support for the ARM1136 tile fitted to the + Realview(R) Emulation Baseboard platform. + +config REALVIEW_EB_ARM1176 + bool "Support ARM1176JZ(F)-S Tile" + depends on MACH_REALVIEW_EB && ARCH_MULTI_V6 + help + Enable support for the ARM1176 tile fitted to the + Realview(R) Emulation Baseboard platform. + +config REALVIEW_EB_A9MP + bool "Support Multicore Cortex-A9 Tile" + depends on MACH_REALVIEW_EB && ARCH_MULTI_V7 + select HAVE_SMP + select MIGHT_HAVE_CACHE_L2X0 + help + Enable support for the Cortex-A9MPCore tile fitted to the + Realview(R) Emulation Baseboard platform. + +config REALVIEW_EB_ARM11MP + bool "Support ARM11MPCore Tile" + depends on MACH_REALVIEW_EB && ARCH_MULTI_V6 + select HAVE_SMP + select MIGHT_HAVE_CACHE_L2X0 + help + Enable support for the ARM11MPCore tile fitted to the Realview(R) + Emulation Baseboard platform. + +config MACH_REALVIEW_PB11MP + bool "Support RealView(R) Platform Baseboard for ARM11MPCore" + depends on ARCH_MULTI_V6 + select HAVE_SMP + select MIGHT_HAVE_CACHE_L2X0 + help + Include support for the ARM(R) RealView(R) Platform Baseboard for + the ARM11MPCore. This platform has an on-board ARM11MPCore and has + support for PCI-E and Compact Flash. + +# ARMv6 CPU without K extensions, but does have the new exclusive ops +config MACH_REALVIEW_PB1176 + bool "Support RealView(R) Platform Baseboard for ARM1176JZF-S" + depends on ARCH_MULTI_V6 + select CPU_V6 + select HAVE_TCM + select MIGHT_HAVE_CACHE_L2X0 + help + Include support for the ARM(R) RealView(R) Platform Baseboard for + ARM1176JZF-S. + +config MACH_REALVIEW_PBA8 + bool "Support RealView(R) Platform Baseboard for Cortex(tm)-A8 platform" + depends on ARCH_MULTI_V7 + help + Include support for the ARM(R) RealView Platform Baseboard for + Cortex(tm)-A8. This platform has an on-board Cortex-A8 and has + support for PCI-E and Compact Flash. + +config MACH_REALVIEW_PBX + bool "Support RealView(R) Platform Baseboard Explore for Cortex-A9" + depends on ARCH_MULTI_V7 + select HAVE_SMP + select MIGHT_HAVE_CACHE_L2X0 + select ZONE_DMA + help + Include support for the ARM(R) RealView(R) Platform Baseboard + Explore. + +endif + +menuconfig ARCH_VEXPRESS + bool "ARM Ltd. Versatile Express family" + depends on ARCH_MULTI_V7 + select ARCH_SUPPORTS_BIG_ENDIAN + select ARM_AMBA + select ARM_GIC + select ARM_GLOBAL_TIMER + select ARM_TIMER_SP804 + select COMMON_CLK_VERSATILE + select GPIOLIB + select HAVE_ARM_SCU if SMP + select HAVE_ARM_TWD if SMP + select HAVE_PATA_PLATFORM + select ICST + select NO_IOPORT_MAP + select PLAT_VERSATILE + select POWER_RESET + select POWER_RESET_VEXPRESS + select POWER_SUPPLY + select REGULATOR if MMC_ARMMMCI + select REGULATOR_FIXED_VOLTAGE if REGULATOR + select VEXPRESS_CONFIG + select VEXPRESS_SYSCFG + select MFD_VEXPRESS_SYSREG + help + This option enables support for systems using Cortex processor based + ARM core and logic (FPGA) tiles on the Versatile Express motherboard, + for example: + + - CoreTile Express A5x2 (V2P-CA5s) + - CoreTile Express A9x4 (V2P-CA9) + - CoreTile Express A15x2 (V2P-CA15) + - LogicTile Express 13MG (V2F-2XV6) with A5, A7, A9 or A15 SMMs + (Soft Macrocell Models) + - Versatile Express RTSMs (Models) + + You must boot using a Flattened Device Tree in order to use these + platforms. The traditional (ATAGs) boot method is not usable on + these boards with this option. + +if ARCH_VEXPRESS + +config ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA + bool "Enable A5 and A9 only errata work-arounds" + default y + select ARM_ERRATA_643719 if SMP + select ARM_ERRATA_720789 + select PL310_ERRATA_753970 if CACHE_L2X0 + help + Provides common dependencies for Versatile Express platforms + based on Cortex-A5 and Cortex-A9 processors. In order to + build a working kernel, you must also enable relevant core + tile support or Flattened Device Tree based support options. + +config ARCH_VEXPRESS_DCSCB + bool "Dual Cluster System Control Block (DCSCB) support" + depends on MCPM + select ARM_CCI400_PORT_CTRL + help + Support for the Dual Cluster System Configuration Block (DCSCB). + This is needed to provide CPU and cluster power management + on RTSM implementing big.LITTLE. + +config ARCH_VEXPRESS_SPC + bool "Versatile Express Serial Power Controller (SPC)" + select PM_OPP + help + The TC2 (A15x2 A7x3) versatile express core tile integrates a logic + block called Serial Power Controller (SPC) that provides the interface + between the dual cluster test-chip and the M3 microcontroller that + carries out power management. + +config ARCH_VEXPRESS_TC2_PM + bool "Versatile Express TC2 power management" + depends on MCPM + select ARM_CCI400_PORT_CTRL + select ARCH_VEXPRESS_SPC + select ARM_CPU_SUSPEND + help + Support for CPU and cluster power management on Versatile Express + with a TC2 (A15x2 A7x3) big.LITTLE core tile. + +endif diff --git a/arch/arm/mach-versatile/Makefile b/arch/arm/mach-versatile/Makefile index 2b907718d467..fe8b62714ee1 100644 --- a/arch/arm/mach-versatile/Makefile +++ b/arch/arm/mach-versatile/Makefile @@ -3,4 +3,36 @@ # Makefile for the linux kernel. # -obj-y := versatile_dt.o +# versatile +obj-$(CONFIG_ARCH_VERSATILE) += versatile_dt.o + +# integrator +obj-$(CONFIG_ARCH_INTEGRATOR) += core.o lm.o +obj-$(CONFIG_ARCH_INTEGRATOR_AP) += integrator_ap.o +obj-$(CONFIG_ARCH_INTEGRATOR_CP) += integrator_cp.o +obj-$(CONFIG_INTEGRATOR_IMPD1) += impd1.o + +# realview +obj-$(CONFIG_ARCH_REALVIEW) += realview-dt.o +obj-$(CONFIG_PLAT_VERSATILE_SCHED_CLOCK) += sched-clock.o + +# vexpress +obj-$(CONFIG_ARCH_VEXPRESS) := v2m.o +obj-$(CONFIG_ARCH_VEXPRESS_DCSCB) += dcscb.o dcscb_setup.o +CFLAGS_dcscb.o += -march=armv7-a +CFLAGS_REMOVE_dcscb.o = -pg +obj-$(CONFIG_ARCH_VEXPRESS_SPC) += spc.o +CFLAGS_REMOVE_spc.o = -pg +obj-$(CONFIG_ARCH_VEXPRESS_TC2_PM) += tc2_pm.o +CFLAGS_tc2_pm.o += -march=armv7-a +CFLAGS_REMOVE_tc2_pm.o = -pg + +# mps2 +obj-$(CONFIG_ARCH_MPS2) += v2m-mps2.o + +ifdef CONFIG_SMP +obj-y += headsmp.o platsmp.o +obj-$(CONFIG_ARCH_REALVIEW) += platsmp-realview.o +obj-$(CONFIG_ARCH_VEXPRESS) += platsmp-vexpress.o +obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o +endif diff --git a/arch/arm/mach-vexpress/Makefile.boot b/arch/arm/mach-versatile/Makefile.boot similarity index 100% rename from arch/arm/mach-vexpress/Makefile.boot rename to arch/arm/mach-versatile/Makefile.boot diff --git a/arch/arm/mach-integrator/cm.h b/arch/arm/mach-versatile/cm.h similarity index 100% rename from arch/arm/mach-integrator/cm.h rename to arch/arm/mach-versatile/cm.h diff --git a/arch/arm/mach-integrator/common.h b/arch/arm/mach-versatile/common.h similarity index 100% rename from arch/arm/mach-integrator/common.h rename to arch/arm/mach-versatile/common.h diff --git a/arch/arm/mach-integrator/core.c b/arch/arm/mach-versatile/core.c similarity index 97% rename from arch/arm/mach-integrator/core.c rename to arch/arm/mach-versatile/core.c index 9da3ae232211..40294435cfef 100644 --- a/arch/arm/mach-integrator/core.c +++ b/arch/arm/mach-versatile/core.c @@ -1,7 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * linux/arch/arm/mach-integrator/core.c - * * Copyright (C) 2000-2003 Deep Blue Solutions Ltd */ #include diff --git a/arch/arm/mach-vexpress/core.h b/arch/arm/mach-versatile/core.h similarity index 100% rename from arch/arm/mach-vexpress/core.h rename to arch/arm/mach-versatile/core.h diff --git a/arch/arm/mach-vexpress/dcscb.c b/arch/arm/mach-versatile/dcscb.c similarity index 98% rename from arch/arm/mach-vexpress/dcscb.c rename to arch/arm/mach-versatile/dcscb.c index 46a903c88c6a..ced7d6a6cb8f 100644 --- a/arch/arm/mach-vexpress/dcscb.c +++ b/arch/arm/mach-versatile/dcscb.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * arch/arm/mach-vexpress/dcscb.c - Dual Cluster System Configuration Block + * dcscb.c - Dual Cluster System Configuration Block * * Created by: Nicolas Pitre, May 2012 * Copyright: (C) 2012-2013 Linaro Limited diff --git a/arch/arm/mach-vexpress/dcscb_setup.S b/arch/arm/mach-versatile/dcscb_setup.S similarity index 95% rename from arch/arm/mach-vexpress/dcscb_setup.S rename to arch/arm/mach-versatile/dcscb_setup.S index 0614b2ebd354..92d1fd9d7f6a 100644 --- a/arch/arm/mach-vexpress/dcscb_setup.S +++ b/arch/arm/mach-versatile/dcscb_setup.S @@ -1,7 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* - * arch/arm/include/asm/dcscb_setup.S - * * Created by: Dave Martin, 2012-06-22 * Copyright: (C) 2012-2013 Linaro Limited */ diff --git a/arch/arm/mach-integrator/hardware.h b/arch/arm/mach-versatile/hardware.h similarity index 100% rename from arch/arm/mach-integrator/hardware.h rename to arch/arm/mach-versatile/hardware.h diff --git a/arch/arm/plat-versatile/headsmp.S b/arch/arm/mach-versatile/headsmp.S similarity index 94% rename from arch/arm/plat-versatile/headsmp.S rename to arch/arm/mach-versatile/headsmp.S index 09d9fc30c8ca..99c32db412ae 100644 --- a/arch/arm/plat-versatile/headsmp.S +++ b/arch/arm/mach-versatile/headsmp.S @@ -1,7 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* - * linux/arch/arm/plat-versatile/headsmp.S - * * Copyright (c) 2003 ARM Limited * All Rights Reserved */ diff --git a/arch/arm/plat-versatile/hotplug.c b/arch/arm/mach-versatile/hotplug.c similarity index 98% rename from arch/arm/plat-versatile/hotplug.c rename to arch/arm/mach-versatile/hotplug.c index 2e9dca38bec0..5a152175578b 100644 --- a/arch/arm/plat-versatile/hotplug.c +++ b/arch/arm/mach-versatile/hotplug.c @@ -15,7 +15,7 @@ #include #include -#include +#include "platsmp.h" static inline void versatile_immitation_enter_lowpower(unsigned int actrl_mask) { diff --git a/arch/arm/mach-integrator/impd1.c b/arch/arm/mach-versatile/impd1.c similarity index 99% rename from arch/arm/mach-integrator/impd1.c rename to arch/arm/mach-versatile/impd1.c index 1ecbea5331d6..89649a3fe332 100644 --- a/arch/arm/mach-integrator/impd1.c +++ b/arch/arm/mach-versatile/impd1.c @@ -1,7 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * linux/arch/arm/mach-integrator/impd1.c - * * Copyright (C) 2003 Deep Blue Solutions Ltd, All Rights Reserved. * * This file provides the core support for the IM-PD1 module. diff --git a/arch/arm/mach-integrator/impd1.h b/arch/arm/mach-versatile/impd1.h similarity index 100% rename from arch/arm/mach-integrator/impd1.h rename to arch/arm/mach-versatile/impd1.h diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-versatile/integrator_ap.c similarity index 98% rename from arch/arm/mach-integrator/integrator_ap.c rename to arch/arm/mach-versatile/integrator_ap.c index 035069ea2c8b..0001aca181c2 100644 --- a/arch/arm/mach-integrator/integrator_ap.c +++ b/arch/arm/mach-versatile/integrator_ap.c @@ -1,7 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* - * linux/arch/arm/mach-integrator/integrator_ap.c - * * Copyright (C) 2000-2003 Deep Blue Solutions Ltd */ #include diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-versatile/integrator_cp.c similarity index 98% rename from arch/arm/mach-integrator/integrator_cp.c rename to arch/arm/mach-versatile/integrator_cp.c index b7eb4038798b..9cbcb3e97558 100644 --- a/arch/arm/mach-integrator/integrator_cp.c +++ b/arch/arm/mach-versatile/integrator_cp.c @@ -1,7 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * linux/arch/arm/mach-integrator/integrator_cp.c - * * Copyright (C) 2003 Deep Blue Solutions Ltd */ #include diff --git a/arch/arm/mach-integrator/lm.c b/arch/arm/mach-versatile/lm.c similarity index 97% rename from arch/arm/mach-integrator/lm.c rename to arch/arm/mach-versatile/lm.c index 55cd173d1d76..1bf3ec2ac770 100644 --- a/arch/arm/mach-integrator/lm.c +++ b/arch/arm/mach-versatile/lm.c @@ -1,7 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * linux/arch/arm/mach-integrator/lm.c - * * Copyright (C) 2003 Deep Blue Solutions Ltd, All Rights Reserved. */ #include diff --git a/arch/arm/mach-integrator/lm.h b/arch/arm/mach-versatile/lm.h similarity index 100% rename from arch/arm/mach-integrator/lm.h rename to arch/arm/mach-versatile/lm.h diff --git a/arch/arm/mach-realview/platsmp-dt.c b/arch/arm/mach-versatile/platsmp-realview.c similarity index 98% rename from arch/arm/mach-realview/platsmp-dt.c rename to arch/arm/mach-versatile/platsmp-realview.c index 5ae783767a5d..5d363385c801 100644 --- a/arch/arm/mach-realview/platsmp-dt.c +++ b/arch/arm/mach-versatile/platsmp-realview.c @@ -13,7 +13,7 @@ #include #include -#include +#include "platsmp.h" #define REALVIEW_SYS_FLAGSSET_OFFSET 0x30 diff --git a/arch/arm/mach-vexpress/platsmp.c b/arch/arm/mach-versatile/platsmp-vexpress.c similarity index 96% rename from arch/arm/mach-vexpress/platsmp.c rename to arch/arm/mach-versatile/platsmp-vexpress.c index 99c93124aa68..a2228c7a3d99 100644 --- a/arch/arm/mach-vexpress/platsmp.c +++ b/arch/arm/mach-versatile/platsmp-vexpress.c @@ -1,7 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * linux/arch/arm/mach-vexpress/platsmp.c - * * Copyright (C) 2002 ARM Ltd. * All Rights Reserved */ @@ -16,8 +14,7 @@ #include #include -#include - +#include "platsmp.h" #include "core.h" bool __init vexpress_smp_init_ops(void) diff --git a/arch/arm/plat-versatile/platsmp.c b/arch/arm/mach-versatile/platsmp.c similarity index 97% rename from arch/arm/plat-versatile/platsmp.c rename to arch/arm/mach-versatile/platsmp.c index 3567296cec2a..fa7378321e23 100644 --- a/arch/arm/plat-versatile/platsmp.c +++ b/arch/arm/mach-versatile/platsmp.c @@ -1,7 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * linux/arch/arm/plat-versatile/platsmp.c - * * Copyright (C) 2002 ARM Ltd. * All Rights Reserved * @@ -20,7 +18,7 @@ #include #include -#include +#include "platsmp.h" /* * versatile_cpu_release controls the release of CPUs from the holding diff --git a/arch/arm/plat-versatile/include/plat/platsmp.h b/arch/arm/mach-versatile/platsmp.h similarity index 87% rename from arch/arm/plat-versatile/include/plat/platsmp.h rename to arch/arm/mach-versatile/platsmp.h index 500605f48b80..171a0ab72220 100644 --- a/arch/arm/plat-versatile/include/plat/platsmp.h +++ b/arch/arm/mach-versatile/platsmp.h @@ -1,7 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* - * linux/arch/arm/plat-versatile/include/plat/platsmp.h - * * Copyright (C) 2011 ARM Ltd. * All Rights Reserved */ diff --git a/arch/arm/mach-realview/realview-dt.c b/arch/arm/mach-versatile/realview-dt.c similarity index 100% rename from arch/arm/mach-realview/realview-dt.c rename to arch/arm/mach-versatile/realview-dt.c diff --git a/arch/arm/plat-versatile/sched-clock.c b/arch/arm/mach-versatile/sched-clock.c similarity index 86% rename from arch/arm/plat-versatile/sched-clock.c rename to arch/arm/mach-versatile/sched-clock.c index ecb7913d2f53..4e3ffa4156f3 100644 --- a/arch/arm/plat-versatile/sched-clock.c +++ b/arch/arm/mach-versatile/sched-clock.c @@ -1,7 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* - * linux/arch/arm/plat-versatile/sched-clock.c - * * Copyright (C) 1999 - 2003 ARM Limited * Copyright (C) 2000 Deep Blue Solutions Ltd */ @@ -9,7 +7,7 @@ #include #include -#include +#include "sched_clock.h" static void __iomem *ctr; diff --git a/arch/arm/plat-versatile/include/plat/sched_clock.h b/arch/arm/mach-versatile/sched_clock.h similarity index 100% rename from arch/arm/plat-versatile/include/plat/sched_clock.h rename to arch/arm/mach-versatile/sched_clock.h diff --git a/arch/arm/mach-vexpress/spc.c b/arch/arm/mach-versatile/spc.c similarity index 100% rename from arch/arm/mach-vexpress/spc.c rename to arch/arm/mach-versatile/spc.c diff --git a/arch/arm/mach-vexpress/spc.h b/arch/arm/mach-versatile/spc.h similarity index 100% rename from arch/arm/mach-vexpress/spc.h rename to arch/arm/mach-versatile/spc.h diff --git a/arch/arm/mach-vexpress/tc2_pm.c b/arch/arm/mach-versatile/tc2_pm.c similarity index 99% rename from arch/arm/mach-vexpress/tc2_pm.c rename to arch/arm/mach-versatile/tc2_pm.c index e96c42ae3602..0fe78da0c109 100644 --- a/arch/arm/mach-vexpress/tc2_pm.c +++ b/arch/arm/mach-versatile/tc2_pm.c @@ -1,7 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * arch/arm/mach-vexpress/tc2_pm.c - TC2 power management support - * * Created by: Nicolas Pitre, October 2012 * Copyright: (C) 2012-2013 Linaro Limited * diff --git a/arch/arm/mach-vexpress/v2m-mps2.c b/arch/arm/mach-versatile/v2m-mps2.c similarity index 100% rename from arch/arm/mach-vexpress/v2m-mps2.c rename to arch/arm/mach-versatile/v2m-mps2.c diff --git a/arch/arm/mach-vexpress/v2m.c b/arch/arm/mach-versatile/v2m.c similarity index 100% rename from arch/arm/mach-vexpress/v2m.c rename to arch/arm/mach-versatile/v2m.c diff --git a/arch/arm/mach-vexpress/Kconfig b/arch/arm/mach-vexpress/Kconfig deleted file mode 100644 index 726a68085c3b..000000000000 --- a/arch/arm/mach-vexpress/Kconfig +++ /dev/null @@ -1,84 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -menuconfig ARCH_VEXPRESS - bool "ARM Ltd. Versatile Express family" - depends on ARCH_MULTI_V7 - select ARCH_SUPPORTS_BIG_ENDIAN - select ARM_AMBA - select ARM_GIC - select ARM_GLOBAL_TIMER - select ARM_TIMER_SP804 - select COMMON_CLK_VERSATILE - select GPIOLIB - select HAVE_ARM_SCU if SMP - select HAVE_ARM_TWD if SMP - select HAVE_PATA_PLATFORM - select ICST - select NO_IOPORT_MAP - select PLAT_VERSATILE - select POWER_RESET - select POWER_RESET_VEXPRESS - select POWER_SUPPLY - select REGULATOR if MMC_ARMMMCI - select REGULATOR_FIXED_VOLTAGE if REGULATOR - select VEXPRESS_CONFIG - select VEXPRESS_SYSCFG - select MFD_VEXPRESS_SYSREG - help - This option enables support for systems using Cortex processor based - ARM core and logic (FPGA) tiles on the Versatile Express motherboard, - for example: - - - CoreTile Express A5x2 (V2P-CA5s) - - CoreTile Express A9x4 (V2P-CA9) - - CoreTile Express A15x2 (V2P-CA15) - - LogicTile Express 13MG (V2F-2XV6) with A5, A7, A9 or A15 SMMs - (Soft Macrocell Models) - - Versatile Express RTSMs (Models) - - You must boot using a Flattened Device Tree in order to use these - platforms. The traditional (ATAGs) boot method is not usable on - these boards with this option. - -if ARCH_VEXPRESS - -config ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA - bool "Enable A5 and A9 only errata work-arounds" - default y - select ARM_ERRATA_643719 if SMP - select ARM_ERRATA_720789 - select PL310_ERRATA_753970 if CACHE_L2X0 - help - Provides common dependencies for Versatile Express platforms - based on Cortex-A5 and Cortex-A9 processors. In order to - build a working kernel, you must also enable relevant core - tile support or Flattened Device Tree based support options. - -config ARCH_VEXPRESS_DCSCB - bool "Dual Cluster System Control Block (DCSCB) support" - depends on MCPM - select ARM_CCI400_PORT_CTRL - help - Support for the Dual Cluster System Configuration Block (DCSCB). - This is needed to provide CPU and cluster power management - on RTSM implementing big.LITTLE. - -config ARCH_VEXPRESS_SPC - bool "Versatile Express Serial Power Controller (SPC)" - select PM_OPP - help - The TC2 (A15x2 A7x3) versatile express core tile integrates a logic - block called Serial Power Controller (SPC) that provides the interface - between the dual cluster test-chip and the M3 microcontroller that - carries out power management. - -config ARCH_VEXPRESS_TC2_PM - bool "Versatile Express TC2 power management" - depends on MCPM - select ARM_CCI400_PORT_CTRL - select ARCH_VEXPRESS_SPC - select ARM_CPU_SUSPEND - help - Support for CPU and cluster power management on Versatile Express - with a TC2 (A15x2 A7x3) big.LITTLE core tile. - -endif diff --git a/arch/arm/mach-vexpress/Makefile b/arch/arm/mach-vexpress/Makefile deleted file mode 100644 index 3651a1ed0f2b..000000000000 --- a/arch/arm/mach-vexpress/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -# -# Makefile for the linux kernel. -# -ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := \ - -I$(srctree)/arch/arm/plat-versatile/include - -obj-$(CONFIG_ARCH_VEXPRESS) := v2m.o -obj-$(CONFIG_ARCH_VEXPRESS_DCSCB) += dcscb.o dcscb_setup.o -CFLAGS_dcscb.o += -march=armv7-a -CFLAGS_REMOVE_dcscb.o = -pg -obj-$(CONFIG_ARCH_VEXPRESS_SPC) += spc.o -CFLAGS_REMOVE_spc.o = -pg -obj-$(CONFIG_ARCH_VEXPRESS_TC2_PM) += tc2_pm.o -CFLAGS_tc2_pm.o += -march=armv7-a -CFLAGS_REMOVE_tc2_pm.o = -pg -obj-$(CONFIG_SMP) += platsmp.o - -obj-$(CONFIG_ARCH_MPS2) += v2m-mps2.o diff --git a/arch/arm/plat-versatile/Kconfig b/arch/arm/plat-versatile/Kconfig deleted file mode 100644 index 748238f9f10e..000000000000 --- a/arch/arm/plat-versatile/Kconfig +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only -if PLAT_VERSATILE - -config PLAT_VERSATILE_SCHED_CLOCK - bool - -endif diff --git a/arch/arm/plat-versatile/Makefile b/arch/arm/plat-versatile/Makefile deleted file mode 100644 index e856f0a4ac6e..000000000000 --- a/arch/arm/plat-versatile/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only -ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include - -obj-$(CONFIG_PLAT_VERSATILE_SCHED_CLOCK) += sched-clock.o -obj-$(CONFIG_SMP) += headsmp.o platsmp.o -obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o From patchwork Fri Oct 18 16:29:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 176903 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp1094252ill; Fri, 18 Oct 2019 09:32:32 -0700 (PDT) X-Google-Smtp-Source: APXvYqzsailiN1hWcVzZoSyyVCtYk99L3/lPDGRwX+MJ0PnB1zhIRRn1NwF3N9tuAB9oOeg9nqPR X-Received: by 2002:aa7:cf12:: with SMTP id a18mr10674326edy.278.1571416352176; Fri, 18 Oct 2019 09:32:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571416352; cv=none; d=google.com; s=arc-20160816; b=INbTtclYxYWNb4g/rt2vCVB6HD/gxdMSYvIol9z+vfMmSUHKfRiHi9gNejAyTwKkfm PQyo2wHyNXDkdFH4GYnf3lhBc/v6ixsvIMKW/ncZ35H7pZLuaSqSCd+clmJoDcBIcvej 1PYNzBgD74nzbEdRMgW2o/k3OEkS3J+l1vFQTA8tyIhBCKICqqRVxTLtIfe+jNuTthRx wKK81qy1rGvVeguMyJI64oHFwc5hRjphiWo9/zyka4F1+MyPJTWln4mLhOAHho53lFsE EBFqahd9nqswFt5/Y9iYLk1uMjBar07DDxc6NgHE9lSgu2yl67clcl8GVy7jOIPYN249 fuzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=EpReXmXmQx9Vk8g59I5SmHrcLT5HdEAZkDT53hfpc84=; b=pPTahJXYOi4qLH8QhabTrWUGXDcIwL7+Vvw31fucFiQsIQ7BQ6aB5CmLvGn9svyD2F TdPqAOUl2OXkMtnQD07fYVbvI/qYJH1Uuk8gzeycRFhcM/fsPpBHTr7LIHlnyjchqtR7 dppw9taKK4nmdzVjLA8i9QWcAcMrr5+Sr2tEoLS8FLM7pua+GEIG9Y0s3rH+Znpqa483 A2c/crLn7jborsgAWLnDQMiGV8xarMNAk39jmlyI8727VYodFBNVeavhlEY3xeNAEP3t JzfxKwzk9Ozrv0wKCc0PSLSdusaPpMdOSofcSfbqmBJ7m9Y2hwXs1rJ6NLMXn98hQVPi Gftg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e14si4014851eda.104.2019.10.18.09.32.31; Fri, 18 Oct 2019 09:32:32 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2408573AbfJRQc1 (ORCPT + 26 others); Fri, 18 Oct 2019 12:32:27 -0400 Received: from mout.kundenserver.de ([217.72.192.75]:59997 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2442975AbfJRQbJ (ORCPT ); Fri, 18 Oct 2019 12:31:09 -0400 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.145]) with ESMTPA (Nemesis) id 1MNcYX-1ifWBP0o6V-00P6cd; Fri, 18 Oct 2019 18:30:56 +0200 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org, Arnd Bergmann , Hartley Sweeten , Alexander Sverdlin , Hubert Feurstein , Lukasz Majewski Subject: [PATCH 2/6] ARM: ep93xx: enable SPARSE_IRQ Date: Fri, 18 Oct 2019 18:29:15 +0200 Message-Id: <20191018163047.1284736-2-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20191018163047.1284736-1-arnd@arndb.de> References: <20191018163047.1284736-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:a8o20A1aeMq66ylH+ZWPfDYZa2uZdpXnGwy6HcyXRtObZyyvUry wKkmb06WaBy2sqybhraDlVUY9dM6RoCDORnE55WXFQpwdAw9s1ZnS8K4qFb07qSMfouNQlX B2od+y4VfrLuLExqWrrMANYKFpu1xHQxbbD44QqMlCqpY3ii0WyXen7I52Lo/HBx0r3cnUd Ij40iRAo12PjYYEU5c/ZA== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:O15dYrgphrI=:4W1saKBI4JpXwNNg4EOkNp 1uiAx1Kdch0ukBarp2iAd0+RDJUk29oqWWe0AycJapz/zJmBWe+Z/+VH1zJn4Lh/VDUyUD0fl h98N4WgzqRpnTvX18PBVUXCLV4AC3TAZhZEKXO+CSaxxHtp9ByvXdbJwdVMZmHY1tyJU/qL7m GWslC+2UZwmwYNLTvQwsAcSLy54BdiwoW+Iqq7CSVOqpT8/0teoEtwA1ZvwLTLnYtCnz3jLcW S2NmFeA6Au9iFK0IewvSjpozvN+Ib3gz7o0RZOoeGRk1LEpG58HAGNTOHcOngaUmU7ANaI/45 zRBevca/UidqjhJsn7lCdVQOwn9ahFmjBeHUjFuuSh6djHsD7Y/EKWujLTFQj+GlW5FHbi6/I 9oIUUsFiz/I2h+G1HgKeDxFOEURRrTqXrOxhOvYQl+DG0PDxPedErniCdhdM/h/SsVDLAX60k nxuptKnFGjMOOGyG7HWZn84LEvBEXMNAYrVrza6Lgg7IFKNdeKUa+Hixx6BZ1rqPxKcHqDVhK hQwECtVoxSq176lQrDuSz/ZNeOk42FzWHgn4MvD6M0JQNWepCx1hJ2hwl5UxP5GFQlxtGLhPY RUfp+14vyX18b/Mpj6AmcrO5z7Nh6trj1DdksX6abAVENamnthklMPJhxhEiUtMRJu8hb2ml8 oRTMcrgjiuAnnbnvpOHEkaWLcuZV5/VAVoECAnRacffmbZ1sl7xkYjp3B4h+w+gm4ph2tgj/z HG9X8ZEQoVCoYvxiI9TIRA5Q29JboHPd8lAVwekwXj4U3nu8VjKl4DMISIIq9zYbOBZMPuEPT 6KZVDquvzm+RYBV3DxziY7dM09GffOKF+ueUN6iEoke8B+/9YvXREqIbE9snDyhADqGhB5BFl wgsN6bdCON4tL1zf2Zug== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Without CONFIG_SPARSE_IRQ, we rely on mach/irqs.h to define NR_IRQS globally. Do the minimal conversion by setting .nr_irqs in each machine descriptor. Only the vision_ep9307 machine has extra IRQs for GPIOs, so make .nr_irqs the original value there, while using the plain NR_EP93XX_IRQS everywhere else. --- It's been a while since I did this, no idea what else is needed here or if this is correct at all. Cc: Hartley Sweeten Cc: Alexander Sverdlin Cc: Hubert Feurstein Cc: Lukasz Majewski Signed-off-by: Arnd Bergmann --- arch/arm/Kconfig | 2 ++ arch/arm/mach-ep93xx/adssphere.c | 1 + arch/arm/mach-ep93xx/edb93xx.c | 8 ++++++++ arch/arm/mach-ep93xx/gesbc9312.c | 1 + arch/arm/mach-ep93xx/{include/mach => }/irqs.h | 7 ------- arch/arm/mach-ep93xx/micro9.c | 4 ++++ arch/arm/mach-ep93xx/simone.c | 1 + arch/arm/mach-ep93xx/snappercl15.c | 1 + arch/arm/mach-ep93xx/soc.h | 1 + arch/arm/mach-ep93xx/ts72xx.c | 3 ++- arch/arm/mach-ep93xx/vision_ep9307.c | 1 + 11 files changed, 22 insertions(+), 8 deletions(-) rename arch/arm/mach-ep93xx/{include/mach => }/irqs.h (94%) -- 2.20.0 Tested-by: Alexander Sverdlin diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index b6681b61e46c..cca3d240a01e 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -365,6 +365,8 @@ config ARCH_EP93XX select CPU_ARM920T select GENERIC_CLOCKEVENTS select GPIOLIB + select IRQ_DOMAIN + select SPARSE_IRQ help This enables support for the Cirrus EP93xx series of CPUs. diff --git a/arch/arm/mach-ep93xx/adssphere.c b/arch/arm/mach-ep93xx/adssphere.c index 57cfd8ebe04f..bb5e7b3c2fba 100644 --- a/arch/arm/mach-ep93xx/adssphere.c +++ b/arch/arm/mach-ep93xx/adssphere.c @@ -32,6 +32,7 @@ static void __init adssphere_init_machine(void) MACHINE_START(ADSSPHERE, "ADS Sphere board") /* Maintainer: Lennert Buytenhek */ .atag_offset = 0x100, + .nr_irqs = NR_EP93XX_IRQS, .map_io = ep93xx_map_io, .init_irq = ep93xx_init_irq, .init_time = ep93xx_timer_init, diff --git a/arch/arm/mach-ep93xx/edb93xx.c b/arch/arm/mach-ep93xx/edb93xx.c index 7b7280c21ee0..19f38f58ff46 100644 --- a/arch/arm/mach-ep93xx/edb93xx.c +++ b/arch/arm/mach-ep93xx/edb93xx.c @@ -243,6 +243,7 @@ static void __init edb93xx_init_machine(void) MACHINE_START(EDB9301, "Cirrus Logic EDB9301 Evaluation Board") /* Maintainer: H Hartley Sweeten */ .atag_offset = 0x100, + .nr_irqs = NR_EP93XX_IRQS, .map_io = ep93xx_map_io, .init_irq = ep93xx_init_irq, .init_time = ep93xx_timer_init, @@ -256,6 +257,7 @@ MACHINE_END MACHINE_START(EDB9302, "Cirrus Logic EDB9302 Evaluation Board") /* Maintainer: George Kashperko */ .atag_offset = 0x100, + .nr_irqs = NR_EP93XX_IRQS, .map_io = ep93xx_map_io, .init_irq = ep93xx_init_irq, .init_time = ep93xx_timer_init, @@ -269,6 +271,7 @@ MACHINE_END MACHINE_START(EDB9302A, "Cirrus Logic EDB9302A Evaluation Board") /* Maintainer: Lennert Buytenhek */ .atag_offset = 0x100, + .nr_irqs = NR_EP93XX_IRQS, .map_io = ep93xx_map_io, .init_irq = ep93xx_init_irq, .init_time = ep93xx_timer_init, @@ -282,6 +285,7 @@ MACHINE_END MACHINE_START(EDB9307, "Cirrus Logic EDB9307 Evaluation Board") /* Maintainer: Herbert Valerio Riedel */ .atag_offset = 0x100, + .nr_irqs = NR_EP93XX_IRQS, .map_io = ep93xx_map_io, .init_irq = ep93xx_init_irq, .init_time = ep93xx_timer_init, @@ -295,6 +299,7 @@ MACHINE_END MACHINE_START(EDB9307A, "Cirrus Logic EDB9307A Evaluation Board") /* Maintainer: H Hartley Sweeten */ .atag_offset = 0x100, + .nr_irqs = NR_EP93XX_IRQS, .map_io = ep93xx_map_io, .init_irq = ep93xx_init_irq, .init_time = ep93xx_timer_init, @@ -308,6 +313,7 @@ MACHINE_END MACHINE_START(EDB9312, "Cirrus Logic EDB9312 Evaluation Board") /* Maintainer: Toufeeq Hussain */ .atag_offset = 0x100, + .nr_irqs = NR_EP93XX_IRQS, .map_io = ep93xx_map_io, .init_irq = ep93xx_init_irq, .init_time = ep93xx_timer_init, @@ -321,6 +327,7 @@ MACHINE_END MACHINE_START(EDB9315, "Cirrus Logic EDB9315 Evaluation Board") /* Maintainer: Lennert Buytenhek */ .atag_offset = 0x100, + .nr_irqs = NR_EP93XX_IRQS, .map_io = ep93xx_map_io, .init_irq = ep93xx_init_irq, .init_time = ep93xx_timer_init, @@ -334,6 +341,7 @@ MACHINE_END MACHINE_START(EDB9315A, "Cirrus Logic EDB9315A Evaluation Board") /* Maintainer: Lennert Buytenhek */ .atag_offset = 0x100, + .nr_irqs = NR_EP93XX_IRQS, .map_io = ep93xx_map_io, .init_irq = ep93xx_init_irq, .init_time = ep93xx_timer_init, diff --git a/arch/arm/mach-ep93xx/gesbc9312.c b/arch/arm/mach-ep93xx/gesbc9312.c index 8905db1edd5a..6bc86b554864 100644 --- a/arch/arm/mach-ep93xx/gesbc9312.c +++ b/arch/arm/mach-ep93xx/gesbc9312.c @@ -32,6 +32,7 @@ static void __init gesbc9312_init_machine(void) MACHINE_START(GESBC9312, "Glomation GESBC-9312-sx") /* Maintainer: Lennert Buytenhek */ .atag_offset = 0x100, + .nr_irqs = NR_EP93XX_IRQS, .map_io = ep93xx_map_io, .init_irq = ep93xx_init_irq, .init_time = ep93xx_timer_init, diff --git a/arch/arm/mach-ep93xx/include/mach/irqs.h b/arch/arm/mach-ep93xx/irqs.h similarity index 94% rename from arch/arm/mach-ep93xx/include/mach/irqs.h rename to arch/arm/mach-ep93xx/irqs.h index 244daf83ce6d..3ffdb3a2f3e4 100644 --- a/arch/arm/mach-ep93xx/include/mach/irqs.h +++ b/arch/arm/mach-ep93xx/irqs.h @@ -1,8 +1,4 @@ /* SPDX-License-Identifier: GPL-2.0 */ -/* - * arch/arm/mach-ep93xx/include/mach/irqs.h - */ - #ifndef __ASM_ARCH_IRQS_H #define __ASM_ARCH_IRQS_H @@ -73,7 +69,4 @@ #define EP93XX_BOARD_IRQ(x) (NR_EP93XX_IRQS + (x)) #define EP93XX_BOARD_IRQS 32 -#define NR_IRQS (NR_EP93XX_IRQS + EP93XX_BOARD_IRQS) - - #endif diff --git a/arch/arm/mach-ep93xx/micro9.c b/arch/arm/mach-ep93xx/micro9.c index b18ebf26da45..271898b17296 100644 --- a/arch/arm/mach-ep93xx/micro9.c +++ b/arch/arm/mach-ep93xx/micro9.c @@ -76,6 +76,7 @@ static void __init micro9_init_machine(void) MACHINE_START(MICRO9, "Contec Micro9-High") /* Maintainer: Hubert Feurstein */ .atag_offset = 0x100, + .nr_irqs = NR_EP93XX_IRQS, .map_io = ep93xx_map_io, .init_irq = ep93xx_init_irq, .init_time = ep93xx_timer_init, @@ -89,6 +90,7 @@ MACHINE_END MACHINE_START(MICRO9M, "Contec Micro9-Mid") /* Maintainer: Hubert Feurstein */ .atag_offset = 0x100, + .nr_irqs = NR_EP93XX_IRQS, .map_io = ep93xx_map_io, .init_irq = ep93xx_init_irq, .init_time = ep93xx_timer_init, @@ -102,6 +104,7 @@ MACHINE_END MACHINE_START(MICRO9L, "Contec Micro9-Lite") /* Maintainer: Hubert Feurstein */ .atag_offset = 0x100, + .nr_irqs = NR_EP93XX_IRQS, .map_io = ep93xx_map_io, .init_irq = ep93xx_init_irq, .init_time = ep93xx_timer_init, @@ -115,6 +118,7 @@ MACHINE_END MACHINE_START(MICRO9S, "Contec Micro9-Slim") /* Maintainer: Hubert Feurstein */ .atag_offset = 0x100, + .nr_irqs = NR_EP93XX_IRQS, .map_io = ep93xx_map_io, .init_irq = ep93xx_init_irq, .init_time = ep93xx_timer_init, diff --git a/arch/arm/mach-ep93xx/simone.c b/arch/arm/mach-ep93xx/simone.c index 8a53b74dc4b2..e2f7243629fe 100644 --- a/arch/arm/mach-ep93xx/simone.c +++ b/arch/arm/mach-ep93xx/simone.c @@ -119,6 +119,7 @@ static void __init simone_init_machine(void) MACHINE_START(SIM_ONE, "Simplemachines Sim.One Board") /* Maintainer: Ryan Mallon */ .atag_offset = 0x100, + .nr_irqs = NR_EP93XX_IRQS, .map_io = ep93xx_map_io, .init_irq = ep93xx_init_irq, .init_time = ep93xx_timer_init, diff --git a/arch/arm/mach-ep93xx/snappercl15.c b/arch/arm/mach-ep93xx/snappercl15.c index 703f25f19d51..29c8ea34c8e1 100644 --- a/arch/arm/mach-ep93xx/snappercl15.c +++ b/arch/arm/mach-ep93xx/snappercl15.c @@ -153,6 +153,7 @@ static void __init snappercl15_init_machine(void) MACHINE_START(SNAPPER_CL15, "Bluewater Systems Snapper CL15") /* Maintainer: Ryan Mallon */ .atag_offset = 0x100, + .nr_irqs = NR_EP93XX_IRQS, .map_io = ep93xx_map_io, .init_irq = ep93xx_init_irq, .init_time = ep93xx_timer_init, diff --git a/arch/arm/mach-ep93xx/soc.h b/arch/arm/mach-ep93xx/soc.h index f2dace1c9154..770743bbaf80 100644 --- a/arch/arm/mach-ep93xx/soc.h +++ b/arch/arm/mach-ep93xx/soc.h @@ -10,6 +10,7 @@ #define _EP93XX_SOC_H #include +#include "irqs.h" /* * EP93xx Physical Memory Map: diff --git a/arch/arm/mach-ep93xx/ts72xx.c b/arch/arm/mach-ep93xx/ts72xx.c index e0e1b11032f1..9ac0308f3d71 100644 --- a/arch/arm/mach-ep93xx/ts72xx.c +++ b/arch/arm/mach-ep93xx/ts72xx.c @@ -22,7 +22,6 @@ #include "gpio-ep93xx.h" #include "hardware.h" -#include #include #include @@ -350,6 +349,7 @@ static void __init ts72xx_init_machine(void) MACHINE_START(TS72XX, "Technologic Systems TS-72xx SBC") /* Maintainer: Lennert Buytenhek */ .atag_offset = 0x100, + .nr_irqs = NR_EP93XX_IRQS, .map_io = ts72xx_map_io, .init_irq = ep93xx_init_irq, .init_time = ep93xx_timer_init, @@ -414,6 +414,7 @@ static void __init bk3_init_machine(void) MACHINE_START(BK3, "Liebherr controller BK3.1") /* Maintainer: Lukasz Majewski */ .atag_offset = 0x100, + .nr_irqs = NR_EP93XX_IRQS, .map_io = ts72xx_map_io, .init_irq = ep93xx_init_irq, .init_time = ep93xx_timer_init, diff --git a/arch/arm/mach-ep93xx/vision_ep9307.c b/arch/arm/mach-ep93xx/vision_ep9307.c index cbcba3136d74..04f9f15be248 100644 --- a/arch/arm/mach-ep93xx/vision_ep9307.c +++ b/arch/arm/mach-ep93xx/vision_ep9307.c @@ -302,6 +302,7 @@ static void __init vision_init_machine(void) MACHINE_START(VISION_EP9307, "Vision Engraving Systems EP9307") /* Maintainer: H Hartley Sweeten */ .atag_offset = 0x100, + .nr_irqs = NR_EP93XX_IRQS + EP93XX_BOARD_IRQS, .map_io = vision_map_io, .init_irq = ep93xx_init_irq, .init_time = ep93xx_timer_init, From patchwork Fri Oct 18 16:29:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 176898 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp1093047ill; Fri, 18 Oct 2019 09:31:42 -0700 (PDT) X-Google-Smtp-Source: APXvYqzps/ihWECa5bfM1df5n6764ObryGXpYTXLR2JfH10CYa4eeRwaN48a0gJ7NpctOEYhoSTh X-Received: by 2002:aa7:da4a:: with SMTP id w10mr10366783eds.209.1571416302819; Fri, 18 Oct 2019 09:31:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571416302; cv=none; d=google.com; s=arc-20160816; b=KDyE6nl1tLVXPhHLVM6ODSDObZu/hdCY+yHYUkBiFVpENm4XqrSAMlFv7J6sCy4e/q IsocdPSV4cN7BZzPCQNMcicCHR3B2V3avJiMOoZ5hb2JgC4VEuuTVPVwmwHsfV/0JY8Z pcyRvvkkia68x2H3KAimGqqZSaDpRBXv90UZIL4hhvsIfY4G3PnFWShKPjTE3+bmEPbz 6FEKuM7Z/nk71JdMbCtTDaY9LVXFKZ41XH+QxgBEK2Z01t3fG/6djEBzW79mXmS0m64u TxRcjFd6CAAvmygqlR+m217LVrRWLw4f1bsoIH3XAAIyFa1sG0tOKUDIrM0GR+sDOraN fJtg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=qqvuAm7QSElU2sDhv/Ph3Kjj7dRj7SecqPdVnGvvJ38=; b=vZbiW6o01WvRiiCTS8ynHQFx51zhQNYkOSMFhoToX+CMAXJJRumkYQxp6Yp4kDHDLx rq3N4PNN1Bw/kgaqFr1qUp2Kp4oEe+neNmhGT9F1qpAN4IEHJHmnFwMjWvNG3+pFkFx8 NLtayIUYhumJcgbSePp/dkyMSzMd0qTMLnZTvNbvVmjHP4mncLddPOvBHavgGYKjkhYP ECzZuO4gLoR/Voynip5SGBa7mgxTdtoxFqPfnr6Ijw0Rlx7h/1AMKmU/gqO/GMMQ4sk/ XdeVUnk1PKf7NufG4mb5R4hqeSFwvBFAY2kXFzVipuzg713cmOIo80kh93YIJDFiY+Eb abdQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i10si4425773ede.101.2019.10.18.09.31.42; Fri, 18 Oct 2019 09:31:42 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2394076AbfJRQbk (ORCPT + 26 others); Fri, 18 Oct 2019 12:31:40 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:39785 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2443020AbfJRQbO (ORCPT ); Fri, 18 Oct 2019 12:31:14 -0400 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.145]) with ESMTPA (Nemesis) id 1MK3mS-1icTm63Lji-00LXiw; Fri, 18 Oct 2019 18:31:00 +0200 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org, Arnd Bergmann , Hartley Sweeten , Alexander Sverdlin Subject: [PATCH 3/6] ARM: ep93xx: make mach/ep93xx-regs.h local Date: Fri, 18 Oct 2019 18:29:16 +0200 Message-Id: <20191018163047.1284736-3-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20191018163047.1284736-1-arnd@arndb.de> References: <20191018163047.1284736-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:Tlr/kGU2mrcS/i0RZ/FxB2SYCWQT8PnsZqB5BcF7KAjcRmXLUoF F9tlGC+3wNa5O5ykqO5dAN2TDQM0ig59FE1SOufdFwBDz5f7Eln7CUeDvq9Y5oe8gDIq3g6 0fDwY3z/aNnIGAGFB9uIwbx/4hf4Sc2khW/mncHRod8MA9YGAGM5IP+7H767jo4JR3PB0F4 8sIvE5utwNvgPaEv9jxSw== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:+IHzhn3/5XI=:3+rOIP+88JYxotOIBrvwLn epLEJlm/bm1m6smJnYwY6LsWyjAWKtgnQ9SOQ1u1kLeWB4lVdkM1zyfETbpfqKTI3gtUQGb31 7qvGQHo1ULmo3Kcwtgr/UMu/gNteiLmFh/FAjMCsWYbuv2y/FHnMPcmxDE6i4Wcg8hG6AHe5D auu0neWcvGuz5x6a4Pm6qHdFAELbHITngSBERzCYCkXBslEu1GcriGPbjubkt1nSMubPeOotQ /wUVDcOCmjJW8SlkBXiyaq7FBonl9BJUiwHHae6BrNzbwIJ0Z0WBywyTwqa7KzCAAZ9uZAGeY Rwn8hCH/JxbigA6n0Mu3WItmFLp4q9G6BXZFOggU1gFZg8kQB2B9e040Vk1B9axLzdu4NCGas NwPyzWqBGQd/SKn+S5jj4N5o41KkOk6HIJHLo/8uowM6eNHLCoX9iCZtfV+JbcCGLUPB0gva+ etKp0YR9PCqjM3XjNiEwG9GysIP3HwQhZsQXRevLaqxtKPPh4QMkiw8tSoBMcPmFg6LYA5TTP dUWZOa/RvaL0rWzwdkgHOKi1sQmPotgs/y1WT5TI6uFHbFcFa3gNH9xhbDn1Wh/6uGx30cnbJ BgSlkjCou75M88kQbYGA1AOFWlIjW61hwm3jgPyWDon5z9bSGabmFB3DpHvFyOk+/oVw0dmrT NiD4hjy1o/Qsl5x7GWyNtJielZuoTj0gA3hSqaSdbQ0bpTbj9WMm6VpfNIE0qO5Rxvpx/ORgk jiM+56LMmAnxwY+UHxwG2so4GiG7WoNonQZSjUZj4BolzLlCXquFNDA/GgN/HVDSEpGMNU5Xx dtZtdH5FQp92SsdBIp11mJF5v0aPISl62FxZ6rx1yWCCNbdxZHOGiBHJ4XhoW5OgL0wlUtbx8 gHaq77S5t+W3wz9jnl3w== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Nothing relies on it outside of arch/arm/mach-ep93xx/, so just move it there. Cc: Hartley Sweeten Cc: Alexander Sverdlin Signed-off-by: Arnd Bergmann --- arch/arm/mach-ep93xx/crunch-bits.S | 2 +- arch/arm/mach-ep93xx/{include/mach => }/ep93xx-regs.h | 4 ---- arch/arm/mach-ep93xx/gpio-ep93xx.h | 2 +- arch/arm/mach-ep93xx/include/mach/uncompress.h | 1 - arch/arm/mach-ep93xx/soc.h | 2 +- 5 files changed, 3 insertions(+), 8 deletions(-) rename arch/arm/mach-ep93xx/{include/mach => }/ep93xx-regs.h (94%) -- 2.20.0 diff --git a/arch/arm/mach-ep93xx/crunch-bits.S b/arch/arm/mach-ep93xx/crunch-bits.S index fb2dbf76f09e..e6dd08538bb9 100644 --- a/arch/arm/mach-ep93xx/crunch-bits.S +++ b/arch/arm/mach-ep93xx/crunch-bits.S @@ -14,7 +14,7 @@ #include #include #include -#include +#include "ep93xx-regs.h" /* * We can't use hex constants here due to a bug in gas. diff --git a/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h b/arch/arm/mach-ep93xx/ep93xx-regs.h similarity index 94% rename from arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h rename to arch/arm/mach-ep93xx/ep93xx-regs.h index 6839ea032e58..8fa3646de0a4 100644 --- a/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h +++ b/arch/arm/mach-ep93xx/ep93xx-regs.h @@ -1,8 +1,4 @@ /* SPDX-License-Identifier: GPL-2.0 */ -/* - * arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h - */ - #ifndef __ASM_ARCH_EP93XX_REGS_H #define __ASM_ARCH_EP93XX_REGS_H diff --git a/arch/arm/mach-ep93xx/gpio-ep93xx.h b/arch/arm/mach-ep93xx/gpio-ep93xx.h index 242af4a401ea..7b46eb7e5507 100644 --- a/arch/arm/mach-ep93xx/gpio-ep93xx.h +++ b/arch/arm/mach-ep93xx/gpio-ep93xx.h @@ -4,7 +4,7 @@ #ifndef __GPIO_EP93XX_H #define __GPIO_EP93XX_H -#include +#include "ep93xx-regs.h" #define EP93XX_GPIO_PHYS_BASE EP93XX_APB_PHYS(0x00040000) #define EP93XX_GPIO_BASE EP93XX_APB_IOMEM(0x00040000) diff --git a/arch/arm/mach-ep93xx/include/mach/uncompress.h b/arch/arm/mach-ep93xx/include/mach/uncompress.h index b3ec1db988db..e20bcab702b2 100644 --- a/arch/arm/mach-ep93xx/include/mach/uncompress.h +++ b/arch/arm/mach-ep93xx/include/mach/uncompress.h @@ -5,7 +5,6 @@ * Copyright (C) 2006 Lennert Buytenhek */ -#include #include static unsigned char __raw_readb(unsigned int ptr) diff --git a/arch/arm/mach-ep93xx/soc.h b/arch/arm/mach-ep93xx/soc.h index 770743bbaf80..670884ba754e 100644 --- a/arch/arm/mach-ep93xx/soc.h +++ b/arch/arm/mach-ep93xx/soc.h @@ -9,7 +9,7 @@ #ifndef _EP93XX_SOC_H #define _EP93XX_SOC_H -#include +#include "ep93xx-regs.h" #include "irqs.h" /* From patchwork Fri Oct 18 16:29:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 176902 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp1093867ill; Fri, 18 Oct 2019 09:32:15 -0700 (PDT) X-Google-Smtp-Source: APXvYqyTSN82eDGcZo7c+pWBsPQD05SRa94CRJuQ0MM4FUr+SDdQeYwHO04qO6BmFSZsEWhJ7tRm X-Received: by 2002:aa7:d4d9:: with SMTP id t25mr10627975edr.76.1571416335703; Fri, 18 Oct 2019 09:32:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571416335; cv=none; d=google.com; s=arc-20160816; b=x6QGt9XVMJxULHQoIQzpusTadUJrtWBLQUflY8o0xAEDMNwqByUfk5rcD5kkQrySeu r6bauz8xhOGuq2dIAvpd2u2g8yV/t6s5fJK2hW0b6IbK51t1VJRck0CvtppcwV4imvtx AVFulD46mOhlaTdJG3ziPoTyRy+25KHwnskfazWJXlq7gsQtMHiIZZfFOtt6dYGqFdyy 0C8yRHgaqtIgVlFGhmrYUDYljicsLj9Sxo2b0JfbPZg7tjcge99RREGPaQ+EvE5YFDou sSKuUxL3Twz1oBLhApSnQEqVMKtmJGat3rFC8z0XpoOXRcqo0uOwQ2EEf9B+pxdP53Bl bRQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=HhI4F/6mb8k04KK+TU+f75bwa86FisBEpcGHUA6IzxI=; b=ZxPuoO2H/+GQ+Jqf6L9JUseh0E4FrObbxJlrPQlrpgPq0w6I0GuUHFA0mVgEOPZFRA kvtp3ADRg1lXvOW3hYLzWaTz0QAz3RZX/JKGrhBafoiurbB0PgcODr9+dBMjiMmhG3NW n1D7M2LNQtfIg4WdQm2aOXdcLzwVsgue62jOHdYByRVE8SXew1kGwqoiH/8ldLAYhRYI mD6IFTWdkajnpQ0TrKVGQ+03SN1hvEhUmcc735G64tRs14O5gZRcs/MR3u8hxFoEfzSe 1XkKyz8w6BBWVKJY5ynxnlYV5k0b3hALtfMzQUAsj1AVo2APExGd61Bk3W2gC5ZY6pMm gN9g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v26si3606540ejw.276.2019.10.18.09.32.15; Fri, 18 Oct 2019 09:32:15 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2502687AbfJRQcB (ORCPT + 26 others); Fri, 18 Oct 2019 12:32:01 -0400 Received: from mout.kundenserver.de ([217.72.192.74]:49051 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2443067AbfJRQb3 (ORCPT ); Fri, 18 Oct 2019 12:31:29 -0400 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.145]) with ESMTPA (Nemesis) id 1MD9CZ-1iCOUA3OaX-0098KX; Fri, 18 Oct 2019 18:31:11 +0200 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org, Arnd Bergmann , Andrew Lunn , Russell King , Jason Cooper , Sebastian Hesselbarth , Gregory Clement Subject: [PATCH 4/6] ARM: dove: multiplatform support Date: Fri, 18 Oct 2019 18:29:17 +0200 Message-Id: <20191018163047.1284736-4-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20191018163047.1284736-1-arnd@arndb.de> References: <20191018163047.1284736-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:M3I2DW7r5TJ/06Lx5PzMeSxL6W+oXKIaGMwGkheKqNMkt6Fvu9+ +jsJ/Y9OXXK/+aMVcvhgR5qG4mTvR2gi3dp63SrwFlH9KG5wW+jb0RYbDRsHgq4MzHfW7Ls /o0TnPxRohuA/s4lW6+TR3IPiiHKPAF4oIhu10P4P0CSXCWKTmBUO7Myb1HRWUFlWxbrL3d EHKdS5+FTVd1233hLmhEw== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:8HsTmMg+yes=:382w6h36jb3cNFKBxl/7qa gpSUI0FlbKKoZGlVJF5UA0IzpzZETaUYuzyMssa/uR8tU0HcK3e3F5PpEVxt7TP2Y0xSOO9eN 6hIvppxprHjJ1HFUar3vbYBOTXmNu8GrGRzvVJhBAjcJ6Kw1gMecBLkLSchiL24WUFICAO03d K/FOkHTg9qHyPPY0yTtz50zV2kwny9xhVXCXYyseyJpfi+BR7PUvlcod8lhJ3TKNFFQiPrhrS /iLD5jZL3UxcXlD/f+Mr12pLl7hQ6Mw79KESJFd2h7x0tMgVQq8pYh1P6rA2VyOMDLLM2cap/ ErlaVRzHHQ/rfWB4f8iZmxrIhY3+zjlJEyOdw7cUi5d+zIwchvJ+PxI+7X2NYSZu+31UZQ/q2 39Vps7r5TInKj2/F9/SBf7pegYvub03qovawoJKB6yqAVwW4AwgpeysnEQqo6qcYpRo5NPifD hFMFFxodFcAtZ/jHOEBuSuNt3ebQOqxD9BxuoEDxz2tcPDFq3IOxRPuISIkEHabOLjZjiW9cy zhqAQdS9urx21CW+9joKz6LAjdXKa8XcVlCX0a0whHSfP1If+Se6oDjNHg+TZ2bjl6AedS9SL IO1h2vmaJV/z3GGARmEYangkjc2774B1WGCGWofqaoYcKcojxHug+V7WIb3xUzT21a4THx3F+ 8QaapxWTZeNo27pWQTQuQB2oJpzoOHOOtNWr3tmUAkJ9WMbq9yih2vN0NzWisysBsgVM7/TrY PpQbuf/lcs2t6jSGWdxRy9IRYlHkNR6kKHo2dGPzhY2KKp3pWr1HFl7Ea5k1G+GhKZidUVWuk 4yHfks21UVVky4Tj0DYgal7h4cfxD6Scp+NH6c/tC34sIu8g5sa6jgjxw/ssJ9cppuzy60cmy CeTS/ran5OCu1RRYoPDA== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The dove platform is now ready to be enabled for multiplatform support, this patch does the switch over by modifying the Kconfig file, the defconfig and removing the last mach/*.h header that becomes obsolete with this. This work was originally done in 2015 as all the ARMv7 machiens gove moved over to multiplatform builds, but at the time it conflicted with some patches that Russell was trying to upstream, so we left it at that. I hope that there is no longer a need to keep dove separate from the rest, so we can either add it to the other ARMv7 platforms, or just replace it with the DT based platform code for the same hardware in mach-mvebu and remove mach-dove entirely. Acked-by: Andrew Lunn Cc: Russell King Cc: Jason Cooper Cc: Sebastian Hesselbarth Cc: Gregory Clement Signed-off-by: Arnd Bergmann --- arch/arm/Kconfig | 16 --------- arch/arm/configs/dove_defconfig | 2 ++ arch/arm/mach-dove/Kconfig | 16 ++++++--- arch/arm/mach-dove/Makefile | 2 ++ arch/arm/mach-dove/include/mach/uncompress.h | 34 -------------------- 5 files changed, 16 insertions(+), 54 deletions(-) delete mode 100644 arch/arm/mach-dove/include/mach/uncompress.h -- 2.20.0 diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index cca3d240a01e..eb019bc7a370 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -415,22 +415,6 @@ config ARCH_IXP4XX help Support for Intel's IXP4XX (XScale) family of processors. -config ARCH_DOVE - bool "Marvell Dove" - select CPU_PJ4 - select GENERIC_CLOCKEVENTS - select GENERIC_IRQ_MULTI_HANDLER - select GPIOLIB - select HAVE_PCI - select MVEBU_MBUS - select PINCTRL - select PINCTRL_DOVE - select PLAT_ORION_LEGACY - select SPARSE_IRQ - select PM_GENERIC_DOMAINS if PM - help - Support for the Marvell Dove SoC 88AP510 - config ARCH_PXA bool "PXA2xx/PXA3xx-based" depends on MMU diff --git a/arch/arm/configs/dove_defconfig b/arch/arm/configs/dove_defconfig index e70c997d5f4c..1ced32deac75 100644 --- a/arch/arm/configs/dove_defconfig +++ b/arch/arm/configs/dove_defconfig @@ -8,6 +8,8 @@ CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y # CONFIG_BLK_DEV_BSG is not set CONFIG_PARTITION_ADVANCED=y +# CONFIG_ARCH_MULTI_V6 is not set +CONFIG_ARCH_MULTI_V7=y CONFIG_ARCH_DOVE=y CONFIG_MACH_DOVE_DB=y CONFIG_MACH_CM_A510=y diff --git a/arch/arm/mach-dove/Kconfig b/arch/arm/mach-dove/Kconfig index 7747fe64420a..c30c69c664ea 100644 --- a/arch/arm/mach-dove/Kconfig +++ b/arch/arm/mach-dove/Kconfig @@ -1,7 +1,17 @@ # SPDX-License-Identifier: GPL-2.0 -if ARCH_DOVE +menuconfig ARCH_DOVE + bool "Marvell Dove" if ARCH_MULTI_V7 + select CPU_PJ4 + select GPIOLIB + select MVEBU_MBUS + select PINCTRL + select PINCTRL_DOVE + select PLAT_ORION_LEGACY + select PM_GENERIC_DOMAINS if PM + help + Support for the Marvell Dove SoC 88AP510 -menu "Marvell Dove Implementations" +if ARCH_DOVE config DOVE_LEGACY bool @@ -21,6 +31,4 @@ config MACH_CM_A510 Say 'Y' here if you want your kernel to support the CompuLab CM-A510 Board. -endmenu - endif diff --git a/arch/arm/mach-dove/Makefile b/arch/arm/mach-dove/Makefile index cdf163cab738..e83f6492834d 100644 --- a/arch/arm/mach-dove/Makefile +++ b/arch/arm/mach-dove/Makefile @@ -1,4 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 +ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/arch/arm/plat-orion/include + obj-y += common.o obj-$(CONFIG_DOVE_LEGACY) += irq.o mpp.o obj-$(CONFIG_PCI) += pcie.o diff --git a/arch/arm/mach-dove/include/mach/uncompress.h b/arch/arm/mach-dove/include/mach/uncompress.h deleted file mode 100644 index 7a4bd8838036..000000000000 --- a/arch/arm/mach-dove/include/mach/uncompress.h +++ /dev/null @@ -1,34 +0,0 @@ -/* - * This file is licensed under the terms of the GNU General Public - * License version 2. This program is licensed "as is" without any - * warranty of any kind, whether express or implied. - */ - -#define UART0_PHYS_BASE (0xf1000000 + 0x12000) - -#define UART_THR ((volatile unsigned char *)(UART0_PHYS_BASE + 0x0)) -#define UART_LSR ((volatile unsigned char *)(UART0_PHYS_BASE + 0x14)) - -#define LSR_THRE 0x20 - -static void putc(const char c) -{ - int i; - - for (i = 0; i < 0x1000; i++) { - /* Transmit fifo not full? */ - if (*UART_LSR & LSR_THRE) - break; - } - - *UART_THR = c; -} - -static void flush(void) -{ -} - -/* - * nothing to do - */ -#define arch_decomp_setup() From patchwork Fri Oct 18 16:29:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 176900 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp1093711ill; Fri, 18 Oct 2019 09:32:09 -0700 (PDT) X-Google-Smtp-Source: APXvYqyqXjulG9b4uPcG9Czc5dlUo6ccan3qOZUmHmez9j3dwdY57I/dpEn3MydKld+Iq8dcDSIq X-Received: by 2002:aa7:ce08:: with SMTP id d8mr10806467edv.260.1571416329372; Fri, 18 Oct 2019 09:32:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571416329; cv=none; d=google.com; s=arc-20160816; b=PRQfrlD/Mu5nlwMzzfRExbeIyAyKOlQgoxbiIUzPw5bV+lPAOsgNizpQtNZANnqJGt XNr0tgkoQN4f2uQLD18Vg3HI9LWWG3dwSYy12GaciOqi3dIPem64kWJoNWbE+D1BfiKp rVSzWeGLF7lxt9zvKceQvysZZJlPtExecCYRxtciip4fPmMWxRAJb0WT9L0Hdg+boKYE X1+9+oqDvvZuemzdCUCalW01gywv6N4J+91uB+QOYmlx+ub/1r3bHI1BigxTZYE8PCSZ l3ak5sN5Jz5bukQzEv3znXJivHpaJhGO0jpRRJY2HhWiQG6HclPAfa55/lcdXqK8kH9i f6Ag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=0NY/ddfsj6hcv4ELHFcJODRvfvNDJWJW/ka2ofj+/xg=; b=ZABWsCfYEDhn4Pb+XxpiQgj97bgEVn8eiJohBVnAl85ATPFkYTg7zICW5vdQfgzxD7 n7mYj6SAqpL+Uo8oIe+UuN+HI2FQAYwFUSVFfYyk3Q5+wff9ZRuzS6c8TmnKPXHqQ/rm 0Y2JZduE/wLyTdVfDl9nnGSfjy8RPqTe+pOZO0fjE2YXU4FYOsyIvvn7jqruQg/NTpLP 1Ym613qRx9tfWlytFxPafNKjt75Qn2AjuLOSO2cnSyktiCcinC8oFTUc1pzjFaswdC3E +Aq4c580bc7YVoj2mL2xn3B0Sxj1joHRNQELNn2jCmLzJiEqlyO6PzsND2VoOOKURcCD Oq7w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f2si3708617ejw.335.2019.10.18.09.32.08; Fri, 18 Oct 2019 09:32:09 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2406044AbfJRQcE (ORCPT + 26 others); Fri, 18 Oct 2019 12:32:04 -0400 Received: from mout.kundenserver.de ([217.72.192.75]:40571 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2443095AbfJRQb7 (ORCPT ); Fri, 18 Oct 2019 12:31:59 -0400 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.145]) with ESMTPA (Nemesis) id 1M1IRY-1iJqTA31H0-002mPy; Fri, 18 Oct 2019 18:31:30 +0200 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org, Arnd Bergmann , Jason Cooper , Andrew Lunn , Sebastian Hesselbarth , Gregory Clement , Alexander Clouter Subject: [PATCH 5/6] ARM: orion/mv78xx0/dove: move to a common directory Date: Fri, 18 Oct 2019 18:29:18 +0200 Message-Id: <20191018163047.1284736-5-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20191018163047.1284736-1-arnd@arndb.de> References: <20191018163047.1284736-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:sJRxlREPMM5i/b5zrUAPpoaQnnUxFau95Pf5wfEUJFSf78UpfUr M5sSmXMhRgnBvsbgCK/4NRKdfU66jOQk6MogmRWmxd+brH/ojbSi0M5swZwnuT8CJ3JpzPO LzbV9LNCoxJi96OiVCjQbg/ot9rzSFTxEkViYPBDE5oZXu4rqBT6MU7EbsKHzMHFRMlV4/T 8CrZHzXSlfgeCpuhFeFHg== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:9ZAMntKezjM=:1bEu73cf8jpHCjb6LPYBdK YVY2PPROnvxIqGcWxcjc9a8OG9eczbKd6RJ6zoTVuojGymEokbQX1Iw1rlqRPGr7BJdVfnObg KwFWVzHIqnW4WnIS+Kd5kuT3DW5Lb8WQn1spVJIJPpz85iy2MLH+9m0R0eSgXygImbh78uK7P fi0x/d6DH1EJDRGxSovn7EtasNodWdu2ujGtt4YlRUb8TTZ2NDsLzfcZ/QMOw0Z8VCHK7NFsv k99oKXQhhtqQke0nw6/jyEuf2JdmL31a9nQFyP766sHtXJ3QYqq/4fdxs8AL4Fg6/IPZU6an/ kqOzjnSaNZ6F6jq2Obtl5yjFjdHY6lSa85Gqc1mHe38VyAzn7XBGFih0dXdbISBclWryVmIAe ClyO6QgsyXvBnZnnOsxw++YnrkMwMab43tl2q6FZuKBWK+S+8crKgbI8UI7hUptqxUugC8HPy OqshKK3yNQAZ/DI01jD1yJ/qQqNv6JtL+MbvdO/RBigmj3p2C7SUWfLjnxZnkxbYQAidWLFm7 n7M+8KppSYuuwrn0+4hB5m+yu4kmyltd+FiV6sNjt/kaTsG6IWDS4Kv4TDgRLkqPZfoFsPx4V wJx3nmq2G1UwA7rdMQiO2FM/EZHh+KOQWVkS6CIs6lm9G2XtagOrQiEupJoof5zwUKgM1oWZE tnrN4rdclPf/DEcwbY6UvEA18C/7fU8WMzK1/3v9th8iovp37uRzrdBt5fdsOHezB6ZG9eNPf 75Euueq0KdAy5lPCYqZvvCzTlPz0MaXAVgGnG7AfPLMBwerjFZQAJCPLFuyXy4462Pxmwk6md wioKgl1glYGNz2CcLpASg4ILDEJfPLHx7vAdUiOXLmGFxc5cckjz2d7UDfabqMELucnQpCFhU inTbNrTrgEb8mLm+cjHg== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org There are very vew contents left in mv78xx0, dove and the plat-orion directory, but having the files spread over four places increases the complexity and requires having shared header files. Move everything to one directory, adapting the file names where necessary, but not much else. Additional cleanups that are enabled by this can come later. Cc: Jason Cooper Cc: Andrew Lunn Cc: Sebastian Hesselbarth Cc: Gregory Clement Cc: Alexander Clouter Signed-off-by: Arnd Bergmann --- MAINTAINERS | 7 ++----- arch/arm/Kconfig | 17 +---------------- arch/arm/Makefile | 5 +---- arch/arm/mach-dove/Makefile | 8 -------- arch/arm/mach-orion/Kconfig | 14 ++++++++++++++ .../Kconfig => mach-orion/Kconfig.dove} | 0 .../Kconfig => mach-orion/Kconfig.mv78xx0} | 0 .../Kconfig => mach-orion/Kconfig.orion5x} | 0 arch/arm/{plat-orion => mach-orion}/Makefile | 12 ++++++++++++ .../arm/{mach-dove => mach-orion}/Makefile.boot | 0 arch/arm/mach-orion/Makefile.dove | 6 ++++++ .../Makefile => mach-orion/Makefile.mv78xx0} | 4 +--- .../Makefile => mach-orion/Makefile.orion5x} | 4 +--- .../include/plat => mach-orion}/addr-map.h | 2 -- .../{mach-orion5x => mach-orion}/board-d2net.c | 6 ++---- .../arm/{mach-orion5x => mach-orion}/board-dt.c | 10 ++++------ .../{mach-orion5x => mach-orion}/board-mss2.c | 4 ++-- .../board-rd88f5182.c | 4 +--- .../buffalo-wxl-setup.c | 6 ++---- arch/arm/{mach-dove => mach-orion}/cm-a510.c | 4 +--- arch/arm/{plat-orion => mach-orion}/common.c | 4 +--- .../include/plat => mach-orion}/common.h | 2 -- .../db78x00-bp-setup.c | 4 +--- .../db88f5281-setup.c | 6 ++---- .../{mach-orion5x => mach-orion}/dns323-setup.c | 8 +++----- .../dove-bridge-regs.h} | 0 .../common.c => mach-orion/dove-common.c} | 13 +++++-------- .../common.h => mach-orion/dove-common.h} | 2 -- .../{mach-dove => mach-orion}/dove-db-setup.c | 4 +--- .../{mach-dove/irq.c => mach-orion/dove-irq.c} | 12 +++++------- .../irqs.h => mach-orion/dove-irqs.h} | 0 .../{mach-dove/mpp.c => mach-orion/dove-mpp.c} | 8 +++----- .../{mach-dove/mpp.h => mach-orion/dove-mpp.h} | 0 .../pcie.c => mach-orion/dove-pcie.c} | 12 +++++------- .../{mach-dove/pm.h => mach-orion/dove-pm.h} | 2 +- arch/arm/{mach-dove => mach-orion}/dove.h | 2 +- arch/arm/{plat-orion => mach-orion}/gpio.c | 4 +--- arch/arm/{plat-orion => mach-orion}/irq.c | 6 ++---- .../include/plat => mach-orion}/irq.h | 2 -- .../kurobox_pro-setup.c | 6 ++---- .../{mach-orion5x => mach-orion}/ls_hgl-setup.c | 6 ++---- arch/arm/{plat-orion => mach-orion}/mpp.c | 6 ++---- .../include/plat => mach-orion}/mpp.h | 2 -- .../{mach-orion5x => mach-orion}/mv2120-setup.c | 4 ++-- .../mv78xx0-bridge-regs.h} | 0 .../common.c => mach-orion/mv78xx0-common.c} | 12 +++++------- .../common.h => mach-orion/mv78xx0-common.h} | 2 -- .../irq.c => mach-orion/mv78xx0-irq.c} | 10 ++++------ .../irqs.h => mach-orion/mv78xx0-irqs.h} | 0 .../mpp.c => mach-orion/mv78xx0-mpp.c} | 8 +++----- .../mpp.h => mach-orion/mv78xx0-mpp.h} | 3 +-- .../pcie.c => mach-orion/mv78xx0-pcie.c} | 6 ++---- arch/arm/{mach-mv78xx0 => mach-orion}/mv78xx0.h | 2 +- .../net2big-setup.c | 8 +++----- .../include/plat => mach-orion}/orion-gpio.h | 2 -- .../orion5x-bridge-regs.h} | 0 .../common.h => mach-orion/orion5x-common.h} | 0 .../irq.c => mach-orion/orion5x-irq.c} | 10 ++++------ .../irqs.h => mach-orion/orion5x-irqs.h} | 0 .../mpp.c => mach-orion/orion5x-mpp.c} | 8 +++----- .../mpp.h => mach-orion/orion5x-mpp.h} | 0 .../pci.c => mach-orion/orion5x-pci.c} | 8 +++----- .../common.c => mach-orion/orion5x.c} | 10 ++++------ arch/arm/{mach-orion5x => mach-orion}/orion5x.h | 2 +- arch/arm/{plat-orion => mach-orion}/pcie.c | 6 ++---- .../include/plat => mach-orion}/pcie.h | 2 -- .../rd78x00-masa-setup.c | 4 +--- .../rd88f5181l-fxo-setup.c | 6 ++---- .../rd88f5181l-ge-setup.c | 6 ++---- .../rd88f5182-setup.c | 6 ++---- .../rd88f6183ap-ge-setup.c | 4 +--- .../terastation_pro2-setup.c | 4 ++-- arch/arm/{plat-orion => mach-orion}/time.c | 4 +--- .../include/plat => mach-orion}/time.h | 2 -- .../{mach-orion5x => mach-orion}/ts209-setup.c | 4 ++-- .../{mach-orion5x => mach-orion}/ts409-setup.c | 4 ++-- .../{mach-orion5x => mach-orion}/ts78xx-fpga.h | 0 .../{mach-orion5x => mach-orion}/ts78xx-setup.c | 6 ++---- .../{mach-orion5x => mach-orion}/tsx09-common.c | 4 +--- .../{mach-orion5x => mach-orion}/tsx09-common.h | 0 .../wnr854t-setup.c | 6 ++---- .../wrt350n-v2-setup.c | 6 ++---- 82 files changed, 147 insertions(+), 246 deletions(-) delete mode 100644 arch/arm/mach-dove/Makefile create mode 100644 arch/arm/mach-orion/Kconfig rename arch/arm/{mach-dove/Kconfig => mach-orion/Kconfig.dove} (100%) rename arch/arm/{mach-mv78xx0/Kconfig => mach-orion/Kconfig.mv78xx0} (100%) rename arch/arm/{mach-orion5x/Kconfig => mach-orion/Kconfig.orion5x} (100%) rename arch/arm/{plat-orion => mach-orion}/Makefile (62%) rename arch/arm/{mach-dove => mach-orion}/Makefile.boot (100%) create mode 100644 arch/arm/mach-orion/Makefile.dove rename arch/arm/{mach-mv78xx0/Makefile => mach-orion/Makefile.mv78xx0} (62%) rename arch/arm/{mach-orion5x/Makefile => mach-orion/Makefile.orion5x} (90%) rename arch/arm/{plat-orion/include/plat => mach-orion}/addr-map.h (96%) rename arch/arm/{mach-orion5x => mach-orion}/board-d2net.c (97%) rename arch/arm/{mach-orion5x => mach-orion}/board-dt.c (94%) rename arch/arm/{mach-orion5x => mach-orion}/board-mss2.c (97%) rename arch/arm/{mach-orion5x => mach-orion}/board-rd88f5182.c (97%) rename arch/arm/{mach-mv78xx0 => mach-orion}/buffalo-wxl-setup.c (97%) rename arch/arm/{mach-dove => mach-orion}/cm-a510.c (97%) rename arch/arm/{plat-orion => mach-orion}/common.c (99%) rename arch/arm/{plat-orion/include/plat => mach-orion}/common.h (98%) rename arch/arm/{mach-mv78xx0 => mach-orion}/db78x00-bp-setup.c (97%) rename arch/arm/{mach-orion5x => mach-orion}/db88f5281-setup.c (99%) rename arch/arm/{mach-orion5x => mach-orion}/dns323-setup.c (99%) rename arch/arm/{mach-dove/bridge-regs.h => mach-orion/dove-bridge-regs.h} (100%) rename arch/arm/{mach-dove/common.c => mach-orion/dove-common.c} (98%) rename arch/arm/{mach-dove/common.h => mach-orion/dove-common.h} (97%) rename arch/arm/{mach-dove => mach-orion}/dove-db-setup.c (97%) rename arch/arm/{mach-dove/irq.c => mach-orion/dove-irq.c} (92%) rename arch/arm/{mach-dove/irqs.h => mach-orion/dove-irqs.h} (100%) rename arch/arm/{mach-dove/mpp.c => mach-orion/dove-mpp.c} (97%) rename arch/arm/{mach-dove/mpp.h => mach-orion/dove-mpp.h} (100%) rename arch/arm/{mach-dove/pcie.c => mach-orion/dove-pcie.c} (97%) rename arch/arm/{mach-dove/pm.h => mach-orion/dove-pm.h} (99%) rename arch/arm/{mach-dove => mach-orion}/dove.h (99%) rename arch/arm/{plat-orion => mach-orion}/gpio.c (99%) rename arch/arm/{plat-orion => mach-orion}/irq.c (92%) rename arch/arm/{plat-orion/include/plat => mach-orion}/irq.h (88%) rename arch/arm/{mach-orion5x => mach-orion}/kurobox_pro-setup.c (99%) rename arch/arm/{mach-orion5x => mach-orion}/ls_hgl-setup.c (98%) rename arch/arm/{plat-orion => mach-orion}/mpp.c (95%) rename arch/arm/{plat-orion/include/plat => mach-orion}/mpp.h (95%) rename arch/arm/{mach-orion5x => mach-orion}/mv2120-setup.c (99%) rename arch/arm/{mach-mv78xx0/bridge-regs.h => mach-orion/mv78xx0-bridge-regs.h} (100%) rename arch/arm/{mach-mv78xx0/common.c => mach-orion/mv78xx0-common.c} (98%) rename arch/arm/{mach-mv78xx0/common.h => mach-orion/mv78xx0-common.h} (97%) rename arch/arm/{mach-mv78xx0/irq.c => mach-orion/mv78xx0-irq.c} (93%) rename arch/arm/{mach-mv78xx0/irqs.h => mach-orion/mv78xx0-irqs.h} (100%) rename arch/arm/{mach-mv78xx0/mpp.c => mach-orion/mv78xx0-mpp.c} (91%) rename arch/arm/{mach-mv78xx0/mpp.h => mach-orion/mv78xx0-mpp.h} (99%) rename arch/arm/{mach-mv78xx0/pcie.c => mach-orion/mv78xx0-pcie.c} (98%) rename arch/arm/{mach-mv78xx0 => mach-orion}/mv78xx0.h (99%) rename arch/arm/{mach-orion5x => mach-orion}/net2big-setup.c (99%) rename arch/arm/{plat-orion/include/plat => mach-orion}/orion-gpio.h (94%) rename arch/arm/{mach-orion5x/bridge-regs.h => mach-orion/orion5x-bridge-regs.h} (100%) rename arch/arm/{mach-orion5x/common.h => mach-orion/orion5x-common.h} (100%) rename arch/arm/{mach-orion5x/irq.c => mach-orion/orion5x-irq.c} (89%) rename arch/arm/{mach-orion5x/irqs.h => mach-orion/orion5x-irqs.h} (100%) rename arch/arm/{mach-orion5x/mpp.c => mach-orion/orion5x-mpp.c} (92%) rename arch/arm/{mach-orion5x/mpp.h => mach-orion/orion5x-mpp.h} (100%) rename arch/arm/{mach-orion5x/pci.c => mach-orion/orion5x-pci.c} (99%) rename arch/arm/{mach-orion5x/common.c => mach-orion/orion5x.c} (99%) rename arch/arm/{mach-orion5x => mach-orion}/orion5x.h (99%) rename arch/arm/{plat-orion => mach-orion}/pcie.c (98%) rename arch/arm/{plat-orion/include/plat => mach-orion}/pcie.h (96%) rename arch/arm/{mach-mv78xx0 => mach-orion}/rd78x00-masa-setup.c (96%) rename arch/arm/{mach-orion5x => mach-orion}/rd88f5181l-fxo-setup.c (98%) rename arch/arm/{mach-orion5x => mach-orion}/rd88f5181l-ge-setup.c (98%) rename arch/arm/{mach-orion5x => mach-orion}/rd88f5182-setup.c (98%) rename arch/arm/{mach-orion5x => mach-orion}/rd88f6183ap-ge-setup.c (97%) rename arch/arm/{mach-orion5x => mach-orion}/terastation_pro2-setup.c (99%) rename arch/arm/{plat-orion => mach-orion}/time.c (99%) rename arch/arm/{plat-orion/include/plat => mach-orion}/time.h (90%) rename arch/arm/{mach-orion5x => mach-orion}/ts209-setup.c (99%) rename arch/arm/{mach-orion5x => mach-orion}/ts409-setup.c (99%) rename arch/arm/{mach-orion5x => mach-orion}/ts78xx-fpga.h (100%) rename arch/arm/{mach-orion5x => mach-orion}/ts78xx-setup.c (99%) rename arch/arm/{mach-orion5x => mach-orion}/tsx09-common.c (97%) rename arch/arm/{mach-orion5x => mach-orion}/tsx09-common.h (100%) rename arch/arm/{mach-orion5x => mach-orion}/wnr854t-setup.c (98%) rename arch/arm/{mach-orion5x => mach-orion}/wrt350n-v2-setup.c (98%) -- 2.20.0 diff --git a/MAINTAINERS b/MAINTAINERS index a69e6db80c79..28aa06350435 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1889,10 +1889,7 @@ M: Gregory Clement L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained F: Documentation/devicetree/bindings/soc/dove/ -F: arch/arm/mach-dove/ -F: arch/arm/mach-mv78xx0/ -F: arch/arm/mach-orion5x/ -F: arch/arm/plat-orion/ +F: arch/arm/mach-orion/ F: arch/arm/boot/dts/dove* F: arch/arm/boot/dts/orion5x* T: git git://git.infradead.org/linux-mvebu.git @@ -2050,7 +2047,7 @@ M: Alexander Clouter L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) W: http://www.digriz.org.uk/ts78xx/kernel S: Maintained -F: arch/arm/mach-orion5x/ts78xx-* +F: arch/arm/mach-orion/ts78xx-* ARM/OXNAS platform support M: Neil Armstrong diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index eb019bc7a370..f9db9f390c1b 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -616,8 +616,6 @@ source "arch/arm/mach-davinci/Kconfig" source "arch/arm/mach-digicolor/Kconfig" -source "arch/arm/mach-dove/Kconfig" - source "arch/arm/mach-ep93xx/Kconfig" source "arch/arm/mach-exynos/Kconfig" @@ -651,8 +649,6 @@ source "arch/arm/mach-mmp/Kconfig" source "arch/arm/mach-moxart/Kconfig" -source "arch/arm/mach-mv78xx0/Kconfig" - source "arch/arm/mach-mvebu/Kconfig" source "arch/arm/mach-mxs/Kconfig" @@ -669,7 +665,7 @@ source "arch/arm/mach-omap1/Kconfig" source "arch/arm/mach-omap2/Kconfig" -source "arch/arm/mach-orion5x/Kconfig" +source "arch/arm/mach-orion/Kconfig" source "arch/arm/mach-oxnas/Kconfig" @@ -764,17 +760,6 @@ config PLAT_IOP bool select GENERIC_CLOCKEVENTS -config PLAT_ORION - bool - select CLKSRC_MMIO - select COMMON_CLK - select GENERIC_IRQ_CHIP - select IRQ_DOMAIN - -config PLAT_ORION_LEGACY - bool - select PLAT_ORION - config PLAT_VERSATILE bool diff --git a/arch/arm/Makefile b/arch/arm/Makefile index db39707fa600..f74668401ef6 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -171,7 +171,6 @@ machine-$(CONFIG_ARCH_CLPS711X) += clps711x machine-$(CONFIG_ARCH_CNS3XXX) += cns3xxx machine-$(CONFIG_ARCH_DAVINCI) += davinci machine-$(CONFIG_ARCH_DIGICOLOR) += digicolor -machine-$(CONFIG_ARCH_DOVE) += dove machine-$(CONFIG_ARCH_EBSA110) += ebsa110 machine-$(CONFIG_ARCH_EFM32) += efm32 machine-$(CONFIG_ARCH_EP93XX) += ep93xx @@ -188,7 +187,6 @@ machine-$(CONFIG_ARCH_LPC32XX) += lpc32xx machine-$(CONFIG_ARCH_MESON) += meson machine-$(CONFIG_ARCH_MMP) += mmp machine-$(CONFIG_ARCH_MOXART) += moxart -machine-$(CONFIG_ARCH_MV78XX0) += mv78xx0 machine-$(CONFIG_ARCH_MVEBU) += mvebu machine-$(CONFIG_ARCH_MXC) += imx machine-$(CONFIG_ARCH_MEDIATEK) += mediatek @@ -200,7 +198,7 @@ machine-$(CONFIG_ARCH_NSPIRE) += nspire machine-$(CONFIG_ARCH_OXNAS) += oxnas machine-$(CONFIG_ARCH_OMAP1) += omap1 machine-$(CONFIG_ARCH_OMAP2PLUS) += omap2 -machine-$(CONFIG_ARCH_ORION5X) += orion5x +machine-$(CONFIG_PLAT_ORION) += orion machine-$(CONFIG_ARCH_PICOXCELL) += picoxcell machine-$(CONFIG_ARCH_PXA) += pxa machine-$(CONFIG_ARCH_QCOM) += qcom @@ -233,7 +231,6 @@ plat-$(CONFIG_ARCH_EXYNOS) += samsung plat-$(CONFIG_ARCH_OMAP) += omap plat-$(CONFIG_ARCH_S3C64XX) += samsung plat-$(CONFIG_ARCH_S5PV210) += samsung -plat-$(CONFIG_PLAT_ORION) += orion plat-$(CONFIG_PLAT_S3C24XX) += samsung ifeq ($(CONFIG_ARCH_EBSA110),y) diff --git a/arch/arm/mach-dove/Makefile b/arch/arm/mach-dove/Makefile deleted file mode 100644 index e83f6492834d..000000000000 --- a/arch/arm/mach-dove/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/arch/arm/plat-orion/include - -obj-y += common.o -obj-$(CONFIG_DOVE_LEGACY) += irq.o mpp.o -obj-$(CONFIG_PCI) += pcie.o -obj-$(CONFIG_MACH_DOVE_DB) += dove-db-setup.o -obj-$(CONFIG_MACH_CM_A510) += cm-a510.o diff --git a/arch/arm/mach-orion/Kconfig b/arch/arm/mach-orion/Kconfig new file mode 100644 index 000000000000..bad1fe673674 --- /dev/null +++ b/arch/arm/mach-orion/Kconfig @@ -0,0 +1,14 @@ +config PLAT_ORION + bool + select CLKSRC_MMIO + select COMMON_CLK + select GENERIC_IRQ_CHIP + select IRQ_DOMAIN + +config PLAT_ORION_LEGACY + bool + select PLAT_ORION + +source "arch/arm/mach-orion/Kconfig.dove" +source "arch/arm/mach-orion/Kconfig.mv78xx0" +source "arch/arm/mach-orion/Kconfig.orion5x" diff --git a/arch/arm/mach-dove/Kconfig b/arch/arm/mach-orion/Kconfig.dove similarity index 100% rename from arch/arm/mach-dove/Kconfig rename to arch/arm/mach-orion/Kconfig.dove diff --git a/arch/arm/mach-mv78xx0/Kconfig b/arch/arm/mach-orion/Kconfig.mv78xx0 similarity index 100% rename from arch/arm/mach-mv78xx0/Kconfig rename to arch/arm/mach-orion/Kconfig.mv78xx0 diff --git a/arch/arm/mach-orion5x/Kconfig b/arch/arm/mach-orion/Kconfig.orion5x similarity index 100% rename from arch/arm/mach-orion5x/Kconfig rename to arch/arm/mach-orion/Kconfig.orion5x diff --git a/arch/arm/plat-orion/Makefile b/arch/arm/mach-orion/Makefile similarity index 62% rename from arch/arm/plat-orion/Makefile rename to arch/arm/mach-orion/Makefile index 4e3f25de13c1..ded450d9bda3 100644 --- a/arch/arm/plat-orion/Makefile +++ b/arch/arm/mach-orion/Makefile @@ -7,3 +7,15 @@ ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include orion-gpio-$(CONFIG_GPIOLIB) += gpio.o obj-$(CONFIG_PLAT_ORION_LEGACY) += irq.o pcie.o time.o common.o mpp.o obj-$(CONFIG_PLAT_ORION_LEGACY) += $(orion-gpio-y) + +ifdef CONFIG_ARCH_DOVE +include $(src)/Makefile.dove +endif + +ifdef CONFIG_ARCH_MV78XX0 +include $(src)/Makefile.mv78xx0 +endif + +ifdef CONFIG_ARCH_ORION5X +include $(src)/Makefile.orion5x +endif diff --git a/arch/arm/mach-dove/Makefile.boot b/arch/arm/mach-orion/Makefile.boot similarity index 100% rename from arch/arm/mach-dove/Makefile.boot rename to arch/arm/mach-orion/Makefile.boot diff --git a/arch/arm/mach-orion/Makefile.dove b/arch/arm/mach-orion/Makefile.dove new file mode 100644 index 000000000000..1e85d595836a --- /dev/null +++ b/arch/arm/mach-orion/Makefile.dove @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0 +obj-y += dove-common.o +obj-$(CONFIG_DOVE_LEGACY) += dove-irq.o dove-mpp.o +obj-$(CONFIG_PCI) += dove-pcie.o +obj-$(CONFIG_MACH_DOVE_DB) += dove-db-setup.o +obj-$(CONFIG_MACH_CM_A510) += cm-a510.o diff --git a/arch/arm/mach-mv78xx0/Makefile b/arch/arm/mach-orion/Makefile.mv78xx0 similarity index 62% rename from arch/arm/mach-mv78xx0/Makefile rename to arch/arm/mach-orion/Makefile.mv78xx0 index a839e960b8c6..c56ee058808a 100644 --- a/arch/arm/mach-mv78xx0/Makefile +++ b/arch/arm/mach-orion/Makefile.mv78xx0 @@ -1,7 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 -ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/arch/arm/plat-orion/include - -obj-y += common.o mpp.o irq.o pcie.o +obj-y += mv78xx0-common.o mv78xx0-mpp.o mv78xx0-irq.o mv78xx0-pcie.o obj-$(CONFIG_MACH_DB78X00_BP) += db78x00-bp-setup.o obj-$(CONFIG_MACH_RD78X00_MASA) += rd78x00-masa-setup.o obj-$(CONFIG_MACH_TERASTATION_WXL) += buffalo-wxl-setup.o diff --git a/arch/arm/mach-orion5x/Makefile b/arch/arm/mach-orion/Makefile.orion5x similarity index 90% rename from arch/arm/mach-orion5x/Makefile rename to arch/arm/mach-orion/Makefile.orion5x index 1a585a62d5e6..a36c5e504698 100644 --- a/arch/arm/mach-orion5x/Makefile +++ b/arch/arm/mach-orion/Makefile.orion5x @@ -1,7 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 -ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/arch/arm/plat-orion/include - -obj-y += common.o pci.o irq.o mpp.o +obj-y += orion5x.o orion5x-pci.o orion5x-irq.o orion5x-mpp.o obj-$(CONFIG_MACH_DB88F5281) += db88f5281-setup.o obj-$(CONFIG_MACH_RD88F5182) += rd88f5182-setup.o obj-$(CONFIG_MACH_KUROBOX_PRO) += kurobox_pro-setup.o diff --git a/arch/arm/plat-orion/include/plat/addr-map.h b/arch/arm/mach-orion/addr-map.h similarity index 96% rename from arch/arm/plat-orion/include/plat/addr-map.h rename to arch/arm/mach-orion/addr-map.h index b76c06569fe5..65fedcc1cf6f 100644 --- a/arch/arm/plat-orion/include/plat/addr-map.h +++ b/arch/arm/mach-orion/addr-map.h @@ -1,6 +1,4 @@ /* - * arch/arm/plat-orion/include/plat/addr-map.h - * * Marvell Orion SoC address map handling. * * This file is licensed under the terms of the GNU General Public diff --git a/arch/arm/mach-orion5x/board-d2net.c b/arch/arm/mach-orion/board-d2net.c similarity index 97% rename from arch/arm/mach-orion5x/board-d2net.c rename to arch/arm/mach-orion/board-d2net.c index a89376a5cd92..7dcd274bd6e1 100644 --- a/arch/arm/mach-orion5x/board-d2net.c +++ b/arch/arm/mach-orion/board-d2net.c @@ -1,6 +1,4 @@ /* - * arch/arm/mach-orion5x/board-d2net.c - * * LaCie d2Network and Big Disk Network NAS setup * * Copyright (C) 2009 Simon Guinot @@ -20,8 +18,8 @@ #include #include #include -#include -#include "common.h" +#include "orion-gpio.h" +#include "orion5x-common.h" #include "orion5x.h" /***************************************************************************** diff --git a/arch/arm/mach-orion5x/board-dt.c b/arch/arm/mach-orion/board-dt.c similarity index 94% rename from arch/arm/mach-orion5x/board-dt.c rename to arch/arm/mach-orion/board-dt.c index 3d36f1d95196..85368319342f 100644 --- a/arch/arm/mach-orion5x/board-dt.c +++ b/arch/arm/mach-orion/board-dt.c @@ -1,8 +1,6 @@ /* * Copyright 2012 (C), Thomas Petazzoni * - * arch/arm/mach-orion5x/board-dt.c - * * Flattened Device Tree board initialization * * This file is licensed under the terms of the GNU General Public @@ -20,11 +18,11 @@ #include #include #include -#include -#include +#include "irq.h" +#include "time.h" #include "orion5x.h" -#include "bridge-regs.h" -#include "common.h" +#include "orion5x-bridge-regs.h" +#include "orion5x-common.h" static struct of_dev_auxdata orion5x_auxdata_lookup[] __initdata = { OF_DEV_AUXDATA("marvell,orion-spi", 0xf1010600, "orion_spi.0", NULL), diff --git a/arch/arm/mach-orion5x/board-mss2.c b/arch/arm/mach-orion/board-mss2.c similarity index 97% rename from arch/arm/mach-orion5x/board-mss2.c rename to arch/arm/mach-orion/board-mss2.c index b0f16d223adf..6ab26b2dac84 100644 --- a/arch/arm/mach-orion5x/board-mss2.c +++ b/arch/arm/mach-orion/board-mss2.c @@ -14,8 +14,8 @@ #include #include #include "orion5x.h" -#include "bridge-regs.h" -#include "common.h" +#include "orion5x-bridge-regs.h" +#include "orion5x-common.h" /***************************************************************************** * Maxtor Shared Storage II Info diff --git a/arch/arm/mach-orion5x/board-rd88f5182.c b/arch/arm/mach-orion/board-rd88f5182.c similarity index 97% rename from arch/arm/mach-orion5x/board-rd88f5182.c rename to arch/arm/mach-orion/board-rd88f5182.c index b7b0f52f4c0a..b763229dfcdf 100644 --- a/arch/arm/mach-orion5x/board-rd88f5182.c +++ b/arch/arm/mach-orion/board-rd88f5182.c @@ -1,6 +1,4 @@ /* - * arch/arm/mach-orion5x/rd88f5182-setup.c - * * Marvell Orion-NAS Reference Design Setup * * Maintainer: Ronen Shitrit @@ -18,7 +16,7 @@ #include #include #include -#include "common.h" +#include "orion5x-common.h" #include "orion5x.h" /***************************************************************************** diff --git a/arch/arm/mach-mv78xx0/buffalo-wxl-setup.c b/arch/arm/mach-orion/buffalo-wxl-setup.c similarity index 97% rename from arch/arm/mach-mv78xx0/buffalo-wxl-setup.c rename to arch/arm/mach-orion/buffalo-wxl-setup.c index e112f2e7cc9a..72605a54becf 100644 --- a/arch/arm/mach-mv78xx0/buffalo-wxl-setup.c +++ b/arch/arm/mach-orion/buffalo-wxl-setup.c @@ -1,6 +1,4 @@ /* - * arch/arm/mach-mv78xx0/buffalo-wxl-setup.c - * * Buffalo WXL (Terastation Duo) Setup routines * * sebastien requiem @@ -20,8 +18,8 @@ #include #include #include "mv78xx0.h" -#include "common.h" -#include "mpp.h" +#include "mv78xx0-common.h" +#include "mv78xx0-mpp.h" /* This arch has 2 Giga Ethernet */ diff --git a/arch/arm/mach-dove/cm-a510.c b/arch/arm/mach-orion/cm-a510.c similarity index 97% rename from arch/arm/mach-dove/cm-a510.c rename to arch/arm/mach-orion/cm-a510.c index 9f25c993d863..3f1c03b3e0d4 100644 --- a/arch/arm/mach-dove/cm-a510.c +++ b/arch/arm/mach-orion/cm-a510.c @@ -1,6 +1,4 @@ /* - * arch/arm/mach-dove/cm-a510.c - * * Copyright (C) 2010 CompuLab, Ltd. * Konstantin Sinyuk * @@ -23,7 +21,7 @@ #include #include "dove.h" -#include "common.h" +#include "dove-common.h" static struct mv643xx_eth_platform_data cm_a510_ge00_data = { .phy_addr = MV643XX_ETH_PHY_ADDR_DEFAULT, diff --git a/arch/arm/plat-orion/common.c b/arch/arm/mach-orion/common.c similarity index 99% rename from arch/arm/plat-orion/common.c rename to arch/arm/mach-orion/common.c index 8647cb80a93b..7f5a649d2ba3 100644 --- a/arch/arm/plat-orion/common.c +++ b/arch/arm/mach-orion/common.c @@ -1,6 +1,4 @@ /* - * arch/arm/plat-orion/common.c - * * Marvell Orion SoC common setup code used by multiple mach-/common.c * * This file is licensed under the terms of the GNU General Public @@ -21,7 +19,7 @@ #include #include #include -#include +#include "common.h" #include /* Create a clkdev entry for a given device/clk */ diff --git a/arch/arm/plat-orion/include/plat/common.h b/arch/arm/mach-orion/common.h similarity index 98% rename from arch/arm/plat-orion/include/plat/common.h rename to arch/arm/mach-orion/common.h index 3647d3b33c20..66e5d3503a1d 100644 --- a/arch/arm/plat-orion/include/plat/common.h +++ b/arch/arm/mach-orion/common.h @@ -1,6 +1,4 @@ /* - * arch/arm/plat-orion/include/plat/common.h - * * Marvell Orion SoC common setup code used by different mach-/common.c * * This file is licensed under the terms of the GNU General Public diff --git a/arch/arm/mach-mv78xx0/db78x00-bp-setup.c b/arch/arm/mach-orion/db78x00-bp-setup.c similarity index 97% rename from arch/arm/mach-mv78xx0/db78x00-bp-setup.c rename to arch/arm/mach-orion/db78x00-bp-setup.c index cf16e08d4cf5..b1c4870ab9ad 100644 --- a/arch/arm/mach-mv78xx0/db78x00-bp-setup.c +++ b/arch/arm/mach-orion/db78x00-bp-setup.c @@ -1,6 +1,4 @@ /* - * arch/arm/mach-mv78xx0/db78x00-bp-setup.c - * * Marvell DB-78x00-BP Development Board Setup * * This file is licensed under the terms of the GNU General Public @@ -18,7 +16,7 @@ #include #include #include "mv78xx0.h" -#include "common.h" +#include "mv78xx0-common.h" static struct mv643xx_eth_platform_data db78x00_ge00_data = { .phy_addr = MV643XX_ETH_PHY_ADDR(8), diff --git a/arch/arm/mach-orion5x/db88f5281-setup.c b/arch/arm/mach-orion/db88f5281-setup.c similarity index 99% rename from arch/arm/mach-orion5x/db88f5281-setup.c rename to arch/arm/mach-orion/db88f5281-setup.c index 39eae10ac8de..af97784a27f5 100644 --- a/arch/arm/mach-orion5x/db88f5281-setup.c +++ b/arch/arm/mach-orion/db88f5281-setup.c @@ -1,6 +1,4 @@ /* - * arch/arm/mach-orion5x/db88f5281-setup.c - * * Marvell Orion-2 Development Board Setup * * Maintainer: Tzachi Perelstein @@ -24,8 +22,8 @@ #include #include #include -#include "common.h" -#include "mpp.h" +#include "orion5x-common.h" +#include "orion5x-mpp.h" #include "orion5x.h" /***************************************************************************** diff --git a/arch/arm/mach-orion5x/dns323-setup.c b/arch/arm/mach-orion/dns323-setup.c similarity index 99% rename from arch/arm/mach-orion5x/dns323-setup.c rename to arch/arm/mach-orion/dns323-setup.c index d13344b2ddcd..9c827f76ae75 100644 --- a/arch/arm/mach-orion5x/dns323-setup.c +++ b/arch/arm/mach-orion/dns323-setup.c @@ -1,6 +1,4 @@ /* - * arch/arm/mach-orion5x/dns323-setup.c - * * Copyright (C) 2007 Herbert Valerio Riedel * * Support for HW Rev C1: @@ -33,10 +31,10 @@ #include #include #include -#include +#include "orion-gpio.h" #include "orion5x.h" -#include "common.h" -#include "mpp.h" +#include "orion5x-common.h" +#include "orion5x-mpp.h" /* Rev A1 and B1 */ #define DNS323_GPIO_LED_RIGHT_AMBER 1 diff --git a/arch/arm/mach-dove/bridge-regs.h b/arch/arm/mach-orion/dove-bridge-regs.h similarity index 100% rename from arch/arm/mach-dove/bridge-regs.h rename to arch/arm/mach-orion/dove-bridge-regs.h diff --git a/arch/arm/mach-dove/common.c b/arch/arm/mach-orion/dove-common.c similarity index 98% rename from arch/arm/mach-dove/common.c rename to arch/arm/mach-orion/dove-common.c index 01b830afcea9..6946741c6c08 100644 --- a/arch/arm/mach-dove/common.c +++ b/arch/arm/mach-orion/dove-common.c @@ -1,7 +1,4 @@ /* - * arch/arm/mach-dove/common.c - * - * Core functions for Marvell Dove 88AP510 System On Chip * * This file is licensed under the terms of the GNU General Public * License version 2. This program is licensed "as is" without any @@ -22,12 +19,12 @@ #include #include #include -#include -#include -#include -#include "bridge-regs.h" -#include "pm.h" #include "common.h" +#include "irq.h" +#include "time.h" +#include "dove-bridge-regs.h" +#include "dove-pm.h" +#include "dove-common.h" /* These can go away once Dove uses the mvebu-mbus DT binding */ #define DOVE_MBUS_PCIE0_MEM_TARGET 0x4 diff --git a/arch/arm/mach-dove/common.h b/arch/arm/mach-orion/dove-common.h similarity index 97% rename from arch/arm/mach-dove/common.h rename to arch/arm/mach-orion/dove-common.h index 1d725224d146..e79aac850f2a 100644 --- a/arch/arm/mach-dove/common.h +++ b/arch/arm/mach-orion/dove-common.h @@ -1,6 +1,4 @@ /* - * arch/arm/mach-dove/common.h - * * Core functions for Marvell Dove 88AP510 System On Chip * * This file is licensed under the terms of the GNU General Public diff --git a/arch/arm/mach-dove/dove-db-setup.c b/arch/arm/mach-orion/dove-db-setup.c similarity index 97% rename from arch/arm/mach-dove/dove-db-setup.c rename to arch/arm/mach-orion/dove-db-setup.c index 418ab21b9d9b..e5c56c03c5f9 100644 --- a/arch/arm/mach-dove/dove-db-setup.c +++ b/arch/arm/mach-orion/dove-db-setup.c @@ -1,6 +1,4 @@ /* - * arch/arm/mach-dove/dove-db-setup.c - * * Marvell DB-MV88AP510-BP Development Board Setup * * This file is licensed under the terms of the GNU General Public @@ -25,7 +23,7 @@ #include #include #include "dove.h" -#include "common.h" +#include "dove-common.h" static struct mv643xx_eth_platform_data dove_db_ge00_data = { .phy_addr = MV643XX_ETH_PHY_ADDR_DEFAULT, diff --git a/arch/arm/mach-dove/irq.c b/arch/arm/mach-orion/dove-irq.c similarity index 92% rename from arch/arm/mach-dove/irq.c rename to arch/arm/mach-orion/dove-irq.c index 31ccbcee2627..052a88444fdb 100644 --- a/arch/arm/mach-dove/irq.c +++ b/arch/arm/mach-orion/dove-irq.c @@ -1,6 +1,4 @@ /* - * arch/arm/mach-dove/irq.c - * * Dove IRQ handling. * * This file is licensed under the terms of the GNU General Public @@ -12,12 +10,12 @@ #include #include -#include -#include +#include "irq.h" +#include "orion-gpio.h" -#include "pm.h" -#include "bridge-regs.h" -#include "common.h" +#include "dove-pm.h" +#include "dove-bridge-regs.h" +#include "dove-common.h" static int __initdata gpio0_irqs[4] = { IRQ_DOVE_GPIO_0_7, diff --git a/arch/arm/mach-dove/irqs.h b/arch/arm/mach-orion/dove-irqs.h similarity index 100% rename from arch/arm/mach-dove/irqs.h rename to arch/arm/mach-orion/dove-irqs.h diff --git a/arch/arm/mach-dove/mpp.c b/arch/arm/mach-orion/dove-mpp.c similarity index 97% rename from arch/arm/mach-dove/mpp.c rename to arch/arm/mach-orion/dove-mpp.c index 6acd8488bb05..4b4f04e321c7 100644 --- a/arch/arm/mach-dove/mpp.c +++ b/arch/arm/mach-orion/dove-mpp.c @@ -1,6 +1,4 @@ /* - * arch/arm/mach-dove/mpp.c - * * MPP functions for Marvell Dove SoCs * * This file is licensed under the terms of the GNU General Public @@ -11,10 +9,10 @@ #include #include #include -#include -#include -#include "dove.h" #include "mpp.h" +#include "orion-gpio.h" +#include "dove.h" +#include "dove-mpp.h" struct dove_mpp_grp { int start; diff --git a/arch/arm/mach-dove/mpp.h b/arch/arm/mach-orion/dove-mpp.h similarity index 100% rename from arch/arm/mach-dove/mpp.h rename to arch/arm/mach-orion/dove-mpp.h diff --git a/arch/arm/mach-dove/pcie.c b/arch/arm/mach-orion/dove-pcie.c similarity index 97% rename from arch/arm/mach-dove/pcie.c rename to arch/arm/mach-orion/dove-pcie.c index ee91ac6b5ebf..d3dbe0af6924 100644 --- a/arch/arm/mach-dove/pcie.c +++ b/arch/arm/mach-orion/dove-pcie.c @@ -1,6 +1,4 @@ /* - * arch/arm/mach-dove/pcie.c - * * PCIe functions for Marvell Dove 88AP510 SoC * * This file is licensed under the terms of the GNU General Public @@ -16,11 +14,11 @@ #include #include #include -#include -#include -#include "irqs.h" -#include "bridge-regs.h" -#include "common.h" +#include "pcie.h" +#include "addr-map.h" +#include "dove-irqs.h" +#include "dove-bridge-regs.h" +#include "dove-common.h" struct pcie_port { u8 index; diff --git a/arch/arm/mach-dove/pm.h b/arch/arm/mach-orion/dove-pm.h similarity index 99% rename from arch/arm/mach-dove/pm.h rename to arch/arm/mach-orion/dove-pm.h index 01267746d707..ce3521e1ef32 100644 --- a/arch/arm/mach-dove/pm.h +++ b/arch/arm/mach-orion/dove-pm.h @@ -8,7 +8,7 @@ #define __ASM_ARCH_PM_H #include -#include "irqs.h" +#include "dove-irqs.h" #define CLOCK_GATING_CONTROL (DOVE_PMU_VIRT_BASE + 0x38) #define CLOCK_GATING_BIT_USB0 0 diff --git a/arch/arm/mach-dove/dove.h b/arch/arm/mach-orion/dove.h similarity index 99% rename from arch/arm/mach-dove/dove.h rename to arch/arm/mach-orion/dove.h index 320ed1696abd..9c62704a5edd 100644 --- a/arch/arm/mach-dove/dove.h +++ b/arch/arm/mach-orion/dove.h @@ -9,7 +9,7 @@ #ifndef __ASM_ARCH_DOVE_H #define __ASM_ARCH_DOVE_H -#include "irqs.h" +#include "dove-irqs.h" /* * Marvell Dove address maps. diff --git a/arch/arm/plat-orion/gpio.c b/arch/arm/mach-orion/gpio.c similarity index 99% rename from arch/arm/plat-orion/gpio.c rename to arch/arm/mach-orion/gpio.c index 26a531ebb6e9..8dc74e059fa2 100644 --- a/arch/arm/plat-orion/gpio.c +++ b/arch/arm/mach-orion/gpio.c @@ -1,6 +1,4 @@ /* - * arch/arm/plat-orion/gpio.c - * * Marvell Orion SoC GPIO handling. * * This file is licensed under the terms of the GNU General Public @@ -23,7 +21,7 @@ #include #include #include -#include +#include "orion-gpio.h" /* * GPIO unit register offsets. diff --git a/arch/arm/plat-orion/irq.c b/arch/arm/mach-orion/irq.c similarity index 92% rename from arch/arm/plat-orion/irq.c rename to arch/arm/mach-orion/irq.c index 5b63b28b00ac..7015d34b6f5b 100644 --- a/arch/arm/plat-orion/irq.c +++ b/arch/arm/mach-orion/irq.c @@ -1,6 +1,4 @@ /* - * arch/arm/plat-orion/irq.c - * * Marvell Orion SoC IRQ handling. * * This file is licensed under the terms of the GNU General Public @@ -16,8 +14,8 @@ #include #include #include -#include -#include +#include "irq.h" +#include "orion-gpio.h" void __init orion_irq_init(unsigned int irq_start, void __iomem *maskaddr) { diff --git a/arch/arm/plat-orion/include/plat/irq.h b/arch/arm/mach-orion/irq.h similarity index 88% rename from arch/arm/plat-orion/include/plat/irq.h rename to arch/arm/mach-orion/irq.h index 96be19e9bd93..892b95cfef47 100644 --- a/arch/arm/plat-orion/include/plat/irq.h +++ b/arch/arm/mach-orion/irq.h @@ -1,6 +1,4 @@ /* - * arch/arm/plat-orion/include/plat/irq.h - * * Marvell Orion SoC IRQ handling. * * This file is licensed under the terms of the GNU General Public diff --git a/arch/arm/mach-orion5x/kurobox_pro-setup.c b/arch/arm/mach-orion/kurobox_pro-setup.c similarity index 99% rename from arch/arm/mach-orion5x/kurobox_pro-setup.c rename to arch/arm/mach-orion/kurobox_pro-setup.c index 83d43cff4bd7..d936858b62f1 100644 --- a/arch/arm/mach-orion5x/kurobox_pro-setup.c +++ b/arch/arm/mach-orion/kurobox_pro-setup.c @@ -1,6 +1,4 @@ /* - * arch/arm/mach-orion5x/kurobox_pro-setup.c - * * Maintainer: Ronen Shitrit * * This file is licensed under the terms of the GNU General Public @@ -24,8 +22,8 @@ #include #include #include -#include "common.h" -#include "mpp.h" +#include "orion5x-common.h" +#include "orion5x-mpp.h" #include "orion5x.h" /***************************************************************************** diff --git a/arch/arm/mach-orion5x/ls_hgl-setup.c b/arch/arm/mach-orion/ls_hgl-setup.c similarity index 98% rename from arch/arm/mach-orion5x/ls_hgl-setup.c rename to arch/arm/mach-orion/ls_hgl-setup.c index 47ba6e0502f5..cce7696bd17a 100644 --- a/arch/arm/mach-orion5x/ls_hgl-setup.c +++ b/arch/arm/mach-orion/ls_hgl-setup.c @@ -1,6 +1,4 @@ /* - * arch/arm/mach-orion5x/ls_hgl-setup.c - * * Maintainer: Zhu Qingsen * * This file is licensed under the terms of the GNU General Public @@ -21,8 +19,8 @@ #include #include #include -#include "common.h" -#include "mpp.h" +#include "orion5x-common.h" +#include "orion5x-mpp.h" #include "orion5x.h" /***************************************************************************** diff --git a/arch/arm/plat-orion/mpp.c b/arch/arm/mach-orion/mpp.c similarity index 95% rename from arch/arm/plat-orion/mpp.c rename to arch/arm/mach-orion/mpp.c index 8a6880d528b6..d0736f22c824 100644 --- a/arch/arm/plat-orion/mpp.c +++ b/arch/arm/mach-orion/mpp.c @@ -1,6 +1,4 @@ /* - * arch/arm/plat-orion/mpp.c - * * MPP functions for Marvell orion SoCs * * This file is licensed under the terms of the GNU General Public @@ -13,8 +11,8 @@ #include #include #include -#include -#include +#include "orion-gpio.h" +#include "mpp.h" /* Address of the ith MPP control register */ static __init void __iomem *mpp_ctrl_addr(unsigned int i, diff --git a/arch/arm/plat-orion/include/plat/mpp.h b/arch/arm/mach-orion/mpp.h similarity index 95% rename from arch/arm/plat-orion/include/plat/mpp.h rename to arch/arm/mach-orion/mpp.h index 254552fee889..8100c82a2fa6 100644 --- a/arch/arm/plat-orion/include/plat/mpp.h +++ b/arch/arm/mach-orion/mpp.h @@ -1,6 +1,4 @@ /* - * arch/arm/plat-orion/include/plat/mpp.h - * * Marvell Orion SoC MPP handling. * * This file is licensed under the terms of the GNU General Public diff --git a/arch/arm/mach-orion5x/mv2120-setup.c b/arch/arm/mach-orion/mv2120-setup.c similarity index 99% rename from arch/arm/mach-orion5x/mv2120-setup.c rename to arch/arm/mach-orion/mv2120-setup.c index 2bf8ec75e908..9f001118e454 100644 --- a/arch/arm/mach-orion5x/mv2120-setup.c +++ b/arch/arm/mach-orion/mv2120-setup.c @@ -21,8 +21,8 @@ #include #include #include -#include "common.h" -#include "mpp.h" +#include "orion5x-common.h" +#include "orion5x-mpp.h" #include "orion5x.h" #define MV2120_NOR_BOOT_BASE 0xf4000000 diff --git a/arch/arm/mach-mv78xx0/bridge-regs.h b/arch/arm/mach-orion/mv78xx0-bridge-regs.h similarity index 100% rename from arch/arm/mach-mv78xx0/bridge-regs.h rename to arch/arm/mach-orion/mv78xx0-bridge-regs.h diff --git a/arch/arm/mach-mv78xx0/common.c b/arch/arm/mach-orion/mv78xx0-common.c similarity index 98% rename from arch/arm/mach-mv78xx0/common.c rename to arch/arm/mach-orion/mv78xx0-common.c index dd762d1b083f..b049b99527b7 100644 --- a/arch/arm/mach-mv78xx0/common.c +++ b/arch/arm/mach-orion/mv78xx0-common.c @@ -1,6 +1,4 @@ /* - * arch/arm/mach-mv78xx0/common.c - * * Core functions for Marvell MV78xx0 SoCs * * This file is licensed under the terms of the GNU General Public @@ -21,12 +19,12 @@ #include #include #include -#include -#include -#include -#include "mv78xx0.h" -#include "bridge-regs.h" +#include "time.h" #include "common.h" +#include "addr-map.h" +#include "mv78xx0.h" +#include "mv78xx0-bridge-regs.h" +#include "mv78xx0-common.h" static int get_tclk(void); diff --git a/arch/arm/mach-mv78xx0/common.h b/arch/arm/mach-orion/mv78xx0-common.h similarity index 97% rename from arch/arm/mach-mv78xx0/common.h rename to arch/arm/mach-orion/mv78xx0-common.h index 6889af26077d..91164ef16030 100644 --- a/arch/arm/mach-mv78xx0/common.h +++ b/arch/arm/mach-orion/mv78xx0-common.h @@ -1,6 +1,4 @@ /* - * arch/arm/mach-mv78xx0/common.h - * * Core functions for Marvell MV78xx0 SoCs * * This file is licensed under the terms of the GNU General Public diff --git a/arch/arm/mach-mv78xx0/irq.c b/arch/arm/mach-orion/mv78xx0-irq.c similarity index 93% rename from arch/arm/mach-mv78xx0/irq.c rename to arch/arm/mach-orion/mv78xx0-irq.c index 788569e960e1..e5a42c6fc7bf 100644 --- a/arch/arm/mach-mv78xx0/irq.c +++ b/arch/arm/mach-orion/mv78xx0-irq.c @@ -1,6 +1,4 @@ /* - * arch/arm/mach-mv78xx0/irq.c - * * MV78xx0 IRQ handling. * * This file is licensed under the terms of the GNU General Public @@ -12,10 +10,10 @@ #include #include #include -#include -#include -#include "bridge-regs.h" -#include "common.h" +#include "orion-gpio.h" +#include "irq.h" +#include "mv78xx0-bridge-regs.h" +#include "mv78xx0-common.h" static int __initdata gpio0_irqs[4] = { IRQ_MV78XX0_GPIO_0_7, diff --git a/arch/arm/mach-mv78xx0/irqs.h b/arch/arm/mach-orion/mv78xx0-irqs.h similarity index 100% rename from arch/arm/mach-mv78xx0/irqs.h rename to arch/arm/mach-orion/mv78xx0-irqs.h diff --git a/arch/arm/mach-mv78xx0/mpp.c b/arch/arm/mach-orion/mv78xx0-mpp.c similarity index 91% rename from arch/arm/mach-mv78xx0/mpp.c rename to arch/arm/mach-orion/mv78xx0-mpp.c index 72843c02e95a..2616b656d5f5 100644 --- a/arch/arm/mach-mv78xx0/mpp.c +++ b/arch/arm/mach-orion/mv78xx0-mpp.c @@ -1,6 +1,4 @@ /* - * arch/arm/mach-mv78x00/mpp.c - * * MPP functions for Marvell MV78x00 SoCs * * This file is licensed under the terms of the GNU General Public @@ -11,10 +9,10 @@ #include #include #include -#include -#include "mv78xx0.h" -#include "common.h" #include "mpp.h" +#include "mv78xx0.h" +#include "mv78xx0-common.h" +#include "mv78xx0-mpp.h" static unsigned int __init mv78xx0_variant(void) { diff --git a/arch/arm/mach-mv78xx0/mpp.h b/arch/arm/mach-orion/mv78xx0-mpp.h similarity index 99% rename from arch/arm/mach-mv78xx0/mpp.h rename to arch/arm/mach-orion/mv78xx0-mpp.h index 3752302ae2ee..004f22d39c98 100644 --- a/arch/arm/mach-mv78xx0/mpp.h +++ b/arch/arm/mach-orion/mv78xx0-mpp.h @@ -1,6 +1,5 @@ /* - * linux/arch/arm/mach-mv78xx0/mpp.h -- Multi Purpose Pins - * + * Multi Purpose Pins * * sebastien requiem * diff --git a/arch/arm/mach-mv78xx0/pcie.c b/arch/arm/mach-orion/mv78xx0-pcie.c similarity index 98% rename from arch/arm/mach-mv78xx0/pcie.c rename to arch/arm/mach-orion/mv78xx0-pcie.c index 636d84b40466..d852ec563879 100644 --- a/arch/arm/mach-mv78xx0/pcie.c +++ b/arch/arm/mach-orion/mv78xx0-pcie.c @@ -1,6 +1,4 @@ /* - * arch/arm/mach-mv78xx0/pcie.c - * * PCIe functions for Marvell MV78xx0 SoCs * * This file is licensed under the terms of the GNU General Public @@ -14,9 +12,9 @@ #include