From patchwork Sat Nov 26 19:13:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Holland X-Patchwork-Id: 26289 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp4787799wrr; Sat, 26 Nov 2022 11:19:24 -0800 (PST) X-Google-Smtp-Source: AA0mqf4HUmDf7f9Kj1QAmQOIGvwylF/hU17lLc2ZI7kTSYDCdwo+GaR++ZnwC8LMa79K9yznrCwu X-Received: by 2002:aa7:c0ca:0:b0:464:3f28:3707 with SMTP id j10-20020aa7c0ca000000b004643f283707mr41461445edp.411.1669490363857; Sat, 26 Nov 2022 11:19:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669490363; cv=none; d=google.com; s=arc-20160816; b=e8T7bU5HJ7Uud3QeEa9PIw5Cv4ciPt0mh32x5cIbwKlZKX2Hz8ieJlNMcQhv9hZenZ 1ikrVyu99V2nfObST8ZcMNIQJIxaQSGjkoW4r2ieMgk1L0qQhaaI3q6G4IxBlv9obWGY +EGWNaAQQ1W2d+MS6hvCkR4JLK63DVPcumFfAr/6rFsib0Jf1j6udYFRO/zqTjxYrgqN x0CIQJNYM4ooi0tAX0W5y+ZRa4XqmOf6auRA+LWZqyxvslXQjbMuu0Cnff8AMQ3ke7o0 o0a6d0/vAUjfcgxyRGcmZtKeeMlOIzaUcEg31VxFAgFJbf9vu1DSznrrRlrb96GKgEo6 aUNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :feedback-id:dkim-signature:dkim-signature; bh=WBZnL6dt+cJ0K4wgFwwV3Z/VQP7SY23Z7IY/5H+lKxk=; b=yOkl7ILdKi4JFzlMhFUGC95VH9p2gEOBAxSQ2LkqyTZDVPy52o2MFbo4xW+L7kUEKe hCyNxRUaT9jwKqXMHnd//noXTnltn/Na3tKoBdFufsofSvWb2x7/fq7Pys/Nu8C0gEUq vm1hC89h8hfC2Luf3/Ftn7P9zIGNzs8exB81RyaTnqxEqxdMYwakaj9aGVUApNdgzmox MwtB6gEu4wAjLicSxZ0klOWRXnQWoJ3PkG07c4AhkzX7ECno1fR9AMIbw6TkBQAhB+mz EBQ/72JquZ0lshAEIb5r+9hDvUkWkNG6ah/p4NXhT4enGBKXhW6jJkLXe/fvsmlJz6/E sp6g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sholland.org header.s=fm2 header.b=ljW3OeFw; dkim=pass header.i=@messagingengine.com header.s=fm1 header.b=KEB+L2vX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sholland.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id xh2-20020a170906da8200b007826cb6f57csi5636093ejb.407.2022.11.26.11.18.57; Sat, 26 Nov 2022 11:19:23 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@sholland.org header.s=fm2 header.b=ljW3OeFw; dkim=pass header.i=@messagingengine.com header.s=fm1 header.b=KEB+L2vX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sholland.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229671AbiKZTN3 (ORCPT + 99 others); Sat, 26 Nov 2022 14:13:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55172 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229569AbiKZTN0 (ORCPT ); Sat, 26 Nov 2022 14:13:26 -0500 Received: from out5-smtp.messagingengine.com (out5-smtp.messagingengine.com [66.111.4.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 57623270C; Sat, 26 Nov 2022 11:13:24 -0800 (PST) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id E758E5C009D; Sat, 26 Nov 2022 14:13:22 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Sat, 26 Nov 2022 14:13:22 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sholland.org; h= cc:cc:content-transfer-encoding:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm2; t=1669490002; x=1669576402; bh=WB ZnL6dt+cJ0K4wgFwwV3Z/VQP7SY23Z7IY/5H+lKxk=; b=ljW3OeFw/MLqRU3xx+ 6FGOIzEjJ2ixL+dVvwQBa9CoRBxN/CReCx5UBZqQrShaonkRrPKBpN0KTckwb/0o PANH2jueQ5OMHdAqoOJhq1/ly3qU8+n1foYOdfAJ3zrUNgaxRr9/9JuJuhhu9aqS +Dq12pCN+bn5HhHzAnP0rK7ptl3V2WnGn6RxNZNKYCaAeO8SxyB4Pwg1bFO4UP7L 2UILN1vHHbzA5BiuKI69bFJkYNSxop1QKxMSzrRmcw27UbLGrjyDW0bSTujAqDgG x/8DyZChge/na084AREirveBBw6wqkbyhERCghI1J8/JMkGZBmkOfxiaesrYNvwn MGKg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; t=1669490002; x=1669576402; bh=WBZnL6dt+cJ0K 4wgFwwV3Z/VQP7SY23Z7IY/5H+lKxk=; b=KEB+L2vXsob+UbdaPAoZ2LONvoCMN QRp1f9b6sPfUWxgJPj2WJzWvNzYe5pagxy/VdQwVzv1i15+vcatz1gHpRJXC/X4a WI6JUbiWLpzMDYrCNMqqjJxmobyRxYB3dXtut3JVmouiNEOnNqV8pdSU6mKTVQtg hVGmPyrsp1zR/S9dfeDx/0rShjlXKsyN/V4HWy9W1dOrzd87qNxky4+gzPVzgvkj yDiz6a5E6ipa7pogX/XCVXYXyUGxtKrajDeAXj4jkXOB4NLJJ1/7/dcAH1LngNxP GAhlin7xxFemLdhArUC6Bmeo7MlarT464H6ufe/3uhafarfKwHSjCLAwA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvgedrieejgdduvdegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomhepufgrmhhu vghlucfjohhllhgrnhguuceoshgrmhhuvghlsehshhholhhlrghnugdrohhrgheqnecugg ftrfgrthhtvghrnhepudekteeuudehtdelteevgfduvddvjefhfedulefgudevgeeghefg udefiedtveetnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrh homhepshgrmhhuvghlsehshhholhhlrghnugdrohhrgh X-ME-Proxy: Feedback-ID: i0ad843c9:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 26 Nov 2022 14:13:22 -0500 (EST) From: Samuel Holland To: Chen-Yu Tsai , Jernej Skrabec , Michael Turquette , Stephen Boyd Cc: Samuel Holland , Krzysztof Kozlowski , Philipp Zabel , Rob Herring , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, linux-sunxi@lists.linux.dev Subject: [PATCH 1/5] clk: sunxi-ng: Remove duplicate ARCH_SUNXI dependencies Date: Sat, 26 Nov 2022 13:13:15 -0600 Message-Id: <20221126191319.6404-2-samuel@sholland.org> X-Mailer: git-send-email 2.37.4 In-Reply-To: <20221126191319.6404-1-samuel@sholland.org> References: <20221126191319.6404-1-samuel@sholland.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,SPF_HELO_PASS, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750587527477388176?= X-GMAIL-MSGID: =?utf-8?q?1750587527477388176?= SUNXI_CCU already depends on ARCH_SUNXI, so adding the dependency to individual SoC drivers is redundant. Signed-off-by: Samuel Holland Acked-by: Jernej Skrabec --- drivers/clk/sunxi-ng/Kconfig | 43 ++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/drivers/clk/sunxi-ng/Kconfig b/drivers/clk/sunxi-ng/Kconfig index 461537679c04..64cfa022e320 100644 --- a/drivers/clk/sunxi-ng/Kconfig +++ b/drivers/clk/sunxi-ng/Kconfig @@ -14,43 +14,43 @@ config SUNIV_F1C100S_CCU config SUN20I_D1_CCU tristate "Support for the Allwinner D1 CCU" - default RISCV && ARCH_SUNXI - depends on (RISCV && ARCH_SUNXI) || COMPILE_TEST + default RISCV + depends on RISCV || COMPILE_TEST config SUN20I_D1_R_CCU tristate "Support for the Allwinner D1 PRCM CCU" - default RISCV && ARCH_SUNXI - depends on (RISCV && ARCH_SUNXI) || COMPILE_TEST + default RISCV + depends on RISCV || COMPILE_TEST config SUN50I_A64_CCU tristate "Support for the Allwinner A64 CCU" - default ARM64 && ARCH_SUNXI - depends on (ARM64 && ARCH_SUNXI) || COMPILE_TEST + default ARM64 + depends on ARM64 || COMPILE_TEST config SUN50I_A100_CCU tristate "Support for the Allwinner A100 CCU" - default ARM64 && ARCH_SUNXI - depends on (ARM64 && ARCH_SUNXI) || COMPILE_TEST + default ARM64 + depends on ARM64 || COMPILE_TEST config SUN50I_A100_R_CCU tristate "Support for the Allwinner A100 PRCM CCU" - default ARM64 && ARCH_SUNXI - depends on (ARM64 && ARCH_SUNXI) || COMPILE_TEST + default ARM64 + depends on ARM64 || COMPILE_TEST config SUN50I_H6_CCU tristate "Support for the Allwinner H6 CCU" - default ARM64 && ARCH_SUNXI - depends on (ARM64 && ARCH_SUNXI) || COMPILE_TEST + default ARM64 + depends on ARM64 || COMPILE_TEST config SUN50I_H616_CCU tristate "Support for the Allwinner H616 CCU" - default ARM64 && ARCH_SUNXI - depends on (ARM64 && ARCH_SUNXI) || COMPILE_TEST + default ARM64 + depends on ARM64 || COMPILE_TEST config SUN50I_H6_R_CCU tristate "Support for the Allwinner H6 and H616 PRCM CCU" - default ARM64 && ARCH_SUNXI - depends on (ARM64 && ARCH_SUNXI) || COMPILE_TEST + default ARM64 + depends on ARM64 || COMPILE_TEST config SUN4I_A10_CCU tristate "Support for the Allwinner A10/A20 CCU" @@ -71,8 +71,7 @@ config SUN6I_A31_CCU config SUN6I_RTC_CCU tristate "Support for the Allwinner H616/R329 RTC CCU" - default ARCH_SUNXI - depends on ARCH_SUNXI || COMPILE_TEST + default y config SUN8I_A23_CCU tristate "Support for the Allwinner A23 CCU" @@ -91,8 +90,8 @@ config SUN8I_A83T_CCU config SUN8I_H3_CCU tristate "Support for the Allwinner H3 CCU" - default MACH_SUN8I || (ARM64 && ARCH_SUNXI) - depends on MACH_SUN8I || (ARM64 && ARCH_SUNXI) || COMPILE_TEST + default MACH_SUN8I || ARM64 + depends on MACH_SUN8I || ARM64 || COMPILE_TEST config SUN8I_V3S_CCU tristate "Support for the Allwinner V3s CCU" @@ -101,7 +100,7 @@ config SUN8I_V3S_CCU config SUN8I_DE2_CCU tristate "Support for the Allwinner SoCs DE2 CCU" - default MACH_SUN8I || (ARM64 && ARCH_SUNXI) + default MACH_SUN8I || ARM64 config SUN8I_R40_CCU tristate "Support for the Allwinner R40 CCU" @@ -115,6 +114,6 @@ config SUN9I_A80_CCU config SUN8I_R_CCU tristate "Support for Allwinner SoCs' PRCM CCUs" - default MACH_SUN8I || (ARCH_SUNXI && ARM64) + default MACH_SUN8I || ARM64 endif From patchwork Sat Nov 26 19:13:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Holland X-Patchwork-Id: 26291 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp4789159wrr; Sat, 26 Nov 2022 11:23:47 -0800 (PST) X-Google-Smtp-Source: AA0mqf5ZIWGisEVdvpCYHrA52qG+VSyDllm2ifl95TSvysoxycYETuQj3sQN79wrI1kgqyEKVt4k X-Received: by 2002:a17:906:ce2d:b0:7ba:b9a:5e7e with SMTP id sd13-20020a170906ce2d00b007ba0b9a5e7emr15373249ejb.735.1669490627829; Sat, 26 Nov 2022 11:23:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669490627; cv=none; d=google.com; s=arc-20160816; b=g2mTZ1oB/yK9HbG6YtKxQkofwK+IV+xIr6a9Cg1VMMrzAQ3aG3xY+x7y1KqrDjsMh+ XzjiOFFFCx6Hp42jy1w83gSS7uIGEbONylcwRo1czVaC4kM+aeDuceja1k069kz7Nk4f TaqtDtz2oASXucKt+i4bXiaf8C6nU2o/bZssHj2+QLKbBIWY/pceDSIdtnH4xuF9lwDn kFOy6t03eI4Vig1/HmF3xTnNFE6ZhBHLC/bBlhof27kx6HK3A+yMy3tN9NHiRqfzAHdf ugDZituNjg+YiSgkPFB329WclTg0fD2g5dlSZTQ0DJVcg6ScuQU7B85uuKpGsYV0KhEf 7FfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :feedback-id:dkim-signature:dkim-signature; bh=IIQnEU1ApCpzmmFpwW0kJws1Kx0hjhSPmbG71lo6d3w=; b=yy+Aed/kjyjq7Q6VgoPz0FFPfsBwAciluKbdYc9Q8/YI0b4YiGiDmCMDjnvCnSwTiT +2NYKEbyuR/tb6D5v9bWPxX1qO2SV6GBSCT1C3pi+dL5iF8XQJ/LcM59/yx3DFU07bLD mEe31bwEzKbrmqLU2pITZK3ms+ofRSsmQtoPcvSFTCRuE8TkbNZAE9Vjnf0iOJ2WbHcw 4tB/xWYRFEwiesi73hv8eA81JjxXxvJKmEkOmRML/6qMm6eCzmYWnWGyZgkkiQW6bSaA wrHO5aMh7cK4DvsfRFVSzGM6GvMM2b4D7Tci9aJwWIC4zYPQHxTi97jdHCAwgrWmaS9e LbrQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sholland.org header.s=fm2 header.b=tx86Rio4; dkim=pass header.i=@messagingengine.com header.s=fm1 header.b=riqM1hOc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sholland.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c20-20020a05640227d400b0046ac13261a1si5078978ede.459.2022.11.26.11.23.21; Sat, 26 Nov 2022 11:23:47 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@sholland.org header.s=fm2 header.b=tx86Rio4; dkim=pass header.i=@messagingengine.com header.s=fm1 header.b=riqM1hOc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sholland.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229706AbiKZTNe (ORCPT + 99 others); Sat, 26 Nov 2022 14:13:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55174 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229648AbiKZTN0 (ORCPT ); Sat, 26 Nov 2022 14:13:26 -0500 Received: from out5-smtp.messagingengine.com (out5-smtp.messagingengine.com [66.111.4.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 579C26249; Sat, 26 Nov 2022 11:13:24 -0800 (PST) Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 570B55C0092; Sat, 26 Nov 2022 14:13:24 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Sat, 26 Nov 2022 14:13:24 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sholland.org; h= cc:cc:content-transfer-encoding:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm2; t=1669490004; x=1669576404; bh=II QnEU1ApCpzmmFpwW0kJws1Kx0hjhSPmbG71lo6d3w=; b=tx86Rio4gV+A61C65Z hPIZdg99YSLfe5e5y7FabW/3+YpJ4IYtFctY7nrU8qe5qC1bTDG7M+SCWczRNM4+ CEXYJWZge0kXXZBYxLRmMAZyj9nmvuortT3IplifFu+8gE2/Vni7s1H9M36dlVmM nEWUjqVN6iuDxHj8Bpql0Z86lWdYFcLzCBGjQIHTJ7vyxJ9emRv+l3T2gzsJFFcJ r5RkV5o+DMpq4i8lwxu6KSTIIJ+XKZcPlerGZn268sob/AZXqQN2RSfw6MK/WDXk Cb9rDx1lCOvBNY7YbDY/02pgd05pnQWyzHpe8FnKY8aUrsXyB4coMtsBvnBwkmTa Xliw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; t=1669490004; x=1669576404; bh=IIQnEU1ApCpzm mFpwW0kJws1Kx0hjhSPmbG71lo6d3w=; b=riqM1hOcmGIrWu874dr1sy4wqBMQr yCH0/DUzwWL2IVFupFsCAxW644mrtUKOEiVhGROmPpKvqymJ3jKEJ+7LsW9hvkBF 02exr/M6qr1uXFNp9ySBKfTM9yjGds7F4IV0O46llZ264SZl6ob9Tg4qXdmmL306 XVwBt/heLwTkju8TU2GSN0lwBfqF/vskNq2ipPWGTu/G8C2x7Q050FRdEaKAqUa5 3PFMD+wIrsm9lYTksCQcSRxN9YcoNn7viAH92NDhocTPLXquUlnbfc+hcBKWAMHJ f9dzUdBh/X0jq0zHKAMGNIjVzhkihTUEYvJlH26/jFc3/wukiRsYrio7w== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvgedrieejgdduvdegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomhepufgrmhhu vghlucfjohhllhgrnhguuceoshgrmhhuvghlsehshhholhhlrghnugdrohhrgheqnecugg ftrfgrthhtvghrnhepudekteeuudehtdelteevgfduvddvjefhfedulefgudevgeeghefg udefiedtveetnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrh homhepshgrmhhuvghlsehshhholhhlrghnugdrohhrgh X-ME-Proxy: Feedback-ID: i0ad843c9:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 26 Nov 2022 14:13:23 -0500 (EST) From: Samuel Holland To: Chen-Yu Tsai , Jernej Skrabec , Michael Turquette , Stephen Boyd Cc: Samuel Holland , Krzysztof Kozlowski , Philipp Zabel , Rob Herring , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, linux-sunxi@lists.linux.dev Subject: [PATCH 2/5] clk: sunxi-ng: Move SoC driver conditions to dependencies Date: Sat, 26 Nov 2022 13:13:16 -0600 Message-Id: <20221126191319.6404-3-samuel@sholland.org> X-Mailer: git-send-email 2.37.4 In-Reply-To: <20221126191319.6404-1-samuel@sholland.org> References: <20221126191319.6404-1-samuel@sholland.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,SPF_HELO_PASS, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750587804404120533?= X-GMAIL-MSGID: =?utf-8?q?1750587804404120533?= Do not duplicate the same expression on the `default` line, so the two lines do not need to be kept in sync. Drivers stay disabled under COMPILE_TEST because of the `default ARCH_SUNXI` applied to SUNXI_CCU. Three drivers had no conditions. - SUN6I_RTC_CCU and SUN8I_DE2_CCU are used on current hardware regardless of CPU architecture. - SUN8I_R_CCU is only used on pre-H6 SoCs, which means no RISCV SoCs. Signed-off-by: Samuel Holland Acked-by: Jernej Skrabec --- drivers/clk/sunxi-ng/Kconfig | 46 +++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/drivers/clk/sunxi-ng/Kconfig b/drivers/clk/sunxi-ng/Kconfig index 64cfa022e320..78deee2996ce 100644 --- a/drivers/clk/sunxi-ng/Kconfig +++ b/drivers/clk/sunxi-ng/Kconfig @@ -9,111 +9,113 @@ if SUNXI_CCU config SUNIV_F1C100S_CCU tristate "Support for the Allwinner newer F1C100s CCU" - default MACH_SUNIV + default y depends on MACH_SUNIV || COMPILE_TEST config SUN20I_D1_CCU tristate "Support for the Allwinner D1 CCU" - default RISCV + default y depends on RISCV || COMPILE_TEST config SUN20I_D1_R_CCU tristate "Support for the Allwinner D1 PRCM CCU" - default RISCV + default y depends on RISCV || COMPILE_TEST config SUN50I_A64_CCU tristate "Support for the Allwinner A64 CCU" - default ARM64 + default y depends on ARM64 || COMPILE_TEST config SUN50I_A100_CCU tristate "Support for the Allwinner A100 CCU" - default ARM64 + default y depends on ARM64 || COMPILE_TEST config SUN50I_A100_R_CCU tristate "Support for the Allwinner A100 PRCM CCU" - default ARM64 + default y depends on ARM64 || COMPILE_TEST config SUN50I_H6_CCU tristate "Support for the Allwinner H6 CCU" - default ARM64 + default y depends on ARM64 || COMPILE_TEST config SUN50I_H616_CCU tristate "Support for the Allwinner H616 CCU" - default ARM64 + default y depends on ARM64 || COMPILE_TEST config SUN50I_H6_R_CCU tristate "Support for the Allwinner H6 and H616 PRCM CCU" - default ARM64 + default y depends on ARM64 || COMPILE_TEST config SUN4I_A10_CCU tristate "Support for the Allwinner A10/A20 CCU" - default MACH_SUN4I - default MACH_SUN7I + default y depends on MACH_SUN4I || MACH_SUN7I || COMPILE_TEST config SUN5I_CCU bool "Support for the Allwinner sun5i family CCM" - default MACH_SUN5I + default y depends on MACH_SUN5I || COMPILE_TEST depends on SUNXI_CCU=y config SUN6I_A31_CCU tristate "Support for the Allwinner A31/A31s CCU" - default MACH_SUN6I + default y depends on MACH_SUN6I || COMPILE_TEST config SUN6I_RTC_CCU tristate "Support for the Allwinner H616/R329 RTC CCU" default y + depends on MACH_SUN8I || ARM64 || RISCV || COMPILE_TEST config SUN8I_A23_CCU tristate "Support for the Allwinner A23 CCU" - default MACH_SUN8I + default y depends on MACH_SUN8I || COMPILE_TEST config SUN8I_A33_CCU tristate "Support for the Allwinner A33 CCU" - default MACH_SUN8I + default y depends on MACH_SUN8I || COMPILE_TEST config SUN8I_A83T_CCU tristate "Support for the Allwinner A83T CCU" - default MACH_SUN8I + default y depends on MACH_SUN8I || COMPILE_TEST config SUN8I_H3_CCU tristate "Support for the Allwinner H3 CCU" - default MACH_SUN8I || ARM64 + default y depends on MACH_SUN8I || ARM64 || COMPILE_TEST config SUN8I_V3S_CCU tristate "Support for the Allwinner V3s CCU" - default MACH_SUN8I + default y depends on MACH_SUN8I || COMPILE_TEST config SUN8I_DE2_CCU tristate "Support for the Allwinner SoCs DE2 CCU" - default MACH_SUN8I || ARM64 + default y + depends on MACH_SUN8I || ARM64 || RISCV || COMPILE_TEST config SUN8I_R40_CCU tristate "Support for the Allwinner R40 CCU" - default MACH_SUN8I + default y depends on MACH_SUN8I || COMPILE_TEST config SUN9I_A80_CCU tristate "Support for the Allwinner A80 CCU" - default MACH_SUN9I + default y depends on MACH_SUN9I || COMPILE_TEST config SUN8I_R_CCU tristate "Support for Allwinner SoCs' PRCM CCUs" - default MACH_SUN8I || ARM64 + default y + depends on MACH_SUN8I || ARM64 || COMPILE_TEST endif From patchwork Sat Nov 26 19:13:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Holland X-Patchwork-Id: 26292 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp4789282wrr; Sat, 26 Nov 2022 11:24:12 -0800 (PST) X-Google-Smtp-Source: AA0mqf72XS+/IcpuUrGtJ/W5uUf/PEAl0wB5fEbWnWeXQ1gpf1sss0d1Kr6raInkPbjj9C59cuxK X-Received: by 2002:aa7:c511:0:b0:469:7731:5b29 with SMTP id o17-20020aa7c511000000b0046977315b29mr31171433edq.419.1669490652672; Sat, 26 Nov 2022 11:24:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669490652; cv=none; d=google.com; s=arc-20160816; b=rVJFXmU/gjSEAr6PhOWkmhMNnJMtWsd6T6MPCBZehwGQ+Fwb4pmHixGflkok0FX06y L+ZISTDtb+bHtCkne7aI8aEh07wTd4ZCqV0i/tRLlBGMBmB8g2JB8R8gfUufw8Dp9J99 XhlZwn+lrBKXPiCco8R0Z+C5VFLbTap8NYp2tLWR3WbYzAOTMegtLwJXpwNvuijvTlrP uriAn7JjihFZ/SKYGqq3qUqVJClvvA+jQoi0CUsRNaQfhbxVOG/eXtqUNJZBpfY8LlcR N5vDUMGxMP1ghA0iEiWKTvU9X3yUpbl9ReBywR65l0iYimnHJzrbx6g7VEBMZ62KCF+F UFcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :feedback-id:dkim-signature:dkim-signature; bh=5+2cpxT9OMwkKRjZz9E1L3Vr/vQhE8GfSwdHcjXgklc=; b=MXjxOCFpyWzDdnttSnbZy4XuSaGaGWFcwBDtHaFIOOBPIQFDxiRi9dDD0L/SbEqpB4 Nei42aAz/i+vQUXchKaYH5viOM/UqMtIvW4iCPxC6kqoLLxp1ls9tL/nDiUgcdVaTajE PBH7KkMSIcAdxfrDNEwwfcdg/G95sfkOiBoDCbnBaJtkn+v+tKmp3crDu8FugH/Uqc3G k2R+q0qKEv5Q6WBHidIBHwz1KNrW+MCZjxDh4hpORkLuvvfzWthDHUa9R/k4C0Cer+mU d5EkJdKY7ahYiueso48WG07S9eQpIb9PncxyJHqbnJtKoN488/xaC2fDDE8zHJWv2MVy ku9g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sholland.org header.s=fm2 header.b=HQakI9Oj; dkim=pass header.i=@messagingengine.com header.s=fm1 header.b=GSS1+Vtt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sholland.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id gs44-20020a1709072d2c00b0078d473448afsi7351426ejc.233.2022.11.26.11.23.47; Sat, 26 Nov 2022 11:24:12 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@sholland.org header.s=fm2 header.b=HQakI9Oj; dkim=pass header.i=@messagingengine.com header.s=fm1 header.b=GSS1+Vtt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sholland.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229712AbiKZTNg (ORCPT + 99 others); Sat, 26 Nov 2022 14:13:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55180 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229657AbiKZTN1 (ORCPT ); Sat, 26 Nov 2022 14:13:27 -0500 Received: from out5-smtp.messagingengine.com (out5-smtp.messagingengine.com [66.111.4.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 17541B7EC; Sat, 26 Nov 2022 11:13:26 -0800 (PST) Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id 836435C00A2; Sat, 26 Nov 2022 14:13:25 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Sat, 26 Nov 2022 14:13:25 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sholland.org; h= cc:cc:content-transfer-encoding:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm2; t=1669490005; x=1669576405; bh=5+ 2cpxT9OMwkKRjZz9E1L3Vr/vQhE8GfSwdHcjXgklc=; b=HQakI9OjXZzrgnmI3R wqBkQBvTbY0Ij6NPV6gzKIuAZjCMku1ETpNhDI75cj0HMnq1xf3F1QY1OB9mgzeG p0iP8tsSCcLulMswkHbAsYDD+P014ITZSAjZc4f5vj142Z45hHNBOiJjKZt5UIbZ diMWWQYTFplqCZdh4yxK+Bcm0mcY+M0zIvvd88HXFTgxp695219wJI/hOdIsINQV OOULH+ucIKsdDtiXC0wxvlViM+IywOWHj6ZqmLtXVaMiMcm2d/dpjVkiOB6va8Zo MlvXlh8YmGPZPmdCHOOP30ly5rvNA4SkMbYEYDMNdf5wG7pMloNJWrd++I/fZ2qr GNZQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; t=1669490005; x=1669576405; bh=5+2cpxT9OMwkK RjZz9E1L3Vr/vQhE8GfSwdHcjXgklc=; b=GSS1+VttQdaaaavZB4rd3Xt8cLQ9Q uthYlnEaGxyPbYJcIinSoux1/KvZ80yzypFOxj+dOsLZ9GY7oIJg/rKLWHK4Re/E YA5tA3FYAwAdSrBSkefMXmRwFBLUapJebcZci97rJANXxwP+dvZAM9Hb14m9E9GP ylWfHGhzKHh0U4nZMhd34GVxetwHdNXAUH5FFCw+iwdwrWlF+jEwfDBcXnj1GdIF hGpt5YJfK/ji24wbfcCa0slUn4Ex39EeJrTmxXnNBHtRK6DtCS+Y9qIeZCi4Nz74 RkN3i+1Ql5zSmtl2Guoq6/w2JKDRyLj4aL/VqJGQNj9wM4xbO3KMbwOEQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvgedrieejgdduvdegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomhepufgrmhhu vghlucfjohhllhgrnhguuceoshgrmhhuvghlsehshhholhhlrghnugdrohhrgheqnecugg ftrfgrthhtvghrnhepudekteeuudehtdelteevgfduvddvjefhfedulefgudevgeeghefg udefiedtveetnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrh homhepshgrmhhuvghlsehshhholhhlrghnugdrohhrgh X-ME-Proxy: Feedback-ID: i0ad843c9:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 26 Nov 2022 14:13:24 -0500 (EST) From: Samuel Holland To: Chen-Yu Tsai , Jernej Skrabec , Michael Turquette , Stephen Boyd Cc: Samuel Holland , Krzysztof Kozlowski , Philipp Zabel , Rob Herring , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, linux-sunxi@lists.linux.dev Subject: [PATCH 3/5] clk: sunxi-ng: d1: Allow building for R528/T113 Date: Sat, 26 Nov 2022 13:13:17 -0600 Message-Id: <20221126191319.6404-4-samuel@sholland.org> X-Mailer: git-send-email 2.37.4 In-Reply-To: <20221126191319.6404-1-samuel@sholland.org> References: <20221126191319.6404-1-samuel@sholland.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,SPF_HELO_PASS, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750587830597713993?= X-GMAIL-MSGID: =?utf-8?q?1750587830597713993?= Allwinner released some 32-bit ARM (sun8i) SoCs which use the same CCU as D1. Allow them to reuse the driver. Signed-off-by: Samuel Holland Reviewed-by: Andre Przywara Acked-by: Jernej Skrabec --- drivers/clk/sunxi-ng/Kconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/clk/sunxi-ng/Kconfig b/drivers/clk/sunxi-ng/Kconfig index 78deee2996ce..b547198a2c65 100644 --- a/drivers/clk/sunxi-ng/Kconfig +++ b/drivers/clk/sunxi-ng/Kconfig @@ -13,14 +13,14 @@ config SUNIV_F1C100S_CCU depends on MACH_SUNIV || COMPILE_TEST config SUN20I_D1_CCU - tristate "Support for the Allwinner D1 CCU" + tristate "Support for the Allwinner D1/R528/T113 CCU" default y - depends on RISCV || COMPILE_TEST + depends on MACH_SUN8I || RISCV || COMPILE_TEST config SUN20I_D1_R_CCU - tristate "Support for the Allwinner D1 PRCM CCU" + tristate "Support for the Allwinner D1/R528/T113 PRCM CCU" default y - depends on RISCV || COMPILE_TEST + depends on MACH_SUN8I || RISCV || COMPILE_TEST config SUN50I_A64_CCU tristate "Support for the Allwinner A64 CCU" From patchwork Sat Nov 26 19:13:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Samuel Holland X-Patchwork-Id: 26293 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp4789653wrr; Sat, 26 Nov 2022 11:25:22 -0800 (PST) X-Google-Smtp-Source: AA0mqf5ZLx4btyY9RrAqOTkFgW174gHt2PM1WAnzaw3sohBvQ7PG27TLxMLzyFsfpvSzUIAssj+G X-Received: by 2002:a05:6a00:1696:b0:537:b0c3:691 with SMTP id k22-20020a056a00169600b00537b0c30691mr24589052pfc.59.1669490722109; Sat, 26 Nov 2022 11:25:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669490722; cv=none; d=google.com; s=arc-20160816; b=RMhhCv0G9me2gqla25m22ljeAzJpLzLo+WFnYLFtbUJaudtvovTdSn0OJAocXzJf6k zGmG3F2v9P81RkZJBruKuJOlLGtch8Y3dYgtrAyXx1UMRRZc3kibhqA6vQrm7j/cd1vl +f6hJj4tE1EG9OrlLc2HEhqSIlllNBv2685zt0VkGsNOSIVWzRMR8SaVAHzCs42ZI3S8 cJh0jCtKkOKI5YCrxM+Res1YFHy2lXjfqhOjRGxVT+6U7WFwhN/1ijyFsl6D37D4hTaL Aie52WXdb1rmeAq8ZtQa24JRcMGGNvcUWQSkDJoFIt24dNURm42bxSEK1etkpbgh8wMr zpxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :feedback-id:dkim-signature:dkim-signature; bh=dmPnymUtjq/JHP8L1TCfy8BtIL4oJAbNtHMY/IeTwdw=; b=Pvd2XIEgWM6NyIegzpleJUcnL8fE1vxjzJ3f+hQYtA33H3nmoLjad1rO3p57movLwK ypn+Uwm4P9qpD9RZnfxoDpgvkWjS55JTZKK0/zUKRT0hj//d0S1Zit8sILFzRtelXjvm hGXb8UlGFsi7phCaC3T8woT5qW/tUGaxhwOFmBfJ5rZ0dDtkEzmRl9SqpweHmZ8jx0ca DYJCcK9G7RNHYCamP93nEzjT22yI5NCwDQSn6NsP9v2/GoGCevneqCNmniw8SzM2/FrI Zc3e58QP2oWJ4ggVr5eIQFwLqM1ZuO/eC1UvDkD1kOdO5YWkgQ+qpd0vZomvBuJU+XEg 92dA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sholland.org header.s=fm2 header.b="amvj/CoT"; dkim=pass header.i=@messagingengine.com header.s=fm1 header.b=JMpUEw86; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sholland.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j7-20020a170903028700b0018685257c0csi7637700plr.121.2022.11.26.11.25.08; Sat, 26 Nov 2022 11:25:22 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@sholland.org header.s=fm2 header.b="amvj/CoT"; dkim=pass header.i=@messagingengine.com header.s=fm1 header.b=JMpUEw86; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sholland.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229701AbiKZTNi (ORCPT + 99 others); Sat, 26 Nov 2022 14:13:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55186 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229664AbiKZTN2 (ORCPT ); Sat, 26 Nov 2022 14:13:28 -0500 Received: from out5-smtp.messagingengine.com (out5-smtp.messagingengine.com [66.111.4.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3DB6DBF76; Sat, 26 Nov 2022 11:13:27 -0800 (PST) Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id AA3E85C00A3; Sat, 26 Nov 2022 14:13:26 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Sat, 26 Nov 2022 14:13:26 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sholland.org; h= cc:cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm2; t=1669490006; x= 1669576406; bh=dmPnymUtjq/JHP8L1TCfy8BtIL4oJAbNtHMY/IeTwdw=; b=a mvj/CoTPCviawXVgMgySfk4OBs5KTfm9fF6sD27zkQIhN3lThhRu/Fn55aL1svol sFgUSfa1IgYauU+52RCXscLqWAP6adFc9VAjXgQk0xqT/cJ9X+3OWlzv+y6xVzCA CQLboK2TE48/Z1BILY/w6klY9Sxwk2Iwwq9mJd8psTmq0HvoHCfz/wtMVlLZ8RJF d0dhkI8bOONIBNSX7GIc7Q3aoe7Wv9bIYgD+cpKCSbP0Av3rdt7Refy60ADSdDsB FjJRtDoMBy4CQaB7fPZPsINZxvW8jwuEgfm5sUx2BrpewXQUv3WLuLD91QyGlQCf P4UlRqTScpAYHgNOQKEKg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1669490006; x= 1669576406; bh=dmPnymUtjq/JHP8L1TCfy8BtIL4oJAbNtHMY/IeTwdw=; b=J MpUEw86nYlFuZ9yysjlKrxt3m37pvg92ERJXqn07PesK21U85Q3sZwrV0voeyOdc 9y5wLt1zeCAgQNVbqdqfsXaar0ABZZ3z/70N/Qw9CQle7CojD7HGIuRMBozu886p WRx6O6rzrWFXPtiMUsvIlw9BJd6DbZNRce2mPXV5sf0o+dZl/NM6sh8ZK2gUrwxN csgA1evU9CP8TvB0ZT1tMhIYoboXk8JljMSKQnc1iOjZSDSzKcTvK8Pjehr3EBsW Gzjl2ar0IY7jgUe8yqXk5zrng09CKFsJaHmQHfWam0Gz2FG0JkOD1xtbXzuXX1g6 01A0q4al+Ldwpa5Ogqvzw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvgedrieejgdduvdegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpefurghm uhgvlhcujfholhhlrghnugcuoehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhgqeenuc ggtffrrghtthgvrhhnpeefueevueeffeelheelhfelgeelgffgieekffevteefveejueei teeugfefieehleenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfh hrohhmpehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhg X-ME-Proxy: Feedback-ID: i0ad843c9:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 26 Nov 2022 14:13:25 -0500 (EST) From: Samuel Holland To: Chen-Yu Tsai , Jernej Skrabec , Michael Turquette , Stephen Boyd Cc: Samuel Holland , Krzysztof Kozlowski , Philipp Zabel , Rob Herring , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, linux-sunxi@lists.linux.dev, =?utf-8?b?QW5kcsOhcyBTemVtesWR?= Subject: [PATCH 4/5] clk: sunxi-ng: d1: Mark cpux clock as critical Date: Sat, 26 Nov 2022 13:13:18 -0600 Message-Id: <20221126191319.6404-5-samuel@sholland.org> X-Mailer: git-send-email 2.37.4 In-Reply-To: <20221126191319.6404-1-samuel@sholland.org> References: <20221126191319.6404-1-samuel@sholland.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,SPF_HELO_PASS, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750587903536697604?= X-GMAIL-MSGID: =?utf-8?q?1750587903536697604?= From: András Szemző Some SoCs in the D1 family feature ARM CPUs instead of a RISC-V CPU. In that case, the CPUs are driven from the 'cpux' clock, so it needs to be marked as critical. Signed-off-by: András Szemző Signed-off-by: Samuel Holland Reviewed-by: Andre Przywara Acked-by: Jernej Skrabec --- drivers/clk/sunxi-ng/ccu-sun20i-d1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/clk/sunxi-ng/ccu-sun20i-d1.c b/drivers/clk/sunxi-ng/ccu-sun20i-d1.c index 8ef3cdeb7962..c5a7df93602c 100644 --- a/drivers/clk/sunxi-ng/ccu-sun20i-d1.c +++ b/drivers/clk/sunxi-ng/ccu-sun20i-d1.c @@ -240,7 +240,7 @@ static const struct clk_parent_data cpux_parents[] = { { .hw = &pll_periph0_800M_clk.common.hw }, }; static SUNXI_CCU_MUX_DATA(cpux_clk, "cpux", cpux_parents, - 0x500, 24, 3, CLK_SET_RATE_PARENT); + 0x500, 24, 3, CLK_SET_RATE_PARENT | CLK_IS_CRITICAL); static const struct clk_hw *cpux_hws[] = { &cpux_clk.common.hw }; static SUNXI_CCU_M_HWS(cpux_axi_clk, "cpux-axi", From patchwork Sat Nov 26 19:13:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Holland X-Patchwork-Id: 26295 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp4790407wrr; Sat, 26 Nov 2022 11:27:55 -0800 (PST) X-Google-Smtp-Source: AA0mqf4bYKGWqXxQ9AYCYfbyzDGyWj7Z9s5VMIK/6QsFQJxLj+NQ6RH7iLTckM0d29nJ2QQAKipM X-Received: by 2002:a05:6402:2409:b0:45c:935b:ae15 with SMTP id t9-20020a056402240900b0045c935bae15mr19013620eda.357.1669490875642; Sat, 26 Nov 2022 11:27:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669490875; cv=none; d=google.com; s=arc-20160816; b=WgOJfzRJmH2J69mLfHf9xdrvlkcWjIFsJWeOUEVqlwkFhDoyv7HyMCTxidPbcCxh6M NTrp6tEsUFiZghOD2Md92rpogYbwOaHMFaQAd6W83/ndx3KLC0QReSwNTzAh5cMGPsSd RzhWZ/hV0F7SWFuXSdG0uSVqeJcQzRy3Bun0Dw3asVZIUoZg9JUcCNFTfUeaOpXOeRQe wgh8el+t9zzgMVroovjSng3aoaLwDst94fyrjBneefeVoqQW0IUGwsXtRlTvJ+3WnCST UQhHBJzYQNxg35nbic/4ATB3fhpzSfn3YdLa36uye0VOUp6eh3O4u5w9M96Q6EnuoS1d naVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :feedback-id:dkim-signature:dkim-signature; bh=y5djLeQ/hPY8ak4OuL7Fb/c3s4IkUrbhmjUh9vU8Iao=; b=N7yu4mjKC/M1aQ5/Z5RIqb47MVJeuYpbx6B6aYgTBEAVt+zFzENTUepWhMsZtbQ+um 5EHDUKTbS2ynNPIeRIO+XJQoQ4REfvyNz7ypxSSxU18B+8f+ugm5Yq42BERhfL5bMjQo EgfBSScPDucBpro4g5rOaS0/cK/dZxkxmUiDhqUAXaFznVpaqriyiFxhxBb2uJX27oj4 OX3phX4MLMpZaujvnR6ljRIN4Ejexr6L8W6BFhdKZpRJWvXYB0NZcaMYWLqQcEsypN3v sDPUR8d3ACCxcNQnFFjwd95J/uWwOpeQnqXSmGhAn9Diq7zq3YG+TqChEl329NB2Wcdc KHRA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sholland.org header.s=fm2 header.b=II7wBM85; dkim=pass header.i=@messagingengine.com header.s=fm1 header.b=FsdV1FgD; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sholland.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c20-20020a05640227d400b0046ac13261a1si5078978ede.459.2022.11.26.11.27.28; Sat, 26 Nov 2022 11:27:55 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@sholland.org header.s=fm2 header.b=II7wBM85; dkim=pass header.i=@messagingengine.com header.s=fm1 header.b=FsdV1FgD; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sholland.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229734AbiKZTNm (ORCPT + 99 others); Sat, 26 Nov 2022 14:13:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55196 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229675AbiKZTN3 (ORCPT ); Sat, 26 Nov 2022 14:13:29 -0500 Received: from out5-smtp.messagingengine.com (out5-smtp.messagingengine.com [66.111.4.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8202013DC0; Sat, 26 Nov 2022 11:13:28 -0800 (PST) Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id F00EE5C00C2; Sat, 26 Nov 2022 14:13:27 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Sat, 26 Nov 2022 14:13:27 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sholland.org; h= cc:cc:content-transfer-encoding:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm2; t=1669490007; x=1669576407; bh=y5 djLeQ/hPY8ak4OuL7Fb/c3s4IkUrbhmjUh9vU8Iao=; b=II7wBM85JhQYWyaxV6 ASpiOEvIffOUjAnDJiAbN45q03pZS2YyRfcBePaDgXGE3vTd2dL5+sm+Qt9DTqlZ ZGmbjlDWjmUxDUW3v6UnvnRcVaHtWcSmKtIPglaCRGStC/mu905uCq8JfFjmP03t r3k7d3ol6idc+IEP/475AV+R2XZyvf0yQktDP7d/CZYCYjbo59CwSW6TlQ+oOSOx cCxbUC/ziC+Ya9wHUKpm+8DMpClzsb/jeq83aqGzQMKu+3humIuFj73RaqOw/Swe 8tN6e0VIh5YzOP6hVgH3eaLUL8qfsBxp3lT+Js41q707N9Z0fxBkRdFhGyWeTRCi 7NWg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; t=1669490007; x=1669576407; bh=y5djLeQ/hPY8a k4OuL7Fb/c3s4IkUrbhmjUh9vU8Iao=; b=FsdV1FgD9jQRX2/99lfl3XUy/0543 SeQi0BhzkryRO5iHY8VE0n1BGbwnzUo8C5TDWDPhug9gSHqAeeLRERYTtdTcTdE0 2HM2MoZBa89RMKre0hgUW+rR+Tuo1Cup0G1T9fyI7Wunj88W9rV1l8dgbRJXr+E/ 7Eig7HmrlmFTXA68e4PW3hVLu2dKaTnkqwRjZqN4LSmRwl4gdER2WV732XOIAmNS WKQsLZ+Z/fdUa79qG0dyp9/fLEWea8kWT6SbEWrLWs8XoHYxiNj3otr6VuRH/+/C YmrZD4fbjk+5x+mzhjR1TuhGy9LPvWTVsbvkml444RPjFj3SpREgUmJJw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvgedrieejgdduvdegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomhepufgrmhhu vghlucfjohhllhgrnhguuceoshgrmhhuvghlsehshhholhhlrghnugdrohhrgheqnecugg ftrfgrthhtvghrnhepudekteeuudehtdelteevgfduvddvjefhfedulefgudevgeeghefg udefiedtveetnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrh homhepshgrmhhuvghlsehshhholhhlrghnugdrohhrgh X-ME-Proxy: Feedback-ID: i0ad843c9:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 26 Nov 2022 14:13:26 -0500 (EST) From: Samuel Holland To: Chen-Yu Tsai , Jernej Skrabec , Michael Turquette , Stephen Boyd Cc: Samuel Holland , Krzysztof Kozlowski , Philipp Zabel , Rob Herring , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, linux-sunxi@lists.linux.dev, Fabien Poussin Subject: [PATCH 5/5] clk: sunxi-ng: d1: Add CAN bus gates and resets Date: Sat, 26 Nov 2022 13:13:19 -0600 Message-Id: <20221126191319.6404-6-samuel@sholland.org> X-Mailer: git-send-email 2.37.4 In-Reply-To: <20221126191319.6404-1-samuel@sholland.org> References: <20221126191319.6404-1-samuel@sholland.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,SPF_HELO_PASS, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750588064653672363?= X-GMAIL-MSGID: =?utf-8?q?1750588064653672363?= From: Fabien Poussin The D1 CCU contains gates and resets for two CAN buses. While the CAN bus controllers are only documented for the T113 SoC, the CCU is the same across all SoC variants. Signed-off-by: Fabien Poussin Signed-off-by: Samuel Holland Reviewed-by: Andre Przywara --- drivers/clk/sunxi-ng/ccu-sun20i-d1.c | 11 +++++++++++ drivers/clk/sunxi-ng/ccu-sun20i-d1.h | 2 +- include/dt-bindings/clock/sun20i-d1-ccu.h | 2 ++ include/dt-bindings/reset/sun20i-d1-ccu.h | 2 ++ 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/drivers/clk/sunxi-ng/ccu-sun20i-d1.c b/drivers/clk/sunxi-ng/ccu-sun20i-d1.c index c5a7df93602c..48a8fb2c43b7 100644 --- a/drivers/clk/sunxi-ng/ccu-sun20i-d1.c +++ b/drivers/clk/sunxi-ng/ccu-sun20i-d1.c @@ -469,6 +469,11 @@ static SUNXI_CCU_GATE_HWS(bus_i2c2_clk, "bus-i2c2", apb1_hws, static SUNXI_CCU_GATE_HWS(bus_i2c3_clk, "bus-i2c3", apb1_hws, 0x91c, BIT(3), 0); +static SUNXI_CCU_GATE_HWS(bus_can0_clk, "bus-can0", apb1_hws, + 0x92c, BIT(0), 0); +static SUNXI_CCU_GATE_HWS(bus_can1_clk, "bus-can1", apb1_hws, + 0x92c, BIT(1), 0); + static const struct clk_parent_data spi_parents[] = { { .fw_name = "hosc" }, { .hw = &pll_periph0_clk.hw }, @@ -997,6 +1002,8 @@ static struct ccu_common *sun20i_d1_ccu_clks[] = { &bus_i2c1_clk.common, &bus_i2c2_clk.common, &bus_i2c3_clk.common, + &bus_can0_clk.common, + &bus_can1_clk.common, &spi0_clk.common, &spi1_clk.common, &bus_spi0_clk.common, @@ -1147,6 +1154,8 @@ static struct clk_hw_onecell_data sun20i_d1_hw_clks = { [CLK_BUS_I2C1] = &bus_i2c1_clk.common.hw, [CLK_BUS_I2C2] = &bus_i2c2_clk.common.hw, [CLK_BUS_I2C3] = &bus_i2c3_clk.common.hw, + [CLK_BUS_CAN0] = &bus_can0_clk.common.hw, + [CLK_BUS_CAN1] = &bus_can1_clk.common.hw, [CLK_SPI0] = &spi0_clk.common.hw, [CLK_SPI1] = &spi1_clk.common.hw, [CLK_BUS_SPI0] = &bus_spi0_clk.common.hw, @@ -1252,6 +1261,8 @@ static struct ccu_reset_map sun20i_d1_ccu_resets[] = { [RST_BUS_I2C1] = { 0x91c, BIT(17) }, [RST_BUS_I2C2] = { 0x91c, BIT(18) }, [RST_BUS_I2C3] = { 0x91c, BIT(19) }, + [RST_BUS_CAN0] = { 0x92c, BIT(16) }, + [RST_BUS_CAN1] = { 0x92c, BIT(17) }, [RST_BUS_SPI0] = { 0x96c, BIT(16) }, [RST_BUS_SPI1] = { 0x96c, BIT(17) }, [RST_BUS_EMAC] = { 0x97c, BIT(16) }, diff --git a/drivers/clk/sunxi-ng/ccu-sun20i-d1.h b/drivers/clk/sunxi-ng/ccu-sun20i-d1.h index e303176f0d4e..b14da36e2537 100644 --- a/drivers/clk/sunxi-ng/ccu-sun20i-d1.h +++ b/drivers/clk/sunxi-ng/ccu-sun20i-d1.h @@ -10,6 +10,6 @@ #include #include -#define CLK_NUMBER (CLK_FANOUT2 + 1) +#define CLK_NUMBER (CLK_BUS_CAN1 + 1) #endif /* _CCU_SUN20I_D1_H_ */ diff --git a/include/dt-bindings/clock/sun20i-d1-ccu.h b/include/dt-bindings/clock/sun20i-d1-ccu.h index e3ac53315e1a..e143b9929763 100644 --- a/include/dt-bindings/clock/sun20i-d1-ccu.h +++ b/include/dt-bindings/clock/sun20i-d1-ccu.h @@ -152,5 +152,7 @@ #define CLK_FANOUT0 142 #define CLK_FANOUT1 143 #define CLK_FANOUT2 144 +#define CLK_BUS_CAN0 145 +#define CLK_BUS_CAN1 146 #endif /* _DT_BINDINGS_CLK_SUN20I_D1_CCU_H_ */ diff --git a/include/dt-bindings/reset/sun20i-d1-ccu.h b/include/dt-bindings/reset/sun20i-d1-ccu.h index de9ff5203239..f8001cf50bf1 100644 --- a/include/dt-bindings/reset/sun20i-d1-ccu.h +++ b/include/dt-bindings/reset/sun20i-d1-ccu.h @@ -73,5 +73,7 @@ #define RST_BUS_DSP_CFG 63 #define RST_BUS_DSP_DBG 64 #define RST_BUS_RISCV_CFG 65 +#define RST_BUS_CAN0 66 +#define RST_BUS_CAN1 67 #endif /* _DT_BINDINGS_RST_SUN20I_D1_CCU_H_ */