From patchwork Mon Nov 21 22:14:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Conor Dooley X-Patchwork-Id: 13051688 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D1B04C4332F for ; Mon, 21 Nov 2022 22:18:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=MtHp5G3BdewSs7vUP1vTgyGrVauQWTJ8ZImjtvxXr7w=; b=c0j2qxwxEcmRTJ pudzc+x4cYckIKr1mUw0M68TRWgOEqKgRXd2FOmQMJbl7mcIZbgPRHwam8qXLrBKFaH2dmC4Xf2m+ AizhOr9nqzOxWJjx5XLGBTjCVKyWaqglEBqzwD8VFQ4bb7J86maHGOM6UwRm8lCvHpFvr4NMmvmiE cR4Rts7WUoEYxYA0lHD94ilAEv2DLo1NPazvSkYFJGZwsMGsMG15RfrpBIrAdPVmsMbVSegJ3aVbr TjJ8hr8Sjcf/hbRWl99eQbngXHOMAFbLienR+n8MxENkxWOfTzsG326YkMBUSt1z7hlHMlUz1wAlA c03WATFKuu6CIohRTDZg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oxF7c-000mWk-3M; Mon, 21 Nov 2022 22:18:36 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oxF7X-000mS0-Jy for linux-riscv@bombadil.infradead.org; Mon, 21 Nov 2022 22:18:31 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=F9dwLVPu6P2oUAzC3l3yTlMOXFBeu92k4vvqcAFvDJo=; b=j+rZKSeQVRT4XoJsb7Df2BFwpt OJPCfbSAulk3TeT+7HOJdjhGnwV4xLeGNSkZlR2Ir80inVmf0ao1gWotL0JAO1XyTKDeUZ7XRJc7L pAUN2uzqHefl4VVBEnf+ciDa62Yfu5hgzamS23R9j9Ni2XvOKheQFbk9rKYVYLTErA57RwjtSwb5V TEs7Xea45uajT6dpjCZELKCa1oXue0+BD59IKOn/CKIPZ/3vo09MH49+1o03LJefHB8CJ2ggOJ+zo rZGrQjEvHW4P8BZKkZGVhZGSkXZ9kb/GuI1US1gnHtb6cxNrgl1EivLi+X3Ni3dXBwC47FQTXD4NC bhG99pNw==; Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by desiato.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oxF7Q-003EqI-4H for linux-riscv@lists.infradead.org; Mon, 21 Nov 2022 22:18:28 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id E73AC614BB; Mon, 21 Nov 2022 22:18:16 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4FC3DC433C1; Mon, 21 Nov 2022 22:18:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1669069096; bh=duMxqm14Ap93TJhRSakjhgfdtF7u1Tplr4ZYzrvbSmg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Oq0EmPaciqO1BTQeRscZHdZxhQDvz6A9bWDqQnYV4Uftj7+zWcokMKiXU5zVKGK6I NZi+krSSRflSboV2oBCkGRrqULTN2SQzc7k4VVL12HJVPzBGjBCqfF7KKxGVoNbpjH 8tg1s/fOwsybf22vO9fsJJguc9Cf1bmKX+I/sPThd6BWiHqI2nkCUebzNyLUsfAat0 je9dEPJOjQIU4QMNQojmcS6sb8KjwfrWn8xWxLZe0v5eVlFNqs4iciGSlde+ZbcvtV xfA8U9fpHCASsESNaDm8c9TX8QgH8GVU4sXjmVh0vzORTW3Z/WlK0O53kUH0d56Xt5 sWmN4HVDEM10A== From: Conor Dooley To: linux-riscv@lists.infradead.org Cc: Conor Dooley , Arnd Bergmann , Christoph Hellwig , Damien Le Moal , Emil Renner Berthing , Geert Uytterhoeven , Heiko Stuebner , Palmer Dabbelt , Samuel Holland Subject: [PATCH v1 1/7] RISC-V: introduce ARCH_FOO kconfig aliases for SOC_FOO symbols Date: Mon, 21 Nov 2022 22:14:09 +0000 Message-Id: <20221121221414.109965-2-conor@kernel.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221121221414.109965-1-conor@kernel.org> References: <20221121221414.109965-1-conor@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221121_221825_633864_CD23993A X-CRM114-Status: GOOD ( 13.18 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org From: Conor Dooley To facilitate a transfer from SOC_FOO to ARCH_FOO, over a release cycle, introduce some aliases so that drivers etc that use the SOC_FOO symbols can be converted. Signed-off-by: Conor Dooley --- To me, the most straight-forward conversion looks like so: - this patch is applied in week 2 of the merge window, to avoid any conflicts with the Renesas tree - all users of the SOC_ variants can be converted over a release cycle (or more) & no trees need to merge an immutable branch. - we convert defconfig etc over after all users are converted - doing it over at least one release cycle means that `make oldconfig` will keep people's configs working as they upgrade - any new SoC families added uses ARCH_FOO --- arch/riscv/Kconfig.socs | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/arch/riscv/Kconfig.socs b/arch/riscv/Kconfig.socs index 75fb0390d6bd..58cd2304b82d 100644 --- a/arch/riscv/Kconfig.socs +++ b/arch/riscv/Kconfig.socs @@ -1,5 +1,8 @@ menu "SoC selection" +config ARCH_MICROCHIP_POLARFIRE + def_bool SOC_MICROCHIP_POLARFIRE + config SOC_MICROCHIP_POLARFIRE bool "Microchip PolarFire SoCs" select MCHP_CLK_MPFS @@ -12,6 +15,9 @@ config ARCH_RENESAS help This enables support for the RISC-V based Renesas SoCs. +config ARCH_SIFIVE + def_bool SOC_SIFIVE + config SOC_SIFIVE bool "SiFive SoCs" select SERIAL_SIFIVE if TTY @@ -23,6 +29,9 @@ config SOC_SIFIVE help This enables support for SiFive SoC platform hardware. +config ARCH_STARFIVE + def_bool SOC_STARFIVE + config SOC_STARFIVE bool "StarFive SoCs" select PINCTRL @@ -31,6 +40,9 @@ config SOC_STARFIVE help This enables support for StarFive SoC platform hardware. +config ARCH_VIRT + def_bool SOC_VIRT + config SOC_VIRT bool "QEMU Virt Machine" select CLINT_TIMER if RISCV_M_MODE @@ -46,6 +58,9 @@ config SOC_VIRT help This enables support for QEMU Virt Machine. +config ARCH_CANAAN + def_bool SOC_CANAAN + config SOC_CANAAN bool "Canaan Kendryte K210 SoC" depends on !MMU @@ -62,6 +77,9 @@ config SOC_CANAAN if SOC_CANAAN +config ARCH_CANAAN_K210_DTB_BUILTIN + def_bool SOC_CANAAN_K210_DTB_BUILTIN + config SOC_CANAAN_K210_DTB_BUILTIN bool "Builtin device tree for the Canaan Kendryte K210" depends on SOC_CANAAN @@ -73,6 +91,9 @@ config SOC_CANAAN_K210_DTB_BUILTIN This option should be selected if no bootloader is being used. If unsure, say Y. +config ARCH_CANAAN_K210_DTB_SOURCE + def_bool SOC_CANAAN_K210_DTB_SOURCE + config SOC_CANAAN_K210_DTB_SOURCE string "Source file for the Canaan Kendryte K210 builtin DTB" depends on SOC_CANAAN From patchwork Mon Nov 21 22:14:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Conor Dooley X-Patchwork-Id: 13051683 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B35A9C4332F for ; Mon, 21 Nov 2022 22:18:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=E6iyLm3MdTszwCU77oQhYiofbB+bzuEQLAZemjaqLoQ=; b=nVoUPjhLbEpPey xAtMik07K10We1s6ozRwpf7Nh82qPIDy025F0IrHc3bt3OznQaJ4+mCgYNvgy1rHz9Xp1WPZ76Ihx /WqhoKYnfuTRjaw9omTGUkt9zAjz/5/EvNtiDHmyAdV/FAnMRkXcK2vGueSuIsQ9rns/lBSL/9aek NSGLhbGwIVf4MwmHcXT61pbfKvlpIidtcyXtLFhYeHsBI/UEnNpELc7UxTHP5JFYeZ5Fq/W0btZDx YS+8UXVUYnwmvo84wihcb/FOQA5nhDaX1TgGKY7x3uSiGcjgrfxXt8HyfTiJHY2a2iGZM5aRkPpNA iCsF9WrHkTcBc/LLdX7Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oxF7O-000mLk-8o; Mon, 21 Nov 2022 22:18:22 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oxF7L-000mKD-PH for linux-riscv@lists.infradead.org; Mon, 21 Nov 2022 22:18:21 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 64324614C3; Mon, 21 Nov 2022 22:18:19 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C1EF7C433D7; Mon, 21 Nov 2022 22:18:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1669069098; bh=Mp/qHJbEET1gRdLX+njK38qbYjZnjBHmZCF007jkaAY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kAxhByaoRTToXJFd3NJ7QcPvnQtUxmGNY2XnswY/eIVaNn98+wdzVJCnXDQ+2R1qP ZhND5AcaKP4Q6s9O4ZcqQISxcqe+wl/zrxG7Ni4dnzW8qzpI+DktCJ5bwMPLWhzCgV 8qGLTpFPSEPx5mQaTrAo/eQKHrH3sIQShdRLRRLwBc43oknwVot1DlLu2sk5+jvKhy S32NKsC7VdPLDJuNRsY/mruIv130QyNl1IRe9ttqTBCgDZ8OR8eZmRWmMCloycH9rG s9DFrup/lyKK+hX7luMQk96AxHgRKv0ZVZXG6Sn25FaAkGZgTYTD2pey+nmMPBIhIx KnBVSVyDq/crQ== From: Conor Dooley To: linux-riscv@lists.infradead.org Cc: Conor Dooley , Arnd Bergmann , Christoph Hellwig , Damien Le Moal , Emil Renner Berthing , Geert Uytterhoeven , Heiko Stuebner , Palmer Dabbelt , Samuel Holland Subject: [PATCH v1 2/7] RISC-V: kconfig.socs: convert usage of SOC_CANAAN to ARCH_CANAAN Date: Mon, 21 Nov 2022 22:14:10 +0000 Message-Id: <20221121221414.109965-3-conor@kernel.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221121221414.109965-1-conor@kernel.org> References: <20221121221414.109965-1-conor@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221121_141819_911712_5968E745 X-CRM114-Status: GOOD ( 13.59 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org From: Conor Dooley While we cannot yet drop the SOC_ prefixed symbols, we can convert uses of these symbols within Kconfig.socs to the ARCH_ variants. Signed-off-by: Conor Dooley --- arch/riscv/Kconfig.socs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/riscv/Kconfig.socs b/arch/riscv/Kconfig.socs index 58cd2304b82d..203d1c528ef4 100644 --- a/arch/riscv/Kconfig.socs +++ b/arch/riscv/Kconfig.socs @@ -75,14 +75,14 @@ config SOC_CANAAN help This enables support for Canaan Kendryte K210 SoC platform hardware. -if SOC_CANAAN +if ARCH_CANAAN config ARCH_CANAAN_K210_DTB_BUILTIN def_bool SOC_CANAAN_K210_DTB_BUILTIN config SOC_CANAAN_K210_DTB_BUILTIN bool "Builtin device tree for the Canaan Kendryte K210" - depends on SOC_CANAAN + depends on ARCH_CANAAN default y select OF select BUILTIN_DTB @@ -96,14 +96,14 @@ config ARCH_CANAAN_K210_DTB_SOURCE config SOC_CANAAN_K210_DTB_SOURCE string "Source file for the Canaan Kendryte K210 builtin DTB" - depends on SOC_CANAAN - depends on SOC_CANAAN_K210_DTB_BUILTIN + depends on ARCH_CANAAN + depends on ARCH_CANAAN_K210_DTB_BUILTIN default "k210_generic" help Base name (without suffix, relative to arch/riscv/boot/dts/canaan) for the DTS file that will be used to produce the DTB linked into the kernel. -endif # SOC_CANAAN +endif # ARCH_CANAAN endmenu # "SoC selection" From patchwork Mon Nov 21 22:14:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Conor Dooley X-Patchwork-Id: 13051684 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id AD3B9C4332F for ; Mon, 21 Nov 2022 22:18:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=eFKOSqKLDXDsVQOYXpZ2v5HSFs1Eq2NYPKDZU7Y1Amk=; b=bx0LhfNm5czjmv FHL5S///Poh0Lapk4A+dbZQJrIzwBDU4prZJJyhiVgLFiEeyG340sRlKNK4achmnqDZWNuJVNw8SH 2qi4cP+GngRhTPAHsRdV60IgzUQeCe9jJ9rcqDQ5oEYNly8/9j9b98z/yzCR1uxu8dDb8Ya0Fobov 3XjOk02cmXC1HMBzeWmh35UvRegieZAWw/7Xy5DYNqlUnQOKPOvRcQiLGoz6wmbWt//PU+50AGLY1 cxhEa4g5eh0HID775ktx2RPzz7uFvwh8SWFNLACNj6EJnafgGw35zEzqXkeTugt5b9UBgugYPMuU7 384pHjrnmloUX/eKPsog==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oxF7S-000mO9-Ck; Mon, 21 Nov 2022 22:18:26 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oxF7P-000mLf-3B for linux-riscv@lists.infradead.org; Mon, 21 Nov 2022 22:18:24 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id D981E6149F; Mon, 21 Nov 2022 22:18:21 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3F76AC433C1; Mon, 21 Nov 2022 22:18:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1669069101; bh=WcD2ybXJSAZYlOtR2LSjGbZlpJ0NRs6W6tIvU9o+TD8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jU0WSjjDmijf6hS+mp6F71jPCF9V2rsgIiHK7e7eEJzFY6pf5mkgZnzt3iBR7SgH0 fZLka0h+gI4baVfQHNmm87bbR+CU5G7c6jKrQneQUYOWBFXDuxjKbD2qll8G/LIMzq q/Fk2XuETtW6nL8DvNUzmmx8BU1V63mJy/etIqwVR2huOKQ1eyCZxS5U/DgBaGth68 fE0il/bW3Ntcmf/bDyuxt+D9Finuwo4ZtpZ4glY1CTpgQeP5T5ilPLfdwJbPE+1H6G kifVQL3CUzHIXSPrws7wczHX08qkIXrSH5EzNz3fHIoeVZhyvm5GDGlTPVweksHQiM +zyPTnQPYuP0g== From: Conor Dooley To: linux-riscv@lists.infradead.org Cc: Conor Dooley , Arnd Bergmann , Christoph Hellwig , Damien Le Moal , Emil Renner Berthing , Geert Uytterhoeven , Heiko Stuebner , Palmer Dabbelt , Samuel Holland Subject: [PATCH v1 3/7] RISC-V: kbuild: convert all use of SOC_FOO to ARCH_FOO Date: Mon, 21 Nov 2022 22:14:11 +0000 Message-Id: <20221121221414.109965-4-conor@kernel.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221121221414.109965-1-conor@kernel.org> References: <20221121221414.109965-1-conor@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221121_141823_229992_AD9C6298 X-CRM114-Status: GOOD ( 11.94 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org From: Conor Dooley Convert all non user visible use of SOC_FOO symbols to their ARCH_FOO variants. The canaan DTs are an outlier in that they're gated at the directory and the file level. Drop the directory level gating while we are swapping the symbol names over. Signed-off-by: Conor Dooley --- arch/riscv/Makefile | 2 +- arch/riscv/boot/dts/Makefile | 2 +- arch/riscv/boot/dts/canaan/Makefile | 14 +++++++------- arch/riscv/boot/dts/microchip/Makefile | 8 ++++---- arch/riscv/boot/dts/sifive/Makefile | 4 ++-- arch/riscv/boot/dts/starfive/Makefile | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile index 0d13b597cb55..46a520c1273c 100644 --- a/arch/riscv/Makefile +++ b/arch/riscv/Makefile @@ -131,7 +131,7 @@ endif endif ifneq ($(CONFIG_XIP_KERNEL),y) -ifeq ($(CONFIG_RISCV_M_MODE)$(CONFIG_SOC_CANAAN),yy) +ifeq ($(CONFIG_RISCV_M_MODE)$(CONFIG_ARCH_CANAAN),yy) KBUILD_IMAGE := $(boot)/loader.bin else ifeq ($(CONFIG_EFI_ZBOOT),) diff --git a/arch/riscv/boot/dts/Makefile b/arch/riscv/boot/dts/Makefile index b0ff5fbabb0c..0c97d673b775 100644 --- a/arch/riscv/boot/dts/Makefile +++ b/arch/riscv/boot/dts/Makefile @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 subdir-y += sifive subdir-y += starfive -subdir-$(CONFIG_SOC_CANAAN_K210_DTB_BUILTIN) += canaan +subdir-y += canaan subdir-y += microchip subdir-y += renesas diff --git a/arch/riscv/boot/dts/canaan/Makefile b/arch/riscv/boot/dts/canaan/Makefile index befe4eb7527b..520623264c87 100644 --- a/arch/riscv/boot/dts/canaan/Makefile +++ b/arch/riscv/boot/dts/canaan/Makefile @@ -1,9 +1,9 @@ # SPDX-License-Identifier: GPL-2.0 -dtb-$(CONFIG_SOC_CANAAN) += canaan_kd233.dtb -dtb-$(CONFIG_SOC_CANAAN) += k210_generic.dtb -dtb-$(CONFIG_SOC_CANAAN) += sipeed_maix_bit.dtb -dtb-$(CONFIG_SOC_CANAAN) += sipeed_maix_dock.dtb -dtb-$(CONFIG_SOC_CANAAN) += sipeed_maix_go.dtb -dtb-$(CONFIG_SOC_CANAAN) += sipeed_maixduino.dtb +dtb-$(CONFIG_ARCH_CANAAN) += canaan_kd233.dtb +dtb-$(CONFIG_ARCH_CANAAN) += k210_generic.dtb +dtb-$(CONFIG_ARCH_CANAAN) += sipeed_maix_bit.dtb +dtb-$(CONFIG_ARCH_CANAAN) += sipeed_maix_dock.dtb +dtb-$(CONFIG_ARCH_CANAAN) += sipeed_maix_go.dtb +dtb-$(CONFIG_ARCH_CANAAN) += sipeed_maixduino.dtb -obj-$(CONFIG_SOC_CANAAN_K210_DTB_BUILTIN) += $(addsuffix .dtb.o, $(CONFIG_SOC_CANAAN_K210_DTB_SOURCE)) +obj-$(CONFIG_ARCH_CANAAN_K210_DTB_BUILTIN) += $(addsuffix .dtb.o, $(CONFIG_ARCH_CANAAN_K210_DTB_SOURCE)) diff --git a/arch/riscv/boot/dts/microchip/Makefile b/arch/riscv/boot/dts/microchip/Makefile index 7427a20934f3..259c3c802cab 100644 --- a/arch/riscv/boot/dts/microchip/Makefile +++ b/arch/riscv/boot/dts/microchip/Makefile @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 -dtb-$(CONFIG_SOC_MICROCHIP_POLARFIRE) += mpfs-icicle-kit.dtb -dtb-$(CONFIG_SOC_MICROCHIP_POLARFIRE) += mpfs-m100pfsevp.dtb -dtb-$(CONFIG_SOC_MICROCHIP_POLARFIRE) += mpfs-polarberry.dtb -dtb-$(CONFIG_SOC_MICROCHIP_POLARFIRE) += mpfs-sev-kit.dtb +dtb-$(CONFIG_ARCH_MICROCHIP_POLARFIRE) += mpfs-icicle-kit.dtb +dtb-$(CONFIG_ARCH_MICROCHIP_POLARFIRE) += mpfs-m100pfsevp.dtb +dtb-$(CONFIG_ARCH_MICROCHIP_POLARFIRE) += mpfs-polarberry.dtb +dtb-$(CONFIG_ARCH_MICROCHIP_POLARFIRE) += mpfs-sev-kit.dtb obj-$(CONFIG_BUILTIN_DTB) += $(addsuffix .o, $(dtb-y)) diff --git a/arch/riscv/boot/dts/sifive/Makefile b/arch/riscv/boot/dts/sifive/Makefile index d90e4eb0ade8..6a5fbd4ed96a 100644 --- a/arch/riscv/boot/dts/sifive/Makefile +++ b/arch/riscv/boot/dts/sifive/Makefile @@ -1,4 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 -dtb-$(CONFIG_SOC_SIFIVE) += hifive-unleashed-a00.dtb \ - hifive-unmatched-a00.dtb +dtb-$(CONFIG_ARCH_SIFIVE) += hifive-unleashed-a00.dtb \ + hifive-unmatched-a00.dtb obj-$(CONFIG_BUILTIN_DTB) += $(addsuffix .o, $(dtb-y)) diff --git a/arch/riscv/boot/dts/starfive/Makefile b/arch/riscv/boot/dts/starfive/Makefile index 039c143cba33..7b00a48580ca 100644 --- a/arch/riscv/boot/dts/starfive/Makefile +++ b/arch/riscv/boot/dts/starfive/Makefile @@ -1,2 +1,2 @@ # SPDX-License-Identifier: GPL-2.0 -dtb-$(CONFIG_SOC_STARFIVE) += jh7100-beaglev-starlight.dtb jh7100-starfive-visionfive-v1.dtb +dtb-$(CONFIG_ARCH_STARFIVE) += jh7100-beaglev-starlight.dtb jh7100-starfive-visionfive-v1.dtb From patchwork Mon Nov 21 22:14:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Conor Dooley X-Patchwork-Id: 13051685 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 76728C43219 for ; Mon, 21 Nov 2022 22:18:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=PDQ91zxHopWidTMalX4gzqFmOFYI5X5g+aQ5TKoby5g=; b=kXKNgMlF/wgaV2 H9MzvOoTmra2SSYK8iJkSfYE4jxUm0u9p691XdvbrMkSfZDCQ0njlB6GZ09Y5iaqTesSmA2NlEqwB CnCZ5/IitqMfe6VGi+LteDhRQhawO53yrMVn+Fh6XZSWTOOM0clPyIr1MBewV6d6n6pNrNpUTEchg 3P2ca8xqblQMJKN2xhHbg5/aHOklXgAd2U0lnEk3sjM1um2AlX3z8nxSuuW88ktTb63kCUDIAWSks wYkn20AbkaDyk5f5/rUjMpSlKGB5WOrguc5ZT6kHomm7Zwid3VVZG5PAOwHJwnScwUgOuY5ROb0ip s6OSNMcsJI7TgniSS6eQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oxF7T-000mP4-Pe; Mon, 21 Nov 2022 22:18:27 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oxF7Q-000mN4-N9 for linux-riscv@lists.infradead.org; Mon, 21 Nov 2022 22:18:26 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 532A3614C5; Mon, 21 Nov 2022 22:18:24 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B0133C433D6; Mon, 21 Nov 2022 22:18:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1669069103; bh=tHpQxQq0I3Nv/AqKujXXZpXk5FWAzTV8ovqrazYylmU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ahhD/mmgkL43J1FtqDGQv1JruQXSTl+kBbC/iJziwcR0bRSnyoj0NL7F4Lv7/ybbc xJsZ6CxIiqUM32Hu00tmgfDqGXo3T1Sa9b2uWCksISczcKzDqaZt9IgVMl7MdSoSN9 6c3jhr7pzSI1w06b7bIivEiMallc2hql4etXHLgKevt5NRV6ghpxsqGyLJB1tZ8v+c vT/wESPjIbD8pM1cvyGbL28d4i1bm++aq57acr7Pu96GgaArhIFDnIsaCtWXreoAiE xXTkw1tbdt0hV4O+/j9AFdRfCu74alxCg/A65ti5ot1P8IJ0JnIpGZAenN0UMWTQrf ci1Re8/jo5r9w== From: Conor Dooley To: linux-riscv@lists.infradead.org Cc: Conor Dooley , Arnd Bergmann , Christoph Hellwig , Damien Le Moal , Emil Renner Berthing , Geert Uytterhoeven , Heiko Stuebner , Palmer Dabbelt , Samuel Holland Subject: [PATCH v1 4/7] RISC-V: stop selecting SIFIVE_PLIC at the SoC level Date: Mon, 21 Nov 2022 22:14:12 +0000 Message-Id: <20221121221414.109965-5-conor@kernel.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221121221414.109965-1-conor@kernel.org> References: <20221121221414.109965-1-conor@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221121_141824_819343_75EC6F61 X-CRM114-Status: GOOD ( 12.66 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org From: Conor Dooley The SIFIVE_PLIC driver is used by all current RISC-V SoCs & will be, where possible, used for future implementations. Rather than having each SoC select the option in Kconfig.socs, do so at the arch level. Signed-off-by: Conor Dooley --- arch/riscv/Kconfig | 1 + arch/riscv/Kconfig.socs | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index fec54872ab45..d7334e02d20b 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -125,6 +125,7 @@ config RISCV select PCI_MSI if PCI select RISCV_INTC select RISCV_TIMER if RISCV_SBI + select SIFIVE_PLIC select SPARSE_IRQ select SYSCTL_EXCEPTION_TRACE select THREAD_INFO_IN_TASK diff --git a/arch/riscv/Kconfig.socs b/arch/riscv/Kconfig.socs index 203d1c528ef4..ce920f627f6d 100644 --- a/arch/riscv/Kconfig.socs +++ b/arch/riscv/Kconfig.socs @@ -6,7 +6,6 @@ config ARCH_MICROCHIP_POLARFIRE config SOC_MICROCHIP_POLARFIRE bool "Microchip PolarFire SoCs" select MCHP_CLK_MPFS - select SIFIVE_PLIC help This enables support for Microchip PolarFire SoC platforms. @@ -24,7 +23,6 @@ config SOC_SIFIVE select SERIAL_SIFIVE_CONSOLE if TTY select CLK_SIFIVE select CLK_SIFIVE_PRCI - select SIFIVE_PLIC select ERRATA_SIFIVE if !XIP_KERNEL help This enables support for SiFive SoC platform hardware. @@ -36,7 +34,6 @@ config SOC_STARFIVE bool "StarFive SoCs" select PINCTRL select RESET_CONTROLLER - select SIFIVE_PLIC help This enables support for StarFive SoC platform hardware. @@ -51,7 +48,6 @@ config SOC_VIRT select POWER_RESET_SYSCON_POWEROFF select GOLDFISH select RTC_DRV_GOLDFISH if RTC_CLASS - select SIFIVE_PLIC select PM_GENERIC_DOMAINS if PM select PM_GENERIC_DOMAINS_OF if PM && OF select RISCV_SBI_CPUIDLE if CPU_IDLE && RISCV_SBI @@ -67,7 +63,6 @@ config SOC_CANAAN select CLINT_TIMER if RISCV_M_MODE select SERIAL_SIFIVE if TTY select SERIAL_SIFIVE_CONSOLE if TTY - select SIFIVE_PLIC select ARCH_HAS_RESET_CONTROLLER select PINCTRL select COMMON_CLK From patchwork Mon Nov 21 22:14:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Conor Dooley X-Patchwork-Id: 13051686 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 126CFC43217 for ; Mon, 21 Nov 2022 22:18:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=diwWlz7cXBnj1+h3pq/1ZvjqLA6hyjbbJCx+LjjX5eY=; b=njiPqkGh3hoLSZ HLqTfRux5m+s94vzcLP2/BkhC78JcmhlF2ayfUIlq1hXbs5t2U+ptumFFbiO4T1ywaojutkH/qQ6r QCAIiN+NZlepGHp5P6sNXIMmB1jWjQ6H7XxGg4knpNQHqU8GF+P0q/daelMqR486FQWpmu3DznEXz lLQ522J6aAdld2ImaPLOh7YNbhRD+GdtcgLmA8MI2Y4oZqzhFTNxmmy/lK5j3UlRlFL+b+RjFtv1m iPPzMY5JDFO2bak9zSXc3/xP75CxE717jPp8OEL/xhQ6+3vHCctOAXUFbKOYLLb8gSV8loDRx6kpQ XdBZUnkoSmxHEU1O14jg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oxF7X-000mSf-GW; Mon, 21 Nov 2022 22:18:31 +0000 Received: from ams.source.kernel.org ([145.40.68.75]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oxF7U-000mPD-Pd for linux-riscv@lists.infradead.org; Mon, 21 Nov 2022 22:18:30 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 6CE4CB8169B; Mon, 21 Nov 2022 22:18:27 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2E866C433C1; Mon, 21 Nov 2022 22:18:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1669069106; bh=SFx9KT5uy/j1ogg2Yxa6LtTVSwGZyMb8tZR4MKjd2XQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=u0jUcsd8r6l/N9XMNPgTUAhnq80hYTwRh1IycXJEEqHVI6S9MmDlETcrH3XWXAOey Mseld0XTWokkJbLNmHrMlJWvibwolQkNWz9svu3sdZJEsZSJwl3CRe5npy/3+Y+kP1 nyswCbQs8IANJgyeOg4OJivcUXmQFSjtfPVDbNbyYyhmLaC+VPPKCz8oj0Nzlu6eoO 73wj8oc5pWKHAdj9MObAotfRchO3nIi1DUbHzHMpQJiUEYpX0vA/43T6mbvdWssdo9 PWfmNmt8gXA0tGvP7c4ad13rD4kIgVEk+5oNtFTniWWefhrser7RmOcdrSlstgtkk7 LRT9gBObeyAVQ== From: Conor Dooley To: linux-riscv@lists.infradead.org Cc: Conor Dooley , Arnd Bergmann , Christoph Hellwig , Damien Le Moal , Emil Renner Berthing , Geert Uytterhoeven , Heiko Stuebner , Palmer Dabbelt , Samuel Holland Subject: [PATCH v1 5/7] RISC-V: stop selecting the PolarFire SoC clock driver Date: Mon, 21 Nov 2022 22:14:13 +0000 Message-Id: <20221121221414.109965-6-conor@kernel.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221121221414.109965-1-conor@kernel.org> References: <20221121221414.109965-1-conor@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221121_141829_022085_CA07C4D5 X-CRM114-Status: GOOD ( 11.89 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org From: Conor Dooley The driver is now enabled by default if SOC_MICROCHIP_POLARFIRE so there is no longer a need to select it in Kconfig.socs Signed-off-by: Conor Dooley --- arch/riscv/Kconfig.socs | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/riscv/Kconfig.socs b/arch/riscv/Kconfig.socs index ce920f627f6d..aca5e750772c 100644 --- a/arch/riscv/Kconfig.socs +++ b/arch/riscv/Kconfig.socs @@ -5,7 +5,6 @@ config ARCH_MICROCHIP_POLARFIRE config SOC_MICROCHIP_POLARFIRE bool "Microchip PolarFire SoCs" - select MCHP_CLK_MPFS help This enables support for Microchip PolarFire SoC platforms. From patchwork Mon Nov 21 22:14:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Conor Dooley X-Patchwork-Id: 13051687 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0CCC0C4332F for ; Mon, 21 Nov 2022 22:18:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=e/1zWx4EBq5+EBPnUVdcY3D30sPOYo0xqyYdUmvgFb4=; b=ecd6iNUiK8d8Pz Yzfu719B25JPz9Axcpn6/RP9DrAZzX4MhRg5JISom+qy0+tjcHKRV7fN4/DQvgZErtQNU9lUwsuhM HUzpBouilKVT2tZ5o4dSJYbniQ+jR1CS675KQx96thFPBloIvJtjnNXZNmPdQX/yPyxa5ELT5t85f Mdw1nn1xvx8L89IBlCzRGXb7AH/XadGPHO1ONzD8nCLcuRnXCjcWuI1Tx8gBKbazy5zG0NFMwKmXJ GJVvgqMIsdAoGBSxfyTC28AXuc93JRcsmGklQ/GYFy2emTl7QMhH1bLhLJqaC7Gn4eSBLa+rvgN28 8lTj3tZ+O36iPR6QqqFw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oxF7a-000mVD-7u; Mon, 21 Nov 2022 22:18:34 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oxF7V-000mQa-M1 for linux-riscv@lists.infradead.org; Mon, 21 Nov 2022 22:18:31 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 4266B6149F; Mon, 21 Nov 2022 22:18:29 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9F925C433D6; Mon, 21 Nov 2022 22:18:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1669069108; bh=TYvibF/sO0W4k/n9Ss/JUmsxEP0GfE6ckLgGytOKLAk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eq+jtHDTB4XHFwTKDIfZjjsRIbCER/xhrT0UZqxYSLeHrHd4mbWO7eX77rpCkQ9bj /3MDFxEGm1a7b15o/rMoFNUux6y7M/EIFsAcGGq0BgWgs97CvnzUeG9sHozkpQ2FMP T9rhA0hRdgD76EjaOFe/GChmxSbfZW6dNWSt9/wbgJNEFvH6isExdUNkOSTF5ZB0zs Rwq1Cx8qwGLeYEDPGc39UCjHydtKVCD4EFROTYlSFbdi7GaZkBcoLlZtEA7wdJ30ax Czd1KXFK1kBh/K+jGLZYt72+S1Ttri3FWlVXXfMZ3NNkVqTHlU2WNQVHAADWwcfw3/ PUEvLynh3gldQ== From: Conor Dooley To: linux-riscv@lists.infradead.org Cc: Conor Dooley , Arnd Bergmann , Christoph Hellwig , Damien Le Moal , Emil Renner Berthing , Geert Uytterhoeven , Heiko Stuebner , Palmer Dabbelt , Samuel Holland Subject: [PATCH v1 6/7] RISC-V: stop selecting SiFive clock and serial drivers directly Date: Mon, 21 Nov 2022 22:14:14 +0000 Message-Id: <20221121221414.109965-7-conor@kernel.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221121221414.109965-1-conor@kernel.org> References: <20221121221414.109965-1-conor@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221121_141829_788721_10245C29 X-CRM114-Status: GOOD ( 10.61 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org From: Conor Dooley The SiFive clock and serial drivers will now default to the value of SOC_SIFIVE so there is no need to directly select their symbols anymore. Signed-off-by: Conor Dooley --- arch/riscv/Kconfig.socs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/arch/riscv/Kconfig.socs b/arch/riscv/Kconfig.socs index aca5e750772c..b90af1e22bc0 100644 --- a/arch/riscv/Kconfig.socs +++ b/arch/riscv/Kconfig.socs @@ -18,10 +18,6 @@ config ARCH_SIFIVE config SOC_SIFIVE bool "SiFive SoCs" - select SERIAL_SIFIVE if TTY - select SERIAL_SIFIVE_CONSOLE if TTY - select CLK_SIFIVE - select CLK_SIFIVE_PRCI select ERRATA_SIFIVE if !XIP_KERNEL help This enables support for SiFive SoC platform hardware. From patchwork Mon Nov 21 22:14:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Conor Dooley X-Patchwork-Id: 13051689 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8BB13C4332F for ; Mon, 21 Nov 2022 22:18:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=tGjfaa+JiQJdt6F7XcaVCoQEP77JbN9xvJUOX/GD9gA=; b=ChhG2duK3WqZKQ 7KdnfGcxcDGI8v9ZsDCFAWK47KUhl1CFrhziArw8uqkEZxVatIUsWEzCwMrkhbY4/C5V6ZoSw5o+A sk08WGkkogzbrdzUFAbLTA7Hie7E4LWi1spOE307jh5zktJq6TATZ8JlNde7JgH/6WLUMcbhCivkl TJ11BFTXb/XxvEgr3dCKmNqzUIIFWDzjW8zmfHzP2/FEgleH2Yyvx0nkI9KPYoYvzFa7cmk+zxF6m emNVrhaiL6bDqIqCa2z+49AyZ2VBxrt8SIxItcCVPIXCocQLlZrjke1bi3ZTIOiC+y/xZm/NfaZ/q Q1unLRWYe6BWAIkmehog==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oxF7e-000mYN-1D; Mon, 21 Nov 2022 22:18:38 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oxF7Y-000mTi-M1 for linux-riscv@lists.infradead.org; Mon, 21 Nov 2022 22:18:33 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id B6A206149F; Mon, 21 Nov 2022 22:18:31 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1D1E3C433C1; Mon, 21 Nov 2022 22:18:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1669069111; bh=6yvpjQYCQCs9/62nLOCVqcxUwiSZDzo3MdFQLazZ1sU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ykj9ObagLLB8i8gcOlwGV1Ln4Pn0fmNMmgrA3Gd9AW8dLrV02yxNgazaH7tx47sLL wNyc7yuShBosN6vq1R9G2kvXZ/0VCae7/jXubXAlcwsmhYpmY5jS70JvQICquA8YbA e7ZCbra+Dx3QQ/2oQ2PnTNPdmmfU8BdUSWhxDkR8gLvLD9+yfZJmIyQIZUp8tE6Unq zUWZueG3828YIpWNvgVRVGkkSV7uW5R8R1BYAutxO2/765RevykkncQW8yDyvX2Avf B66PXvhH/kD6ca0daKJZCI/RvyiW5t8S5XGKnDMUHHLEcYU+2XZ8LHug80N4Na0nAm CBH/Z158CQzwQ== From: Conor Dooley To: linux-riscv@lists.infradead.org Cc: Conor Dooley , Arnd Bergmann , Christoph Hellwig , Damien Le Moal , Emil Renner Berthing , Geert Uytterhoeven , Heiko Stuebner , Palmer Dabbelt , Samuel Holland Subject: [PATCH v1 7/7] RISC-V: stop directly selecting drivers for SOC_CANAAN Date: Mon, 21 Nov 2022 22:14:15 +0000 Message-Id: <20221121221414.109965-8-conor@kernel.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221121221414.109965-1-conor@kernel.org> References: <20221121221414.109965-1-conor@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221121_141832_764770_A367EBBB X-CRM114-Status: GOOD ( 10.43 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org From: Conor Dooley The serial and clock drivers will be enabled by default if the symbol itself is enabled, so stop directly selecting the drivers in Kconfigs.socs. Signed-off-by: Conor Dooley --- arch/riscv/Kconfig.socs | 3 --- 1 file changed, 3 deletions(-) diff --git a/arch/riscv/Kconfig.socs b/arch/riscv/Kconfig.socs index b90af1e22bc0..34a54e5310a1 100644 --- a/arch/riscv/Kconfig.socs +++ b/arch/riscv/Kconfig.socs @@ -56,12 +56,9 @@ config SOC_CANAAN bool "Canaan Kendryte K210 SoC" depends on !MMU select CLINT_TIMER if RISCV_M_MODE - select SERIAL_SIFIVE if TTY - select SERIAL_SIFIVE_CONSOLE if TTY select ARCH_HAS_RESET_CONTROLLER select PINCTRL select COMMON_CLK - select COMMON_CLK_K210 help This enables support for Canaan Kendryte K210 SoC platform hardware.