From patchwork Fri Jan 19 23:17:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Icenowy Zheng X-Patchwork-Id: 10176095 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8A5DA602B1 for ; Fri, 19 Jan 2018 23:18:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7C66B287DE for ; Fri, 19 Jan 2018 23:18:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 70F96287E2; Fri, 19 Jan 2018 23:18:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 58B23287DE for ; Fri, 19 Jan 2018 23:18:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=88Ubu75ba3PMbjdmxuBFtmzIRKSy8iGWJeh+ul1GzGc=; b=cQBTAH59N6IQEbApaeDEGKlyl3 d2kzXZ+Vla6nhIKfXJ18/VvzqVub6JHfMMVW+rRe/Q2k1AiuL7G2IrYOvtjeVTglyOkfDN0pGh4n8 4uqFd8TG53zEWE9BTRk2xFIIJa7sAawrt3wJ735tNphLQ1cQGge9IjX7aEbgn2glSS4KnfNULwNa5 RoGf3psdfi9ySNSnAuh8j5SCd5JUx3RoWWGKvGquuFUrNexC4e9B/+DYCOrFVcgEqYZZzUXhRCRVh veUdeJvDeJ6WkjPEsNqLDUmKfy+9UC4GkoUdteoINycW32t3cHG4Z0Db/CdO3nOvrxiylNr3s0LwZ J/ov8LKQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1ecfvm-0006q2-Qd; Fri, 19 Jan 2018 23:18:42 +0000 Received: from cockroach.ash.relay.mailchannels.net ([23.83.222.37]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1ecfvj-0006b4-4E for linux-arm-kernel@lists.infradead.org; Fri, 19 Jan 2018 23:18:41 +0000 X-Sender-Id: lmn-tzduiowcrqmw|x-authsender|icenowy@aosc.io Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id 3DD575C1748; Fri, 19 Jan 2018 23:18:23 +0000 (UTC) Received: from hermes.aosc.io (unknown [100.96.25.28]) (Authenticated sender: lmn-TZDUIOWCRQMW) by relay.mailchannels.net (Postfix) with ESMTPA id C75F35C16DA; Fri, 19 Jan 2018 23:18:14 +0000 (UTC) X-Sender-Id: lmn-tzduiowcrqmw|x-authsender|icenowy@aosc.io Received: from hermes.aosc.io (hermes.aosc.io [172.18.41.110]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384) by 0.0.0.0:2500 (trex/5.13.1); Fri, 19 Jan 2018 23:18:23 +0000 X-MC-Relay: Neutral X-MailChannels-SenderId: lmn-tzduiowcrqmw|x-authsender|icenowy@aosc.io X-MailChannels-Auth-Id: lmn-TZDUIOWCRQMW X-Trade-Language: 7e2f3eff353011f0_1516403895791_4247317113 X-MC-Loop-Signature: 1516403895791:1661454557 X-MC-Ingress-Time: 1516403895790 Received: from localhost (localhost [127.0.0.1]) (Authenticated sender: icenowy@aosc.io) by hermes.aosc.io (Postfix) with ESMTPSA id 23CF754CFE; Fri, 19 Jan 2018 23:18:03 +0000 (UTC) From: Icenowy Zheng To: Maxime Ripard , Chen-Yu Tsai , Russell King , Daniel Lezcano , Marc Zyngier , Linus Walleij Subject: [RFC PATCH 1/9] ARM: add CONFIG_ARCH_SUNXI_V7 for differentiate ARMv5/v7 Allwinner SoCs Date: Sat, 20 Jan 2018 07:17:27 +0800 Message-Id: <20180119231735.61504-2-icenowy@aosc.io> In-Reply-To: <20180119231735.61504-1-icenowy@aosc.io> References: <20180119231735.61504-1-icenowy@aosc.io> X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-gpio@vger.kernel.org, linux-sunxi@googlegroups.com, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Icenowy Zheng MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Allwinner also has some ARMv5 SoCs. In order to add support for them, add a CONFIG_ARCH_SUNXI_V7 option that is selectable when ARMv7 is selceted, and make CONFIG_ARCH_SUNXI a common bool config which is selected by both V7 and V5 sunxi option. The ARMv7 defconfigs are modified to have the new CONFIG_ARCH_SUNXI_V7 option. Signed-off-by: Icenowy Zheng --- arch/arm/configs/multi_v7_defconfig | 2 +- arch/arm/configs/sunxi_defconfig | 2 +- arch/arm/mach-sunxi/Kconfig | 14 ++++++++++++-- arch/arm/mach-sunxi/Makefile | 2 +- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 61509c4b769f..9b4267b2ad49 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -98,7 +98,7 @@ CONFIG_ARCH_R8A7792=y CONFIG_ARCH_R8A7793=y CONFIG_ARCH_R8A7794=y CONFIG_ARCH_SH73A0=y -CONFIG_ARCH_SUNXI=y +CONFIG_ARCH_SUNXI_V7=y CONFIG_ARCH_SIRF=y CONFIG_ARCH_TEGRA=y CONFIG_ARCH_TEGRA_2x_SOC=y diff --git a/arch/arm/configs/sunxi_defconfig b/arch/arm/configs/sunxi_defconfig index 5caaf971fb50..9e9be989a4bd 100644 --- a/arch/arm/configs/sunxi_defconfig +++ b/arch/arm/configs/sunxi_defconfig @@ -5,7 +5,7 @@ CONFIG_BLK_DEV_INITRD=y CONFIG_PERF_EVENTS=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y -CONFIG_ARCH_SUNXI=y +CONFIG_ARCH_SUNXI_V7=y CONFIG_SMP=y CONFIG_NR_CPUS=8 CONFIG_AEABI=y diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig index 58153cdf025b..65509a35935f 100644 --- a/arch/arm/mach-sunxi/Kconfig +++ b/arch/arm/mach-sunxi/Kconfig @@ -1,6 +1,16 @@ -menuconfig ARCH_SUNXI +config ARCH_SUNXI + bool + select ARCH_HAS_RESET_CONTROLLER + select CLKSRC_MMIO + select GENERIC_IRQ_CHIP + select GPIOLIB + select PINCTRL + select RESET_CONTROLLER + +menuconfig ARCH_SUNXI_V7 bool "Allwinner SoCs" depends on ARCH_MULTI_V7 + select ARCH_SUNXI select ARCH_HAS_RESET_CONTROLLER select CLKSRC_MMIO select GENERIC_IRQ_CHIP @@ -10,7 +20,7 @@ menuconfig ARCH_SUNXI select SUN4I_TIMER select RESET_CONTROLLER -if ARCH_SUNXI +if ARCH_SUNXI_V7 config MACH_SUN4I bool "Allwinner A10 (sun4i) SoCs support" diff --git a/arch/arm/mach-sunxi/Makefile b/arch/arm/mach-sunxi/Makefile index 27b168f121a1..6d874f6c9d3a 100644 --- a/arch/arm/mach-sunxi/Makefile +++ b/arch/arm/mach-sunxi/Makefile @@ -1,2 +1,2 @@ -obj-$(CONFIG_ARCH_SUNXI) += sunxi.o +obj-$(CONFIG_ARCH_SUNXI_V7) += sunxi.o obj-$(CONFIG_SMP) += platsmp.o