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()