From nobody Sun Apr 12 04:21:23 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 99EBAC19F2A for ; Mon, 1 Aug 2022 03:05:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239516AbiHADF0 (ORCPT ); Sun, 31 Jul 2022 23:05:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42858 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239043AbiHADFV (ORCPT ); Sun, 31 Jul 2022 23:05:21 -0400 Received: from wout4-smtp.messagingengine.com (wout4-smtp.messagingengine.com [64.147.123.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AABCE1155; Sun, 31 Jul 2022 20:05:18 -0700 (PDT) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id C2D353200077; Sun, 31 Jul 2022 23:05:16 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Sun, 31 Jul 2022 23:05:17 -0400 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=fm1; t=1659323116; x=1659409516; bh=RF f4ZIQUHigdGLmF6ZInRkG114b+nlKi/1CwVmNwCes=; b=jXAgZVPr8jwj4OXbaT vNnDYMWp+RNJjS+7Dw9tZxXaJYp/je6k1z3DJUjQERG8e/tRPBu+PVi54Oaf/S2A SYzrcQfGdsF5xGYWK1mS8/8oJRQIqtHSypSKKmDOhVz1oTqFcmTH96m8iUZ3KDze NtXRUc2cUNdPHSh8QgMtEsWlfT3uzTIgL0zh/KfHhSJuHR0iLPjKt8tHSEOD7ce0 QRWGDBTYbqykBcctWuAWyq9eUqAsygfwUuC1OrGZLS/ym0qfX6k3KblXEK/ele8+ qf7x+AA6io9ZHuHe/ACVSCC5UxiyQfut2PQnC3amE2XLdiQo3+4Y8RMVhIUasYle yksw== 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=fm3; t=1659323116; x=1659409516; bh=RFf4ZIQUHigdG LmF6ZInRkG114b+nlKi/1CwVmNwCes=; b=s/ggJ0kHyu3SCYAPNJcMdhK8YsYhY AGg6Mr8bd9XhokEHiBXtNWDvDQuX4M9P61MoWtfgKijaUscMUWwxKBYj51NoNKmf C3aRgwDgwNkS4LL/3QYZ3aFCWMEkyCDEtelFN8FdVQj2VzRM3GaSRd68cvYsCqwx aJTpyzxAM34L7Ev5hvP/zrQi9ATK32F1PMiYh9dRt3xL5baoVCQCo+Sq7yztEAUW mRzDxCnTX4/E4NZl/8vg+KYsHjLkEBzGvveGGylBj9DJSG5uHpDWgcF5E0CQ2mP1 Nl/NVu3tfpsEoKh8sZ2aAHfmZNfhPhTn0XPXy7iLH1jWarBylfHe7OJAw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrvddvvddgheejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomhepufgrmhhu vghlucfjohhllhgrnhguuceoshgrmhhuvghlsehshhholhhlrghnugdrohhrgheqnecugg ftrfgrthhtvghrnhepudekteeuudehtdelteevgfduvddvjefhfedulefgudevgeeghefg udefiedtveetnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrh homhepshgrmhhuvghlsehshhholhhlrghnugdrohhrgh X-ME-Proxy: Feedback-ID: i0ad843c9:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 31 Jul 2022 23:05:15 -0400 (EDT) From: Samuel Holland To: Chen-Yu Tsai , Jernej Skrabec Cc: Samuel Holland , Arnd Bergmann , Hans de Goede , Icenowy Zheng , Krzysztof Kozlowski , Maxime Ripard , Rob Herring , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-sunxi@lists.linux.dev Subject: [PATCH 1/9] dt-bindings: sram: sunxi-sram: Add D1 compatible string Date: Sun, 31 Jul 2022 22:05:01 -0500 Message-Id: <20220801030509.21966-2-samuel@sholland.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220801030509.21966-1-samuel@sholland.org> References: <20220801030509.21966-1-samuel@sholland.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" D1 needs to export a register for managing some LDO regulators, so it needs a unique compatible. Signed-off-by: Samuel Holland --- .../bindings/sram/allwinner,sun4i-a10-system-control.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/sram/allwinner,sun4i-a10-sys= tem-control.yaml b/Documentation/devicetree/bindings/sram/allwinner,sun4i-a= 10-system-control.yaml index 1c426c211e36..ab6e95a97c9f 100644 --- a/Documentation/devicetree/bindings/sram/allwinner,sun4i-a10-system-con= trol.yaml +++ b/Documentation/devicetree/bindings/sram/allwinner,sun4i-a10-system-con= trol.yaml @@ -39,6 +39,7 @@ properties: - items: - const: allwinner,sun8i-r40-system-control - const: allwinner,sun4i-a10-system-control + - const: allwinner,sun20i-d1-system-control - const: allwinner,sun50i-a64-sram-controller deprecated: true - const: allwinner,sun50i-a64-system-control --=20 2.35.1 From nobody Sun Apr 12 04:21:23 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 78336C19F2A for ; Mon, 1 Aug 2022 03:05:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239587AbiHADFi (ORCPT ); Sun, 31 Jul 2022 23:05:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42914 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239502AbiHADFY (ORCPT ); Sun, 31 Jul 2022 23:05:24 -0400 Received: from wout4-smtp.messagingengine.com (wout4-smtp.messagingengine.com [64.147.123.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5070F21AA; Sun, 31 Jul 2022 20:05:21 -0700 (PDT) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.west.internal (Postfix) with ESMTP id B345832007D7; Sun, 31 Jul 2022 23:05:19 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Sun, 31 Jul 2022 23:05:20 -0400 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=fm1; t=1659323119; x=1659409519; bh=9D NTC2mZK/vx4J+nMP9mcn6k409H3HxgWzx4BXzvEGc=; b=py/87n3iVOI+rcmVUm MaLITFggHr8YiskCeRPMyKfZeJEJGnYlEATdpxq4gFGFg1ciNozM3sQHWKCoSMVV oH+lJBw4mTp+YDJGUhvDpRCygkIthJww92Z/L3m+Yx5nVIS9/e/89LfOStJ3sEZs CvwKId2qKB4hL0Cit2sZwbCauqlaZNDGLAPR1LIyYKVIMqcEVfu4adRXUZWYsoE0 xyBxkTcCU2KndbOt/c40KTLZtdjQXYaTtxbmGcz71RJn9S5DXPa7JkjNXpElfSAm IA4h57YKmzyVD7XnJf19BIy1EPcSxCdRM/6kDCsIsFNxLz1uoN7xHJnfsuXuGaWD PUeg== 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=fm3; t=1659323119; x=1659409519; bh=9DNTC2mZK/vx4 J+nMP9mcn6k409H3HxgWzx4BXzvEGc=; b=IZTDjTi9cjjt+BKL+kIUqXmHXdJVg OVrE4VDWvnsMaQhk9bJ2zFTAQQSpI9JufzIhWzJ3Iej2hfwFaJ6nGFEq15sEDl0U Y3IGU5sq9wmROaLKyMn7y1hXubuMV+KgN2Ob89/D6Dsg77NUWfNLOGZ+sfqIRxbx mUZZlnojqaThRkF4Mah1RkgruqzJV9AlnV/039a1QDlMT93JDOg1KEHyykauUmki p+iLIOIw/veE4Xm6leEEDRd7JYIRkMgZUTXBlqybUq3EuLOpMFcMIcT3Wlom6wOV 8JbVZBmEp0aSdW+x25WOa2aQABcGHpC7JQ+ETPWEZ1SbM4dtqomvgDjZw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrvddvvddgheejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomhepufgrmhhu vghlucfjohhllhgrnhguuceoshgrmhhuvghlsehshhholhhlrghnugdrohhrgheqnecugg ftrfgrthhtvghrnhepudekteeuudehtdelteevgfduvddvjefhfedulefgudevgeeghefg udefiedtveetnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrh homhepshgrmhhuvghlsehshhholhhlrghnugdrohhrgh X-ME-Proxy: Feedback-ID: i0ad843c9:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 31 Jul 2022 23:05:18 -0400 (EDT) From: Samuel Holland To: Chen-Yu Tsai , Jernej Skrabec Cc: Samuel Holland , Arnd Bergmann , Hans de Goede , Icenowy Zheng , Krzysztof Kozlowski , Maxime Ripard , Rob Herring , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-sunxi@lists.linux.dev Subject: [PATCH 2/9] soc: sunxi: sram: Actually claim SRAM regions Date: Sun, 31 Jul 2022 22:05:02 -0500 Message-Id: <20220801030509.21966-3-samuel@sholland.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220801030509.21966-1-samuel@sholland.org> References: <20220801030509.21966-1-samuel@sholland.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" sunxi_sram_claim() checks the sram_desc->claimed flag before updating the register, with the intent that only one device can claim a region. However, this was ineffective because the flag was never set. Fixes: 4af34b572a85 ("drivers: soc: sunxi: Introduce SoC driver to map SRAM= s") Signed-off-by: Samuel Holland Reviewed-by: Jernej Skrabec --- drivers/soc/sunxi/sunxi_sram.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/soc/sunxi/sunxi_sram.c b/drivers/soc/sunxi/sunxi_sram.c index a8f3876963a0..f3d3f9259df9 100644 --- a/drivers/soc/sunxi/sunxi_sram.c +++ b/drivers/soc/sunxi/sunxi_sram.c @@ -254,6 +254,7 @@ int sunxi_sram_claim(struct device *dev) writel(val | ((device << sram_data->offset) & mask), base + sram_data->reg); =20 + sram_desc->claimed =3D true; spin_unlock(&sram_lock); =20 return 0; --=20 2.35.1 From nobody Sun Apr 12 04:21:23 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A2237C19F2C for ; Mon, 1 Aug 2022 03:05:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239646AbiHADFl (ORCPT ); Sun, 31 Jul 2022 23:05:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42962 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239509AbiHADFZ (ORCPT ); Sun, 31 Jul 2022 23:05:25 -0400 Received: from wout4-smtp.messagingengine.com (wout4-smtp.messagingengine.com [64.147.123.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 29E852186; Sun, 31 Jul 2022 20:05:24 -0700 (PDT) Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id 8ABBC32007CF; Sun, 31 Jul 2022 23:05:22 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Sun, 31 Jul 2022 23:05:23 -0400 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=fm1; t=1659323122; x=1659409522; bh=7E qXmtvRWN3harpfqilHqd1KdE7zLHtd34jbY/6w4ZE=; b=eFSIgj/zUkcefTKGuO Y/zxVkUVTYypNyf6bjSKOr6tSKuNx24GxMXPibu9Uz09eoAqMst1fxYC/nYe36UX gPmiD3pzCQ92ndnwv0NwJGZtWLOptLQl+wwLd866zzKIUuPwfBabnhdX3YlXbmuq nagR+49Mwlznz+R/lFjqwaxoTxzJdFvAAGhdIQTzCQJGa5q2Xx4Os6bd4Zoe3n9G BpZRXOeZ1B20nT/+9+uJmTeTO8L2bdUV2YRlKem9PXKJySmOaNyA3Cnlw2GjecYG TmZICynbV61Pqb/q4FGoidEHh0OHYQkzVFPJ/Cl7n4DaJxBDGTyq88q15C9TwWtU p9Hg== 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=fm3; t=1659323122; x=1659409522; bh=7EqXmtvRWN3ha rpfqilHqd1KdE7zLHtd34jbY/6w4ZE=; b=DltB057GwG0zCnuEKMZb7mkjwmRD8 mMYLgCHkGFOqq7K1Z3N0uyKQh6GWlZpyEO6mMBie5KEvc1TvHL2UgGVYta80Qrwf HfhjjK5ARnxl1uVxhH2nI4nTbqLH3vFZlcGcD09VtKnyuIyh/3Po0N53v22GA3FF R795aV2L9YSvcnaPX0KsoP/bD4XAxygUfzfOdlRPZ6nZaTbmHYwhX9srFcnAQ9oW ltaewQHsm+tSwy8dH8nw3zeVv1gJhouduU/Ts0FTXTnmaxZz0I90SKIaBna1Bi1z EiBK0vDQlAyXXW44BUezcelcPCzxuYduU0ZQxeEGgBCxrakzLg450DefA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrvddvvddgheekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomhepufgrmhhu vghlucfjohhllhgrnhguuceoshgrmhhuvghlsehshhholhhlrghnugdrohhrgheqnecugg ftrfgrthhtvghrnhepudekteeuudehtdelteevgfduvddvjefhfedulefgudevgeeghefg udefiedtveetnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrh homhepshgrmhhuvghlsehshhholhhlrghnugdrohhrgh X-ME-Proxy: Feedback-ID: i0ad843c9:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 31 Jul 2022 23:05:21 -0400 (EDT) From: Samuel Holland To: Chen-Yu Tsai , Jernej Skrabec Cc: Samuel Holland , Arnd Bergmann , Hans de Goede , Icenowy Zheng , Krzysztof Kozlowski , Maxime Ripard , Rob Herring , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-sunxi@lists.linux.dev Subject: [PATCH 3/9] soc: sunxi: sram: Prevent the driver from being unbound Date: Sun, 31 Jul 2022 22:05:03 -0500 Message-Id: <20220801030509.21966-4-samuel@sholland.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220801030509.21966-1-samuel@sholland.org> References: <20220801030509.21966-1-samuel@sholland.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This driver exports a regmap tied to the platform device (as opposed to a syscon, which exports a regmap tied to the OF node). Because of this, the driver can never be unbound, as that would destroy the regmap. Use builtin_platform_driver_probe() to enforce this limitation. Fixes: 5828729bebbb ("soc: sunxi: export a regmap for EMAC clock reg on A64= ") Signed-off-by: Samuel Holland Reviewed-by: Jernej Skrabec --- drivers/soc/sunxi/sunxi_sram.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/soc/sunxi/sunxi_sram.c b/drivers/soc/sunxi/sunxi_sram.c index f3d3f9259df9..a858a37fcdd4 100644 --- a/drivers/soc/sunxi/sunxi_sram.c +++ b/drivers/soc/sunxi/sunxi_sram.c @@ -330,7 +330,7 @@ static struct regmap_config sunxi_sram_emac_clock_regma= p =3D { .writeable_reg =3D sunxi_sram_regmap_accessible_reg, }; =20 -static int sunxi_sram_probe(struct platform_device *pdev) +static int __init sunxi_sram_probe(struct platform_device *pdev) { struct dentry *d; struct regmap *emac_clock; @@ -410,9 +410,8 @@ static struct platform_driver sunxi_sram_driver =3D { .name =3D "sunxi-sram", .of_match_table =3D sunxi_sram_dt_match, }, - .probe =3D sunxi_sram_probe, }; -module_platform_driver(sunxi_sram_driver); +builtin_platform_driver_probe(sunxi_sram_driver, sunxi_sram_probe); =20 MODULE_AUTHOR("Maxime Ripard "); MODULE_DESCRIPTION("Allwinner sunXi SRAM Controller Driver"); --=20 2.35.1 From nobody Sun Apr 12 04:21:23 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 57810C19F2C for ; Mon, 1 Aug 2022 03:05:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239580AbiHADFq (ORCPT ); Sun, 31 Jul 2022 23:05:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43068 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239517AbiHADF2 (ORCPT ); Sun, 31 Jul 2022 23:05:28 -0400 Received: from wout4-smtp.messagingengine.com (wout4-smtp.messagingengine.com [64.147.123.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4A16A260E; Sun, 31 Jul 2022 20:05:27 -0700 (PDT) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id 766553200077; Sun, 31 Jul 2022 23:05:25 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Sun, 31 Jul 2022 23:05:26 -0400 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=fm1; t=1659323124; x=1659409524; bh=bK bLq8gXyaC/nciXymlgvBGqzJKGfY3EeYJHQps9uFk=; b=MyJcbt5TZlAyb0UE1/ +XIHxklCzbXhu+wr+ER32MDbN0NvOTqY+wSgYKXkha3r0KqK52Qko/1v9MGXwLda rH1n/fTG596lu5SocVL6L4Uk4eI/PNp3OQx/watQBq2wbM3hyOgOqZ2QMvoyZPO7 aFXSwXFo0IBUQ0jFKkp1Vbih/cJC2+ruSWOU7TN1tdNwG7zmtkgPYV3giI5wBAOD lBUoI5/JztXjzXWjLVeQRxz4IBNzLIURHPQARzu0EOJHxpO0K6pEtsDgQ/l/ieSJ qc91TY6OMw5RYXv62RWju4sksiU5b/eRTt99JVrEVwu81xmWCYird6kDnkhH1Suv uC7Q== 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=fm3; t=1659323124; x=1659409524; bh=bKbLq8gXyaC/n ciXymlgvBGqzJKGfY3EeYJHQps9uFk=; b=PLpcmrBpmOE5T/AJeRVL9k6HIVl7V IMwCYJAcoeE7yStOUVKwXYoQFEf3v8xO4TvnY7JFyUnnCaKouhhmJ/olJOhHLtYw p+mkCTYA5a3j2iHY7J7WpCoDZiMJap77dGWzo0iHJ0zfRz4JN4qQUwL9GhOobkoQ TQS0RtMG20ssUbWItykJ+c8WER7b0+Ki/hl9B6q8HSluQ/8/1dM8mHdIM3qEiYN8 eYVvRy6mWBTizietF/dEScTjJ5z1VNtS9dNqZ0FjTTcAElK3KmMwbmhmT2asLA8z +12QOzpDigWunR5Yr7sRu6UBIAKmmuetjcAK31+b2eMthPmnfQN/fooNA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrvddvvddgheejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomhepufgrmhhu vghlucfjohhllhgrnhguuceoshgrmhhuvghlsehshhholhhlrghnugdrohhrgheqnecugg ftrfgrthhtvghrnhepudekteeuudehtdelteevgfduvddvjefhfedulefgudevgeeghefg udefiedtveetnecuvehluhhsthgvrhfuihiivgepudenucfrrghrrghmpehmrghilhhfrh homhepshgrmhhuvghlsehshhholhhlrghnugdrohhrgh X-ME-Proxy: Feedback-ID: i0ad843c9:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 31 Jul 2022 23:05:24 -0400 (EDT) From: Samuel Holland To: Chen-Yu Tsai , Jernej Skrabec Cc: Samuel Holland , Arnd Bergmann , Hans de Goede , Icenowy Zheng , Krzysztof Kozlowski , Maxime Ripard , Rob Herring , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-sunxi@lists.linux.dev Subject: [PATCH 4/9] soc: sunxi: sram: Fix probe function ordering issues Date: Sun, 31 Jul 2022 22:05:04 -0500 Message-Id: <20220801030509.21966-5-samuel@sholland.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220801030509.21966-1-samuel@sholland.org> References: <20220801030509.21966-1-samuel@sholland.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Errors from debugfs are intended to be non-fatal, and should not prevent the driver from probing. Since debugfs file creation is treated as infallible, move it below the parts of the probe function that can fail. This prevents an error elsewhere in the probe function from causing the file to leak. Do the same for the call to of_platform_populate(). Finally, checkpatch suggests an octal literal for the file permissions. Fixes: 4af34b572a85 ("drivers: soc: sunxi: Introduce SoC driver to map SRAM= s") Fixes: 5828729bebbb ("soc: sunxi: export a regmap for EMAC clock reg on A64= ") Signed-off-by: Samuel Holland Reviewed-by: Jernej Skrabec --- drivers/soc/sunxi/sunxi_sram.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/drivers/soc/sunxi/sunxi_sram.c b/drivers/soc/sunxi/sunxi_sram.c index a858a37fcdd4..52d07bed7664 100644 --- a/drivers/soc/sunxi/sunxi_sram.c +++ b/drivers/soc/sunxi/sunxi_sram.c @@ -332,9 +332,9 @@ static struct regmap_config sunxi_sram_emac_clock_regma= p =3D { =20 static int __init sunxi_sram_probe(struct platform_device *pdev) { - struct dentry *d; struct regmap *emac_clock; const struct sunxi_sramc_variant *variant; + struct device *dev =3D &pdev->dev; =20 sram_dev =3D &pdev->dev; =20 @@ -346,13 +346,6 @@ static int __init sunxi_sram_probe(struct platform_dev= ice *pdev) if (IS_ERR(base)) return PTR_ERR(base); =20 - of_platform_populate(pdev->dev.of_node, NULL, NULL, &pdev->dev); - - d =3D debugfs_create_file("sram", S_IRUGO, NULL, NULL, - &sunxi_sram_fops); - if (!d) - return -ENOMEM; - if (variant->num_emac_clocks > 0) { emac_clock =3D devm_regmap_init_mmio(&pdev->dev, base, &sunxi_sram_emac_clock_regmap); @@ -361,6 +354,10 @@ static int __init sunxi_sram_probe(struct platform_dev= ice *pdev) return PTR_ERR(emac_clock); } =20 + of_platform_populate(dev->of_node, NULL, NULL, dev); + + debugfs_create_file("sram", 0444, NULL, NULL, &sunxi_sram_fops); + return 0; } =20 --=20 2.35.1 From nobody Sun Apr 12 04:21:23 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1EC54C00140 for ; Mon, 1 Aug 2022 03:05:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239552AbiHADFy (ORCPT ); Sun, 31 Jul 2022 23:05:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43156 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239547AbiHADFa (ORCPT ); Sun, 31 Jul 2022 23:05:30 -0400 Received: from wout4-smtp.messagingengine.com (wout4-smtp.messagingengine.com [64.147.123.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4EEF55FF8; Sun, 31 Jul 2022 20:05:30 -0700 (PDT) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id 5F1EE320070D; Sun, 31 Jul 2022 23:05:28 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Sun, 31 Jul 2022 23:05:29 -0400 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=fm1; t=1659323127; x=1659409527; bh=s9 WFLVwZEMuAM0cTEBVsRJsr2wnA2LCJYYugauiDLN4=; b=IzLg2OYLjawKDfEsAG po40vB5+VtI7Z5Gmo0l+wXh2XvSwxARZqxPwviB3quisgaq3IDm+3uadU4ytz8fz crG8ajyNkvlS/mTkxnH4aJPH74Idi0toCD6qXMELnoaY9iwJGJPGJq4DDupTPGiJ Rd8AXDBTJRrBLwPPfi7bkMU8uxdMtQPAYhuLOlnzlFA7qcqZtanZOoKBD/Nnu21C CYlpIFJ3NzW8NPuzH7vbd/+lwcb+9lM0Tt/qhOhOyzfE8Q1LnpgcZr235noCBl6b 76MID1mzjP5evlNYX4YwuCyME2ZzZet3kvjXcoRZhfXqfKnL2aPVe+GCOTv3rHd+ 1tGg== 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=fm3; t=1659323127; x=1659409527; bh=s9WFLVwZEMuAM 0cTEBVsRJsr2wnA2LCJYYugauiDLN4=; b=x57uUAk+TGU/KCeioNTbqrjy8IZYV BZtzneyPVOOxP9XhYk5RIaraxq7/0PaLq3njiA2+SV2X8V1h01BAMkGp1eMp4Kbr 7NC1pZhLy8NcxFNrx7oe0WEB2Q02VeG3sInqLA8D2ftZlL3FM0lxPCDsMb0WTaCE cecnyKC6QgYCHJ0fs/Jq6awkBz3GU9uhijdyLQFrYPetjgIjy62fuavNSXj55hSS qhAP0hGD8VYhjyW/3ufYa1eFG8PgKRH1BGNigmDJLwOFDAEnrbMZgvzFaf5zZvKS kf1GugTkE2g62PPFpDHTTssP4b2G2hBbqXg8hV+7E946U0nxQn7kk2vjA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrvddvvddgheejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomhepufgrmhhu vghlucfjohhllhgrnhguuceoshgrmhhuvghlsehshhholhhlrghnugdrohhrgheqnecugg ftrfgrthhtvghrnhepudekteeuudehtdelteevgfduvddvjefhfedulefgudevgeeghefg udefiedtveetnecuvehluhhsthgvrhfuihiivgepudenucfrrghrrghmpehmrghilhhfrh homhepshgrmhhuvghlsehshhholhhlrghnugdrohhrgh X-ME-Proxy: Feedback-ID: i0ad843c9:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 31 Jul 2022 23:05:27 -0400 (EDT) From: Samuel Holland To: Chen-Yu Tsai , Jernej Skrabec Cc: Samuel Holland , Arnd Bergmann , Hans de Goede , Icenowy Zheng , Krzysztof Kozlowski , Maxime Ripard , Rob Herring , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-sunxi@lists.linux.dev Subject: [PATCH 5/9] soc: sunxi: sram: Fix debugfs info for A64 SRAM C Date: Sun, 31 Jul 2022 22:05:05 -0500 Message-Id: <20220801030509.21966-6-samuel@sholland.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220801030509.21966-1-samuel@sholland.org> References: <20220801030509.21966-1-samuel@sholland.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The labels were backward with respect to the register values. The SRAM is mapped to the CPU when the register value is 1. Fixes: 5e4fb6429761 ("drivers: soc: sunxi: add support for A64 and its SRAM= C") Signed-off-by: Samuel Holland Acked-by: Jernej Skrabec --- drivers/soc/sunxi/sunxi_sram.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/soc/sunxi/sunxi_sram.c b/drivers/soc/sunxi/sunxi_sram.c index 52d07bed7664..09754cd1d57d 100644 --- a/drivers/soc/sunxi/sunxi_sram.c +++ b/drivers/soc/sunxi/sunxi_sram.c @@ -78,8 +78,8 @@ static struct sunxi_sram_desc sun4i_a10_sram_d =3D { =20 static struct sunxi_sram_desc sun50i_a64_sram_c =3D { .data =3D SUNXI_SRAM_DATA("C", 0x4, 24, 1, - SUNXI_SRAM_MAP(0, 1, "cpu"), - SUNXI_SRAM_MAP(1, 0, "de2")), + SUNXI_SRAM_MAP(1, 0, "cpu"), + SUNXI_SRAM_MAP(0, 1, "de2")), }; =20 static const struct of_device_id sunxi_sram_dt_ids[] =3D { --=20 2.35.1 From nobody Sun Apr 12 04:21:23 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 21AE2C00140 for ; Mon, 1 Aug 2022 03:06:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239644AbiHADF6 (ORCPT ); Sun, 31 Jul 2022 23:05:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43320 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239530AbiHADFf (ORCPT ); Sun, 31 Jul 2022 23:05:35 -0400 Received: from wout4-smtp.messagingengine.com (wout4-smtp.messagingengine.com [64.147.123.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4FE026471; Sun, 31 Jul 2022 20:05:33 -0700 (PDT) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id 81D5232007D7; Sun, 31 Jul 2022 23:05:31 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Sun, 31 Jul 2022 23:05:32 -0400 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=fm1; t=1659323131; x=1659409531; bh=h3 4Ry2Qbm+JLSCIksskiScGwT/NymQyvjDKTXtJKZns=; b=YiywAwXiZXmSrasDvP dZrZpGxisYNG+ohJ3JzQbBGMGlDu5syc5x2UlBNH2hrrLZ0z8zUDJRrNOb6gFHQY 9P694EqS1/30Oq4Lbv+svTzebq2UBa6tHt+BrGJNFJXj1wiE33A3JIiENuxCvqGm T6+koEFAdysIaXcOBC7b0x6tylAaN5LEF58VUtMlnTnaf+SiKO3PkLGlnUVO+ZTe UsYuFMH6tJlL8kVjl+dhf0nqlf9ymxkVCAsZgIarqYm5/1xyCxKt73F/ridl2L0M u1fHdLMrGFaiknWtUh2tAUQF8FarvsZiziYWV9ydfrI2P3ZtYfJ9mtWsa26EoLO6 5Z8g== 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=fm3; t=1659323131; x=1659409531; bh=h34Ry2Qbm+JLS CIksskiScGwT/NymQyvjDKTXtJKZns=; b=Jx7fvcr2/I3/hALlklGMX87ed38aC N9o5PHjS13LbfNXvkYhVMnNN7LY16vqBtKsRAfFeAp329yZgvx0OZDnFxDWh3NE7 va6gJZ+R3dFHam/WwUkKv+oZgWz8Vp8E8mdB9/EejFnis8T2ZDpy+NDRooWYXrnP NS9pqiPNeidcUaPxkKEWP6+UCXLYdjKlr55RjhDSmbgZ0GRpuGuBKkkf1JhYU56r I/uwNFQpQ4dVafnUltw1cVAzs98bQ+J0katfFNDjWCumvqkcRxAPZD05SyhNzke/ pWMQOScWJBPzY5A9LiMGALZSdVVrLCgFgv/O3wjVQQeYU062xkUI1mpmA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrvddvvddgheejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomhepufgrmhhu vghlucfjohhllhgrnhguuceoshgrmhhuvghlsehshhholhhlrghnugdrohhrgheqnecugg ftrfgrthhtvghrnhepudekteeuudehtdelteevgfduvddvjefhfedulefgudevgeeghefg udefiedtveetnecuvehluhhsthgvrhfuihiivgepfeenucfrrghrrghmpehmrghilhhfrh homhepshgrmhhuvghlsehshhholhhlrghnugdrohhrgh X-ME-Proxy: Feedback-ID: i0ad843c9:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 31 Jul 2022 23:05:30 -0400 (EDT) From: Samuel Holland To: Chen-Yu Tsai , Jernej Skrabec Cc: Samuel Holland , Arnd Bergmann , Hans de Goede , Icenowy Zheng , Krzysztof Kozlowski , Maxime Ripard , Rob Herring , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-sunxi@lists.linux.dev Subject: [PATCH 6/9] soc: sunxi: sram: Return void from the release function Date: Sun, 31 Jul 2022 22:05:06 -0500 Message-Id: <20220801030509.21966-7-samuel@sholland.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220801030509.21966-1-samuel@sholland.org> References: <20220801030509.21966-1-samuel@sholland.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" There is no point in returning an error here, as the caller can do nothing about it. In fact, all callers already ignore the return value. Signed-off-by: Samuel Holland Acked-by: Jernej Skrabec --- drivers/soc/sunxi/sunxi_sram.c | 8 +++----- include/linux/soc/sunxi/sunxi_sram.h | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/soc/sunxi/sunxi_sram.c b/drivers/soc/sunxi/sunxi_sram.c index 09754cd1d57d..9622fd45f5e5 100644 --- a/drivers/soc/sunxi/sunxi_sram.c +++ b/drivers/soc/sunxi/sunxi_sram.c @@ -261,25 +261,23 @@ int sunxi_sram_claim(struct device *dev) } EXPORT_SYMBOL(sunxi_sram_claim); =20 -int sunxi_sram_release(struct device *dev) +void sunxi_sram_release(struct device *dev) { const struct sunxi_sram_data *sram_data; struct sunxi_sram_desc *sram_desc; =20 if (!dev || !dev->of_node) - return -EINVAL; + return; =20 sram_data =3D sunxi_sram_of_parse(dev->of_node, NULL); if (IS_ERR(sram_data)) - return -EINVAL; + return; =20 sram_desc =3D to_sram_desc(sram_data); =20 spin_lock(&sram_lock); sram_desc->claimed =3D false; spin_unlock(&sram_lock); - - return 0; } EXPORT_SYMBOL(sunxi_sram_release); =20 diff --git a/include/linux/soc/sunxi/sunxi_sram.h b/include/linux/soc/sunxi= /sunxi_sram.h index c5f663bba9c2..60e274d1b821 100644 --- a/include/linux/soc/sunxi/sunxi_sram.h +++ b/include/linux/soc/sunxi/sunxi_sram.h @@ -14,6 +14,6 @@ #define _SUNXI_SRAM_H_ =20 int sunxi_sram_claim(struct device *dev); -int sunxi_sram_release(struct device *dev); +void sunxi_sram_release(struct device *dev); =20 #endif /* _SUNXI_SRAM_H_ */ --=20 2.35.1 From nobody Sun Apr 12 04:21:23 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DA54DC00140 for ; Mon, 1 Aug 2022 03:06:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239635AbiHADGZ (ORCPT ); Sun, 31 Jul 2022 23:06:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43558 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239642AbiHADFl (ORCPT ); Sun, 31 Jul 2022 23:05:41 -0400 Received: from wout4-smtp.messagingengine.com (wout4-smtp.messagingengine.com [64.147.123.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 29C9EDF5B; Sun, 31 Jul 2022 20:05:35 -0700 (PDT) Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id 538CE320070D; Sun, 31 Jul 2022 23:05:34 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Sun, 31 Jul 2022 23:05:35 -0400 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=fm1; t=1659323133; x=1659409533; bh=8B kUceWzOwh96rJjN19akdhtFgBFl98NUCkHeE2NzwA=; b=BC5vMiF1BXBxRjpBRE al8JabKsundk9Jx0brzO+RNg4d4XRFLuublrj4Odei2o0DCPbD6nFaJ6fAeKXHiw 4TEWhdAOHRO9HxdRrawzc3dVNq7IpHingTBu2BJVXGlTrrkolFefR8glNN3wGqEb r9L2NQ5rxZfm0sIEcb55aC+1pt27uGKYyZ5py5uurvA/gyqCzUl+XmQzb4r4rWQ8 Wj/ih/W/8jSbydpOUtJpTlyaOQzvrkDeOY/YZ5U8GnWOYx6tsJVPtTN98Y0ZfJhP qwTeRAX0RBNYfITLldGddU/3SkOmC0QvcQL0x+Ms+Lxn+B4SsTOh+B8UnPXaiLGs yhlg== 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=fm3; t=1659323133; x=1659409533; bh=8BkUceWzOwh96 rJjN19akdhtFgBFl98NUCkHeE2NzwA=; b=ZkOGuuOnBgcaP45QAzwKTxvAAwT6d awM2H8aXLyevOv2vOpBiIU/hmopqlAkHATp1eJTGeUNYusEJqjn0i6bZsAMLg7ds g8tAq5fQh3hAqNWVk7b9+zIOGwfL34lKueHAoNkoeZS0pAPK7m5sZwCrd4O1zAik 12/Y+EqFjH7xOMPqCSeZMnrkG+UbgKURTouDehr7YH2objt3F0XPW6qVknP36xvi 80nsJYqQ3Ta7pSSWYQy1llmGOdtaGuN/7D9100vO1sVagbxRHIIwiD5hSXs2rSUJ SphUz/D8NzjstOhRW6rCe4qN3m2x30taS6KnoSnMj1/o0DL2+m/U0wMPg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrvddvvddgheekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomhepufgrmhhu vghlucfjohhllhgrnhguuceoshgrmhhuvghlsehshhholhhlrghnugdrohhrgheqnecugg ftrfgrthhtvghrnhepudekteeuudehtdelteevgfduvddvjefhfedulefgudevgeeghefg udefiedtveetnecuvehluhhsthgvrhfuihiivgepudenucfrrghrrghmpehmrghilhhfrh homhepshgrmhhuvghlsehshhholhhlrghnugdrohhrgh X-ME-Proxy: Feedback-ID: i0ad843c9:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 31 Jul 2022 23:05:33 -0400 (EDT) From: Samuel Holland To: Chen-Yu Tsai , Jernej Skrabec Cc: Samuel Holland , Arnd Bergmann , Hans de Goede , Icenowy Zheng , Krzysztof Kozlowski , Maxime Ripard , Rob Herring , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-sunxi@lists.linux.dev Subject: [PATCH 7/9] soc: sunxi: sram: Save a pointer to the OF match data Date: Sun, 31 Jul 2022 22:05:07 -0500 Message-Id: <20220801030509.21966-8-samuel@sholland.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220801030509.21966-1-samuel@sholland.org> References: <20220801030509.21966-1-samuel@sholland.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" It is inefficient to match the compatible string every time the regmap is accessed. Signed-off-by: Samuel Holland Acked-by: Jernej Skrabec --- drivers/soc/sunxi/sunxi_sram.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/soc/sunxi/sunxi_sram.c b/drivers/soc/sunxi/sunxi_sram.c index 9622fd45f5e5..7c6fb17cfe7f 100644 --- a/drivers/soc/sunxi/sunxi_sram.c +++ b/drivers/soc/sunxi/sunxi_sram.c @@ -305,9 +305,7 @@ static const struct sunxi_sramc_variant sun50i_h616_sra= mc_variant =3D { static bool sunxi_sram_regmap_accessible_reg(struct device *dev, unsigned int reg) { - const struct sunxi_sramc_variant *variant; - - variant =3D of_device_get_match_data(dev); + const struct sunxi_sramc_variant *variant =3D dev_get_drvdata(dev); =20 if (reg < SUNXI_SRAM_EMAC_CLOCK_REG) return false; @@ -340,6 +338,8 @@ static int __init sunxi_sram_probe(struct platform_devi= ce *pdev) if (!variant) return -EINVAL; =20 + dev_set_drvdata(dev, (struct sunxi_sramc_variant *)variant); + base =3D devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(base)) return PTR_ERR(base); --=20 2.35.1 From nobody Sun Apr 12 04:21:23 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2E2B7C19F2A for ; Mon, 1 Aug 2022 03:06:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239316AbiHADGj (ORCPT ); Sun, 31 Jul 2022 23:06:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43452 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239517AbiHADFu (ORCPT ); Sun, 31 Jul 2022 23:05:50 -0400 Received: from wout4-smtp.messagingengine.com (wout4-smtp.messagingengine.com [64.147.123.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D3153FD0D; Sun, 31 Jul 2022 20:05:39 -0700 (PDT) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id C3F753200681; Sun, 31 Jul 2022 23:05:37 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Sun, 31 Jul 2022 23:05:38 -0400 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=fm1; t=1659323137; x=1659409537; bh=S1 F/EjoEEvOcsDP7ZCJIvR1d094GwH7IrcgOjq4zzfE=; b=t5BOHuQW80+TN2ov0K sGhaXEL58slfsulgWE4jXPGM2txk+pP142Uj0v/oWiTurT9n6+SRUXxCg5N17fs2 Bk7QjljOJjYSjERcr2F0kAwFAP3DE07BnT1rJDmJe99HVNgczfhlxtqRv1sGs5uG uXhwUk8L4Jvsbs65o8W7jAhNvRdk0i5aDLCekXgrA3T6DZwCLRG3CwCEN5NFS18q DIJltOFqoVItDwGCRe/S7xnKcmkLFm7Xn4S9yQL8DhZzjdh/k8cbRHyJi6s+UDfG gmvkmJqnDwcsOq/0v7bjGOW3yj2HzsIaoID/Ks0+xMTCAq02/804sfh0Zjdna1FI li8g== 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=fm3; t=1659323137; x=1659409537; bh=S1F/EjoEEvOcs DP7ZCJIvR1d094GwH7IrcgOjq4zzfE=; b=pySYn+nfFGKiQf13ZOQVdu00F/9Lz 40omZiTbGi2rMuAFRnrogICjJWLPLoYmvhOHZ/aKM+VPR6gEt46Jht0RaNjFdFRj 6bUYhOEal8Xt4DMCobaOzKEvxz1Yv/hwm61YysRibsUmGdcPDWYaI0A4OReFKa8Q rC/lXDlWV6A79r1X+9LW6As2xur1P7bHwiM7bXFEBHNV17vMksrmJ+dyaL2tga8B xjLew/aK4xx5GR19Hoq/R0ZYMLMGshOm3LfHCVvWq6+snK7daYi16xK9lq76152h GgCUNbIs8yb43xlDwPbrMCaonsTNiJRlIyeJZwV1GMOvL6PjXR8+s8meQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrvddvvddgheejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomhepufgrmhhu vghlucfjohhllhgrnhguuceoshgrmhhuvghlsehshhholhhlrghnugdrohhrgheqnecugg ftrfgrthhtvghrnhepudekteeuudehtdelteevgfduvddvjefhfedulefgudevgeeghefg udefiedtveetnecuvehluhhsthgvrhfuihiivgepgeenucfrrghrrghmpehmrghilhhfrh homhepshgrmhhuvghlsehshhholhhlrghnugdrohhrgh X-ME-Proxy: Feedback-ID: i0ad843c9:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 31 Jul 2022 23:05:36 -0400 (EDT) From: Samuel Holland To: Chen-Yu Tsai , Jernej Skrabec Cc: Samuel Holland , Arnd Bergmann , Hans de Goede , Icenowy Zheng , Krzysztof Kozlowski , Maxime Ripard , Rob Herring , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-sunxi@lists.linux.dev Subject: [PATCH 8/9] soc: sunxi: sram: Export the LDO control register Date: Sun, 31 Jul 2022 22:05:08 -0500 Message-Id: <20220801030509.21966-9-samuel@sholland.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220801030509.21966-1-samuel@sholland.org> References: <20220801030509.21966-1-samuel@sholland.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Some newer Allwinner SoCs contain internal LDOs managed by a register in the system control MMIO space. Export this from the regmap in addtion to the EMAC register. Use generic names now that the regmap is no longer EMAC-specific. Signed-off-by: Samuel Holland Acked-by: Jernej Skrabec --- drivers/soc/sunxi/sunxi_sram.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/drivers/soc/sunxi/sunxi_sram.c b/drivers/soc/sunxi/sunxi_sram.c index 7c6fb17cfe7f..7e8dab0f0ec4 100644 --- a/drivers/soc/sunxi/sunxi_sram.c +++ b/drivers/soc/sunxi/sunxi_sram.c @@ -283,6 +283,7 @@ EXPORT_SYMBOL(sunxi_sram_release); =20 struct sunxi_sramc_variant { int num_emac_clocks; + bool has_ldo_ctrl; }; =20 static const struct sunxi_sramc_variant sun4i_a10_sramc_variant =3D { @@ -302,25 +303,28 @@ static const struct sunxi_sramc_variant sun50i_h616_s= ramc_variant =3D { }; =20 #define SUNXI_SRAM_EMAC_CLOCK_REG 0x30 +#define SUNXI_SYS_LDO_CTRL_REG 0x150 + static bool sunxi_sram_regmap_accessible_reg(struct device *dev, unsigned int reg) { const struct sunxi_sramc_variant *variant =3D dev_get_drvdata(dev); =20 - if (reg < SUNXI_SRAM_EMAC_CLOCK_REG) - return false; - if (reg > SUNXI_SRAM_EMAC_CLOCK_REG + variant->num_emac_clocks * 4) - return false; + if (reg >=3D SUNXI_SRAM_EMAC_CLOCK_REG && + reg < SUNXI_SRAM_EMAC_CLOCK_REG + variant->num_emac_clocks * 4) + return true; + if (reg =3D=3D SUNXI_SYS_LDO_CTRL_REG && variant->has_ldo_ctrl) + return true; =20 - return true; + return false; } =20 -static struct regmap_config sunxi_sram_emac_clock_regmap =3D { +static struct regmap_config sunxi_sram_regmap_config =3D { .reg_bits =3D 32, .val_bits =3D 32, .reg_stride =3D 4, /* last defined register */ - .max_register =3D SUNXI_SRAM_EMAC_CLOCK_REG + 4, + .max_register =3D SUNXI_SYS_LDO_CTRL_REG, /* other devices have no business accessing other registers */ .readable_reg =3D sunxi_sram_regmap_accessible_reg, .writeable_reg =3D sunxi_sram_regmap_accessible_reg, @@ -328,9 +332,9 @@ static struct regmap_config sunxi_sram_emac_clock_regma= p =3D { =20 static int __init sunxi_sram_probe(struct platform_device *pdev) { - struct regmap *emac_clock; const struct sunxi_sramc_variant *variant; struct device *dev =3D &pdev->dev; + struct regmap *regmap; =20 sram_dev =3D &pdev->dev; =20 @@ -344,12 +348,10 @@ static int __init sunxi_sram_probe(struct platform_de= vice *pdev) if (IS_ERR(base)) return PTR_ERR(base); =20 - if (variant->num_emac_clocks > 0) { - emac_clock =3D devm_regmap_init_mmio(&pdev->dev, base, - &sunxi_sram_emac_clock_regmap); - - if (IS_ERR(emac_clock)) - return PTR_ERR(emac_clock); + if (variant->num_emac_clocks || variant->has_ldo_ctrl) { + regmap =3D devm_regmap_init_mmio(dev, base, &sunxi_sram_regmap_config); + if (IS_ERR(regmap)) + return PTR_ERR(regmap); } =20 of_platform_populate(dev->of_node, NULL, NULL, dev); --=20 2.35.1 From nobody Sun Apr 12 04:21:23 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CFC7EC00140 for ; Mon, 1 Aug 2022 03:06:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239807AbiHADGw (ORCPT ); Sun, 31 Jul 2022 23:06:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43252 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239713AbiHADGR (ORCPT ); Sun, 31 Jul 2022 23:06:17 -0400 Received: from wout4-smtp.messagingengine.com (wout4-smtp.messagingengine.com [64.147.123.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 121816253; Sun, 31 Jul 2022 20:05:42 -0700 (PDT) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.west.internal (Postfix) with ESMTP id 1645232006F2; Sun, 31 Jul 2022 23:05:41 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Sun, 31 Jul 2022 23:05:42 -0400 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=fm1; t=1659323140; x=1659409540; bh=Bb 7CzXkKhp5csuOCYANASrOGgULw142EgcfR/Ui2Xlo=; b=kFK/x3bd2y3t+4f7V/ ipEwT1FXIogxs8d7HnfQOr/FpAPuD3Qe3D7B8tEEDdmoE3WeEbfekNgp/n0a1AzS 63+uGQQImcyI1+ZmitHQzKZUpUSq1KlypBlU2EwBA9feQolQGr2NDpiyaIfJtl+c Pd1HPnhpbbdgQiSR41LrwFnwAKuc4ALYh+EjoAvybAjba+oXqPE5dhX/Byfgzj7x aYV9Yuw9pNrSETTeeg5WXWu1fn8B61O6KaVuFhI/eLx8UTamRHP7C/MlcE6NPv/d Toso931iMuHeWChIWdqwbanDyaMCWlpZWQ4B9WtbRdLFmfSzVUaq+xLllsBCrFR7 RBkg== 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=fm3; t=1659323140; x=1659409540; bh=Bb7CzXkKhp5cs uOCYANASrOGgULw142EgcfR/Ui2Xlo=; b=1Qc9nEVDcCfx6LOc5vMJdhqM0i8T5 9lG1+COlDz/av0jnpvF98VCbhn6RFwk8puy/kvGiok14mEEW/gwaHwauynSUwkNv Sc4Nlx6xgpAtaOWs9M6GRoYH6WnDSnbKhjrlADMHZYZK76YR28mwlmUzJf/Otn/O rgQTuGEuYi9gUcNhi9/LaWEoHZ43+DzgRigm6e3g0f/hpw3UseU/s3kwg7s6Feev z/qRqqZxwkwRHWebVJM8BaygvSaG0fyFwgQ0P9J12B6/HM+TbMOOWAJTEB1RbgM2 LJbUFoKy7bOZVqFKJ7qLtMTGsCZb+P66FvW9uIMylYqseMSXxki4q5jsw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrvddvvddgheekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomhepufgrmhhu vghlucfjohhllhgrnhguuceoshgrmhhuvghlsehshhholhhlrghnugdrohhrgheqnecugg ftrfgrthhtvghrnhepudekteeuudehtdelteevgfduvddvjefhfedulefgudevgeeghefg udefiedtveetnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrh homhepshgrmhhuvghlsehshhholhhlrghnugdrohhrgh X-ME-Proxy: Feedback-ID: i0ad843c9:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 31 Jul 2022 23:05:39 -0400 (EDT) From: Samuel Holland To: Chen-Yu Tsai , Jernej Skrabec Cc: Samuel Holland , Arnd Bergmann , Hans de Goede , Icenowy Zheng , Krzysztof Kozlowski , Maxime Ripard , Rob Herring , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-sunxi@lists.linux.dev Subject: [PATCH 9/9] soc: sunxi: sram: Add support for the D1 system control Date: Sun, 31 Jul 2022 22:05:09 -0500 Message-Id: <20220801030509.21966-10-samuel@sholland.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220801030509.21966-1-samuel@sholland.org> References: <20220801030509.21966-1-samuel@sholland.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" D1 has a single EMAC and some LDOs that need to be exported. Signed-off-by: Samuel Holland Acked-by: Jernej Skrabec --- drivers/soc/sunxi/sunxi_sram.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/soc/sunxi/sunxi_sram.c b/drivers/soc/sunxi/sunxi_sram.c index 7e8dab0f0ec4..92f9186c1c42 100644 --- a/drivers/soc/sunxi/sunxi_sram.c +++ b/drivers/soc/sunxi/sunxi_sram.c @@ -294,6 +294,11 @@ static const struct sunxi_sramc_variant sun8i_h3_sramc= _variant =3D { .num_emac_clocks =3D 1, }; =20 +static const struct sunxi_sramc_variant sun20i_d1_sramc_variant =3D { + .num_emac_clocks =3D 1, + .has_ldo_ctrl =3D true, +}; + static const struct sunxi_sramc_variant sun50i_a64_sramc_variant =3D { .num_emac_clocks =3D 1, }; @@ -382,6 +387,10 @@ static const struct of_device_id sunxi_sram_dt_match[]= =3D { .compatible =3D "allwinner,sun8i-h3-system-control", .data =3D &sun8i_h3_sramc_variant, }, + { + .compatible =3D "allwinner,sun20i-d1-system-control", + .data =3D &sun20i_d1_sramc_variant, + }, { .compatible =3D "allwinner,sun50i-a64-sram-controller", .data =3D &sun50i_a64_sramc_variant, --=20 2.35.1