From nobody Sat Apr 11 06:31:32 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 1DDABC25B06 for ; Mon, 15 Aug 2022 04:13:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232584AbiHOENC (ORCPT ); Mon, 15 Aug 2022 00:13:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40132 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230420AbiHOEM5 (ORCPT ); Mon, 15 Aug 2022 00:12:57 -0400 Received: from wout1-smtp.messagingengine.com (wout1-smtp.messagingengine.com [64.147.123.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5FDEA13E3A; Sun, 14 Aug 2022 21:12:56 -0700 (PDT) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id AD0C03200124; Mon, 15 Aug 2022 00:12:54 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Mon, 15 Aug 2022 00:12:55 -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=fm2; t=1660536774; x=1660623174; bh=ya VqJui3bYeLRgRCIoQLia/sNzVVTMrxQMcj8Y31TN4=; b=lvSnByki87LxSF/liV ZUpi0T9/GeoQE+48s6UWVWpgFK6HNFbdtxt5I1/R3r6LlFiV6bih25qA9l6Ido+6 j/35XGxSIquHzbbAf27f0j8lhWX/hPWzhGTr9NLoS/FrU8mAnPzFvBHMbnprtWrE gYp43gf7s0qMIapWKBLBr5v/PeeIjAGgb9OorLKvNGFz7yRKG675bH+s1OZM3Cep TRX2mMXiU+ucUpoEKG/R2pWTKvusjPhiyHXGQxkeLx+FfBDywejjd3Mz98isUI/j DoAtX/8NLpTAjHvWCfq6GjKdRbnBnX78HdFmEav1ZHMHcHbS94IQTJ+9GI1Aq7UK rqbw== 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=1660536774; x=1660623174; bh=yaVqJui3bYeLR gRCIoQLia/sNzVVTMrxQMcj8Y31TN4=; b=Qk4yQrQmw2tJPb9TkWoOfocxpmi4n MVt7TLTnl9iCYRD9DKGKYLyRa9yQYnQb8bGghQQk+FD2awNOhUkx3WFCS15mmnfh /X/I9brApLp6skOY0+kJg/19hr2j1FOKa4F169VJXMBSLdczMWOAGVHJbodHSS5r 07Z3TIsUANKNn78CwyJ5n7hUm8LE8dO6CkCPfavClio6XYUGC7NHQK/odpSF3SMZ FcuCLwi+sS5ej1T+ffrgv4wrvacBl+P+QULTheH94jWqZztoRzL+Ix8Iwz7ysDVa 5X8dskipYCGzSZywlglBUINuSS3pnWAHP5zDh6kr/tgzdkl3CD7lKiGZw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrvdehuddgkeehucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomhepufgrmhhu vghlucfjohhllhgrnhguuceoshgrmhhuvghlsehshhholhhlrghnugdrohhrgheqnecugg ftrfgrthhtvghrnhepudekteeuudehtdelteevgfduvddvjefhfedulefgudevgeeghefg udefiedtveetnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrh homhepshgrmhhuvghlsehshhholhhlrghnugdrohhrgh X-ME-Proxy: Feedback-ID: i0ad843c9:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 15 Aug 2022 00:12:53 -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, Krzysztof Kozlowski Subject: [PATCH v2 01/10] dt-bindings: sram: sunxi-sram: Clean up the compatible lists Date: Sun, 14 Aug 2022 23:12:38 -0500 Message-Id: <20220815041248.53268-2-samuel@sholland.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220815041248.53268-1-samuel@sholland.org> References: <20220815041248.53268-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" Use enumerations where appropriate to combine "const" choices and deduplicate fallback compatible strings. Suggested-by: Krzysztof Kozlowski Signed-off-by: Samuel Holland Reviewed-by: Andre Przywara Reviewed-by: Heiko Stuebner Reviewed-by: Krzysztof Kozlowski --- Changes in v2: - New patch to first clean up the binding .../allwinner,sun4i-a10-system-control.yaml | 81 +++++++------------ 1 file changed, 31 insertions(+), 50 deletions(-) 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..5055c9081059 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 @@ -24,32 +24,30 @@ properties: =20 compatible: oneOf: - - const: allwinner,sun4i-a10-sram-controller + - enum: + - allwinner,sun4i-a10-sram-controller + - allwinner,sun50i-a64-sram-controller deprecated: true - - const: allwinner,sun4i-a10-system-control - - const: allwinner,sun5i-a13-system-control + - enum: + - allwinner,sun4i-a10-system-control + - allwinner,sun5i-a13-system-control + - allwinner,sun8i-a23-system-control + - allwinner,sun8i-h3-system-control + - allwinner,sun50i-a64-system-control + - allwinner,sun50i-h5-system-control + - allwinner,sun50i-h616-system-control - items: - - const: allwinner,sun7i-a20-system-control + - enum: + - allwinner,suniv-f1c100s-system-control + - allwinner,sun7i-a20-system-control + - allwinner,sun8i-r40-system-control - const: allwinner,sun4i-a10-system-control - - const: allwinner,sun8i-a23-system-control - - const: allwinner,sun8i-h3-system-control - items: - const: allwinner,sun8i-v3s-system-control - const: allwinner,sun8i-h3-system-control - - items: - - const: allwinner,sun8i-r40-system-control - - const: allwinner,sun4i-a10-system-control - - const: allwinner,sun50i-a64-sram-controller - deprecated: true - - const: allwinner,sun50i-a64-system-control - - const: allwinner,sun50i-h5-system-control - items: - const: allwinner,sun50i-h6-system-control - const: allwinner,sun50i-a64-system-control - - items: - - const: allwinner,suniv-f1c100s-system-control - - const: allwinner,sun4i-a10-system-control - - const: allwinner,sun50i-h616-system-control =20 reg: maxItems: 1 @@ -76,43 +74,26 @@ patternProperties: - const: allwinner,sun4i-a10-sram-d - const: allwinner,sun50i-a64-sram-c - items: - - const: allwinner,sun5i-a13-sram-a3-a4 - - const: allwinner,sun4i-a10-sram-a3-a4 - - items: - - const: allwinner,sun7i-a20-sram-a3-a4 + - enum: + - allwinner,sun5i-a13-sram-a3-a4 + - allwinner,sun7i-a20-sram-a3-a4 - const: allwinner,sun4i-a10-sram-a3-a4 - items: - - const: allwinner,sun5i-a13-sram-c1 - - const: allwinner,sun4i-a10-sram-c1 - - items: - - const: allwinner,sun7i-a20-sram-c1 - - const: allwinner,sun4i-a10-sram-c1 - - items: - - const: allwinner,sun8i-a23-sram-c1 - - const: allwinner,sun4i-a10-sram-c1 - - items: - - const: allwinner,sun8i-h3-sram-c1 + - enum: + - allwinner,sun5i-a13-sram-c1 + - allwinner,sun7i-a20-sram-c1 + - allwinner,sun8i-a23-sram-c1 + - allwinner,sun8i-h3-sram-c1 + - allwinner,sun8i-r40-sram-c1 + - allwinner,sun50i-a64-sram-c1 + - allwinner,sun50i-h5-sram-c1 + - allwinner,sun50i-h6-sram-c1 - const: allwinner,sun4i-a10-sram-c1 - items: - - const: allwinner,sun8i-r40-sram-c1 - - const: allwinner,sun4i-a10-sram-c1 - - items: - - const: allwinner,sun50i-a64-sram-c1 - - const: allwinner,sun4i-a10-sram-c1 - - items: - - const: allwinner,sun50i-h5-sram-c1 - - const: allwinner,sun4i-a10-sram-c1 - - items: - - const: allwinner,sun50i-h6-sram-c1 - - const: allwinner,sun4i-a10-sram-c1 - - items: - - const: allwinner,sun5i-a13-sram-d - - const: allwinner,sun4i-a10-sram-d - - items: - - const: allwinner,sun7i-a20-sram-d - - const: allwinner,sun4i-a10-sram-d - - items: - - const: allwinner,suniv-f1c100s-sram-d + - enum: + - allwinner,suniv-f1c100s-sram-d + - allwinner,sun5i-a13-sram-d + - allwinner,sun7i-a20-sram-d - const: allwinner,sun4i-a10-sram-d - items: - const: allwinner,sun50i-h6-sram-c --=20 2.35.1 From nobody Sat Apr 11 06:31:32 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 0ABE2C00140 for ; Mon, 15 Aug 2022 04:13:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232814AbiHOENH (ORCPT ); Mon, 15 Aug 2022 00:13:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40164 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232391AbiHOENA (ORCPT ); Mon, 15 Aug 2022 00:13:00 -0400 Received: from wout1-smtp.messagingengine.com (wout1-smtp.messagingengine.com [64.147.123.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A7D2013E3C; Sun, 14 Aug 2022 21:12:59 -0700 (PDT) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id 15F703200344; Mon, 15 Aug 2022 00:12:58 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Mon, 15 Aug 2022 00:12:59 -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=fm2; t=1660536777; x=1660623177; bh=Ei w8KXKMFkR9PlzvE3481gnHml1c/VpGw/PSxEQXCug=; b=H4H/9c5uBqHvjpu2iI J6Dck3vHHew96Aaapc1jvqCUrdhgHxp2/l8iN/NjBEC/GFkybMfO5I90Uvz7gs13 LewqlLsvdVFwFWGabPggDNkDf2Xaf9BrKzA9wAVlxm/eA2jzQKWoT6cpyoma6HyI 9rAVOnOWuHseQ+cxJA3Az+0p/OBUmrehAM8dWmRvYPYuTllR8Nt/09DKeVVAVcYj 8P86IhlJNoiUWp1ULUl84TGUWEhmjkQ4kP1Jjoqy5Phem02S0hwN0TL2dkCyKvIa dUk0TN0BR+geBis4A1UI6BigHabZjUNc5N9KEork6oZwyP4bTtF9PlFpfPwiuxD8 CdeA== 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=1660536777; x=1660623177; bh=Eiw8KXKMFkR9P lzvE3481gnHml1c/VpGw/PSxEQXCug=; b=5HTwiTfuwKEDcPlv62IR1cReZRhAH hzcazI5HaT/Rr0niNbHU4tKA9XdTI1VDruW2VHo0qVKjpUNG8fMIJ8wsCqAmESrJ KgZFssroK0d7h0g9KwSGvNMHaJZHKiUZhWtY1wl+2VHoxHoScLaaxHiEsS77W9MJ dmJIi4YBn+axQ3qV/Fr3lk8++scGbX6piNR3VHc7aegYNbD+pEGeXwEpYS2OfrPF Hjj06io87mX+GvLk6QgWUI912AQJGZA5rmZjYUA2z2BcxfoYfjZ1iCPz32qsAs5x HDdQDfexHvHXyStaFkP62bddaDl9fPF5IVVLV/SBZE7JDB13VGWRCLaHg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrvdehuddgkeehucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomhepufgrmhhu vghlucfjohhllhgrnhguuceoshgrmhhuvghlsehshhholhhlrghnugdrohhrgheqnecugg ftrfgrthhtvghrnhepudekteeuudehtdelteevgfduvddvjefhfedulefgudevgeeghefg udefiedtveetnecuvehluhhsthgvrhfuihiivgepudenucfrrghrrghmpehmrghilhhfrh homhepshgrmhhuvghlsehshhholhhlrghnugdrohhrgh X-ME-Proxy: Feedback-ID: i0ad843c9:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 15 Aug 2022 00:12:56 -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 v2 02/10] dt-bindings: sram: sunxi-sram: Add D1 compatible string Date: Sun, 14 Aug 2022 23:12:39 -0500 Message-Id: <20220815041248.53268-3-samuel@sholland.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220815041248.53268-1-samuel@sholland.org> References: <20220815041248.53268-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 Acked-by: Krzysztof Kozlowski Reviewed-by: Heiko Stuebner --- (no changes since v1) .../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 5055c9081059..d64c1b28fb61 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 @@ -33,6 +33,7 @@ properties: - allwinner,sun5i-a13-system-control - allwinner,sun8i-a23-system-control - allwinner,sun8i-h3-system-control + - allwinner,sun20i-d1-system-control - allwinner,sun50i-a64-system-control - allwinner,sun50i-h5-system-control - allwinner,sun50i-h616-system-control --=20 2.35.1 From nobody Sat Apr 11 06:31:32 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 4C11BC00140 for ; Mon, 15 Aug 2022 04:13:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240206AbiHOENL (ORCPT ); Mon, 15 Aug 2022 00:13:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40350 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232793AbiHOENH (ORCPT ); Mon, 15 Aug 2022 00:13:07 -0400 Received: from wout1-smtp.messagingengine.com (wout1-smtp.messagingengine.com [64.147.123.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0D72B14028; Sun, 14 Aug 2022 21:13:03 -0700 (PDT) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id 69E2232003CE; Mon, 15 Aug 2022 00:13:01 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Mon, 15 Aug 2022 00:13:02 -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=fm2; t=1660536780; x=1660623180; bh=Um nIFzo9e00XsWhF+6vCJvzdXF32upMbbbcab6Vz/QM=; b=QBFbrqBFOIOpH8O5w3 FqfbCxvmLZBFw1F9jY1eoEHTJguMAv8M7MY6ZLj8rNG3+c7iVOOR7rQn1pfEmSF6 ykWOZJdUzJawKQznQFOWBGeddSXgOIFmwCMdU92OoQiY15i/mqFF6AjdsjEz4Hlr 8ppUbc8YRS3IyR3kP0nC8qMkfo4qDqQLfofMcSqFHW4p83SLbwGjtCkaWNJ+QRKb Jcm2U95hFyhJRM2H+wyyqqEYaQDs/i0Af5XMO5iXLMeHI+MWgxGvy5Dx+ufNb2dl UVuwSeq1qkAZDVA3q80/PxZCnvGzL+7KJeCRkP8vN4UdaRaZo9hZqJtqrbDf4I29 ZlfQ== 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=1660536780; x=1660623180; bh=UmnIFzo9e00Xs WhF+6vCJvzdXF32upMbbbcab6Vz/QM=; b=NGBLS/HxWkE/vdZ9fOtJNHwab6TLH 4lfw9b/gQv2CtMwkaVqVsrG8300OSFYmmZ8ba6lmLNbjDy/na2xXrrF8zhAluZC8 DfjKa8Cx6+Z6qLfXIztkX1CKh/H1haO/OnuNUqOMcH1CiUUTORKYIkl4/NFcI8US lsMO+0bh6+bHlHKyacpCt2bCZEYaiOTWltMvpr7FCXbsMKHO5XJa7soqBQ4sthv+ a0P0LnNxHioKr2JrwYq6jPvSHocnisNkYaAQk6duEJ9+d22VkFtfW6QbK+9AMsxw bKMaHlTEdlXUezR9pj86nZP2QrnyyBkaW8k1bGs6tGq8HjKZqjvUPR7tQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrvdehuddgkeehucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomhepufgrmhhu vghlucfjohhllhgrnhguuceoshgrmhhuvghlsehshhholhhlrghnugdrohhrgheqnecugg ftrfgrthhtvghrnhepudekteeuudehtdelteevgfduvddvjefhfedulefgudevgeeghefg udefiedtveetnecuvehluhhsthgvrhfuihiivgepudenucfrrghrrghmpehmrghilhhfrh homhepshgrmhhuvghlsehshhholhhlrghnugdrohhrgh X-ME-Proxy: Feedback-ID: i0ad843c9:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 15 Aug 2022 00:13:00 -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 v2 03/10] soc: sunxi: sram: Actually claim SRAM regions Date: Sun, 14 Aug 2022 23:12:40 -0500 Message-Id: <20220815041248.53268-4-samuel@sholland.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220815041248.53268-1-samuel@sholland.org> References: <20220815041248.53268-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") Reviewed-by: Jernej Skrabec Signed-off-by: Samuel Holland Reviewed-by: Heiko Stuebner Tested-by: Heiko Stuebner --- (no changes since v1) 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 Sat Apr 11 06:31:32 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 12FBFC00140 for ; Mon, 15 Aug 2022 04:13:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240413AbiHOENP (ORCPT ); Mon, 15 Aug 2022 00:13:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40404 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232927AbiHOENI (ORCPT ); Mon, 15 Aug 2022 00:13:08 -0400 Received: from wout1-smtp.messagingengine.com (wout1-smtp.messagingengine.com [64.147.123.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A8C9914027; Sun, 14 Aug 2022 21:13:06 -0700 (PDT) Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id 18634320039A; Mon, 15 Aug 2022 00:13:05 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Mon, 15 Aug 2022 00:13:06 -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=fm2; t=1660536784; x=1660623184; bh=6t +E/GzmpMJm/V9XelMviA0bo6ILpcPhq8GPa08Xnhg=; b=EjvkZeVAQKv1yhm0JW Wp9zDLMd5ZTzs+VktdeFb7T2SV7KUKv78JiIky7719C2mr3FJDHTLPd5wTFCGu5M s1zTKCUCtFQgkR1ObBWFjxCL3vGowJmA/pgQt2xzNtxbv/ccep20siuE7ea+cCBy 3CnKavQhEI9E7433gsAjjo3X7yXfYpWg/Gr5jQk4Q4fOAzZjg/ukEJ0HtADmZYfj 2/iR4b6CwGprRdGRPGyUoUReG/THGXfOXx65ONQBHXKTLt6mOt4l+Ejo0H6P7IEh FIOBhYEifdmpQlR53YIQSgauEzCQ/b2W9vLeo689OjrQF/X+9LXNZziqpbgZ0DLN OFog== 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=1660536784; x=1660623184; bh=6t+E/GzmpMJm/ V9XelMviA0bo6ILpcPhq8GPa08Xnhg=; b=MJ70y6S9jjaVAuY2GY5h0/KySpe+Y /Y0k8N5/m+F21uJ61AdDQrHSviVI4T8rKrmt5ylikQpAkj/f+fN70q3sY861UL25 jgCBXFyj97LDjY4yXIUt8acMvj8ITNMeFwjsr/Yhvfa8YmKJ6/2JZm1r7UcwgI+F KWhTmaSbGKHSixGw9e6PeTCkVBUl3YGbxEYcCg/fLu9O84+IJXulO1YkZ5DP/3Zl b+P9q/8GI2M77Wx5GTFVfdgrO2NmZmll847KYZTyM/jK77DyfFvseY+i6bFHfV/u W8BWAM46/AoO1/qbX1DNtyrasG134ZhhQV1vY39W04tEFwUIoCcSycYeQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrvdehuddgkeegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomhepufgrmhhu vghlucfjohhllhgrnhguuceoshgrmhhuvghlsehshhholhhlrghnugdrohhrgheqnecugg ftrfgrthhtvghrnhepudekteeuudehtdelteevgfduvddvjefhfedulefgudevgeeghefg udefiedtveetnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrh homhepshgrmhhuvghlsehshhholhhlrghnugdrohhrgh X-ME-Proxy: Feedback-ID: i0ad843c9:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 15 Aug 2022 00:13:03 -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 v2 04/10] soc: sunxi: sram: Prevent the driver from being unbound Date: Sun, 14 Aug 2022 23:12:41 -0500 Message-Id: <20220815041248.53268-5-samuel@sholland.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220815041248.53268-1-samuel@sholland.org> References: <20220815041248.53268-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= ") Reviewed-by: Jernej Skrabec Signed-off-by: Samuel Holland Reviewed-by: Heiko Stuebner Tested-by: Heiko Stuebner --- (no changes since v1) 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 Sat Apr 11 06:31:32 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 D0EA6C25B06 for ; Mon, 15 Aug 2022 04:13:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240134AbiHOEN2 (ORCPT ); Mon, 15 Aug 2022 00:13:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40692 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240427AbiHOENP (ORCPT ); Mon, 15 Aug 2022 00:13:15 -0400 Received: from wout1-smtp.messagingengine.com (wout1-smtp.messagingengine.com [64.147.123.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A1C7F140A0; Sun, 14 Aug 2022 21:13:10 -0700 (PDT) Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.west.internal (Postfix) with ESMTP id A269E320034E; Mon, 15 Aug 2022 00:13:08 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Mon, 15 Aug 2022 00:13:09 -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=fm2; t=1660536788; x=1660623188; bh=bs QRvr/fSy27iYvVN9Y3M8XtrRlfI3kw9DiTc9wURok=; b=Zofwc9ihrKJdg51xHx yltqKhiMGW8wV4p4LRFyM9wuQNn516Ln+PUvvS8bnelUSdTvG2qQeO+L23tl++q7 uPUybi5aX/BRvR74qx7DBXME/R96wbpyGJcuIqJF/TXxny2EnEVbeWSV/5DWVlRg VuoGkJ+QTxc51tgyT8XYsc5sbfgS5E8TYAuLy2m+tKGrf7tZeTMyY/iuBcKbKGXJ A0MnspvlAEjuX+1LPWRx8mAxAMgHgK4SXrhz/UZ6mNe/ypu89hSioS7HZ8bIljAZ yLYu0c4k34cCwbXIgGMXQydZNsTe0IUYd5lbTPNtwqwR98MEolhIQAsrCgamz5zH 8GYA== 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=1660536788; x=1660623188; bh=bsQRvr/fSy27i YvVN9Y3M8XtrRlfI3kw9DiTc9wURok=; b=S+7jvBq81uWR26r8f7rQACLxEB40u QyaeAK6KO/mAQ9nA7ej2sIVtBqJNeClq1165prwoRxMfNPfcAgyGfag6vblHF78P wli45DfZFRiuaGfvUq5YJblvtWeC46CwL4wutrTyfD+vuKwIXOudWLncmv4AiIbS nUhXAEXF64DK95gAbNDOWW5aoO7yJgMNQ2K8FD32Lx1JpvPklIdleLgrWuTSfTlM WJWoX3wbERx42+q+mRUw7fbeK5M35kxTPVKhCI1fmngpecEe6pzIplmHnitbdj02 2jKaPlUdZi81iGAKuL+a7rNkxdYd5Ycp7PvSc/aRVplO6yMZBFYdENRAg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrvdehuddgkeegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomhepufgrmhhu vghlucfjohhllhgrnhguuceoshgrmhhuvghlsehshhholhhlrghnugdrohhrgheqnecugg ftrfgrthhtvghrnhepudekteeuudehtdelteevgfduvddvjefhfedulefgudevgeeghefg udefiedtveetnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrh homhepshgrmhhuvghlsehshhholhhlrghnugdrohhrgh X-ME-Proxy: Feedback-ID: i0ad843c9:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 15 Aug 2022 00:13:07 -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 v2 05/10] soc: sunxi: sram: Fix probe function ordering issues Date: Sun, 14 Aug 2022 23:12:42 -0500 Message-Id: <20220815041248.53268-6-samuel@sholland.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220815041248.53268-1-samuel@sholland.org> References: <20220815041248.53268-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= ") Reviewed-by: Jernej Skrabec Signed-off-by: Samuel Holland Tested-by: Heiko Stuebner --- (no changes since v1) 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 Sat Apr 11 06:31:32 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 15AB3C00140 for ; Mon, 15 Aug 2022 04:13:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240517AbiHOENa (ORCPT ); Mon, 15 Aug 2022 00:13:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40524 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232833AbiHOENV (ORCPT ); Mon, 15 Aug 2022 00:13:21 -0400 Received: from wout1-smtp.messagingengine.com (wout1-smtp.messagingengine.com [64.147.123.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D95031408E; Sun, 14 Aug 2022 21:13:13 -0700 (PDT) Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.west.internal (Postfix) with ESMTP id E758832004AE; Mon, 15 Aug 2022 00:13:11 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Mon, 15 Aug 2022 00:13:13 -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=fm2; t=1660536791; x=1660623191; bh=qt OroOKPyiVLPusAb844jwRTjcP+oe0WxCpZbVu2Sb4=; b=mDOkrWDevbnKQAQnNb 7FCIj33VQ8OtnacsGpCo3Fs5NMXWZMKlabCkmCnSBg/SKp2tzQvlzghhWj8EREnT d6e6L71sKgqFa1BRi4FrLJnve3Njbuf65jMd+zh2VaLS9B1ly5QKthX8gefPlkh5 WWROdMrra++7ebDGD/ijXcotLk+wPGtuHE7BH5LPxM9VmMfsdiw0dEE4EdPATUB1 ratBzIPgi5LIc54YJaJjXe/Rcl+y/e45kirpSJ3v5TpaRLo7wX/ckTy2uJ+BAGGO kxbHRID1du3rD/ilwwnVkePpi1yUDHoCY++58lchPR12gorYFY3NDjTaact9mIin 9csg== 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=1660536791; x=1660623191; bh=qtOroOKPyiVLP usAb844jwRTjcP+oe0WxCpZbVu2Sb4=; b=RQTbTen2IJMqnvVjqRFoUhyGN+pV6 DMxjKnbO1qtW5eUWgI64Or21/x7etVFqB1j8tOvshujEILuiUh76RsB4QGLRpYyN B4In1mCEMs4u1GpZxPASR7ae7bG0aIu6QyWauz5BuAFxOU9UpLJNzmeYTcvQu3n+ 8BtYjcGYDsQr3ftvcUf7SsBWGPwm3j9HrsFNObwtYPDdcm2gvkcKwbOxa4rs2IKL 9DpgIyfJjGmrAOepdLr9d3eztgcGRGzT4N5SDR8lIrV44bu91TaK3PKCnzCBKE4G be7inzrgY+4L/Lpmb6juOOEC3Hvk9JAJyAvp9T4Y3JfWXaZFIQ6MrcaTQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrvdehuddgkeegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomhepufgrmhhu vghlucfjohhllhgrnhguuceoshgrmhhuvghlsehshhholhhlrghnugdrohhrgheqnecugg ftrfgrthhtvghrnhepudekteeuudehtdelteevgfduvddvjefhfedulefgudevgeeghefg udefiedtveetnecuvehluhhsthgvrhfuihiivgepudenucfrrghrrghmpehmrghilhhfrh homhepshgrmhhuvghlsehshhholhhlrghnugdrohhrgh X-ME-Proxy: Feedback-ID: i0ad843c9:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 15 Aug 2022 00:13:10 -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 v2 06/10] soc: sunxi: sram: Fix debugfs info for A64 SRAM C Date: Sun, 14 Aug 2022 23:12:43 -0500 Message-Id: <20220815041248.53268-7-samuel@sholland.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220815041248.53268-1-samuel@sholland.org> References: <20220815041248.53268-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") Acked-by: Jernej Skrabec Signed-off-by: Samuel Holland --- (no changes since v1) 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 Sat Apr 11 06:31:32 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 A321FC00140 for ; Mon, 15 Aug 2022 04:13:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240623AbiHOENg (ORCPT ); Mon, 15 Aug 2022 00:13:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40978 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240445AbiHOENW (ORCPT ); Mon, 15 Aug 2022 00:13:22 -0400 Received: from wout1-smtp.messagingengine.com (wout1-smtp.messagingengine.com [64.147.123.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 07A2A140BD; Sun, 14 Aug 2022 21:13:17 -0700 (PDT) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id 4BC1032004E7; Mon, 15 Aug 2022 00:13:15 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Mon, 15 Aug 2022 00:13:16 -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=fm2; t=1660536794; x=1660623194; bh=0n lG6ZDiBzbAdn9rMY9Wvc4mEHKC/xeUwBEc8zJn16s=; b=yEWx64jF6G5/dLN6NA jPioeG+W1SSLewCp15W4PUN/F//rEfm+tw6KVILyGaORUNuSKZ4FYwEfNzNnIS0J GCC0KOKS6QwW66vYejfeVsqoN5F2tyigXSC/H1xKISLNFi03dyvEBtN1D0NEORdv W9DbGaQxP7zEXO7oAFaOeN8Q8JDDB5ikxviXVgb2pAzIeUrbeGUyY4P9eOT6CJyW JTGQJqUdLwNQLBJJwXKP49vjVQa8YmOHspl0Nyv3+PF8aNekX4lait9oln+zaeDi 1kUqfMlVmLh6VYnGaLTHv5cqJRjf1P1UuIkoxDYHTZnKslZupinpDa60heXqmWva zewQ== 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=1660536794; x=1660623194; bh=0nlG6ZDiBzbAd n9rMY9Wvc4mEHKC/xeUwBEc8zJn16s=; b=wjC8+hS7bps6cUT22i2PtCsj49FeS uuKzq+2l1LjAMQ6X4RQXpV4wdTAS/gSl9kJJ/nDzavn14cHkvLpXvc1myg/SXnyn nk3Z3zZBwEtXk+8IsEOdlUOuZakExUomWo1V0x0H0b0SAuASsFq5tIU6pRtuPFVS X2euSKBqvWLMnSo+CAt6a/Iv9X5nZCvNtSlgPnJQyQ7N0XZSeSrZyCmQajaz6d2x CUBo4bo/7AgirS0rwOjnhVBPgUnMx7ITJ5RSYgu3ydTua98htC+Ae1jd2cJlxfbD BqZk7rR+4ARdNXZKWEjl7kF7WNsHrgZNX1+UtBeAQzm4h0cxKbpT/0LMA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrvdehuddgkeehucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomhepufgrmhhu vghlucfjohhllhgrnhguuceoshgrmhhuvghlsehshhholhhlrghnugdrohhrgheqnecugg ftrfgrthhtvghrnhepudekteeuudehtdelteevgfduvddvjefhfedulefgudevgeeghefg udefiedtveetnecuvehluhhsthgvrhfuihiivgepfeenucfrrghrrghmpehmrghilhhfrh homhepshgrmhhuvghlsehshhholhhlrghnugdrohhrgh X-ME-Proxy: Feedback-ID: i0ad843c9:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 15 Aug 2022 00:13:14 -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 v2 07/10] soc: sunxi: sram: Return void from the release function Date: Sun, 14 Aug 2022 23:12:44 -0500 Message-Id: <20220815041248.53268-8-samuel@sholland.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220815041248.53268-1-samuel@sholland.org> References: <20220815041248.53268-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. Acked-by: Jernej Skrabec Signed-off-by: Samuel Holland Reviewed-by: Heiko Stuebner Tested-by: Heiko Stuebner --- (no changes since v1) 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 Sat Apr 11 06:31:32 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 5B198C25B0E for ; Mon, 15 Aug 2022 04:13:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240711AbiHOENq (ORCPT ); Mon, 15 Aug 2022 00:13:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40382 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240410AbiHOENY (ORCPT ); Mon, 15 Aug 2022 00:13:24 -0400 Received: from wout1-smtp.messagingengine.com (wout1-smtp.messagingengine.com [64.147.123.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D78EF140DB; Sun, 14 Aug 2022 21:13:20 -0700 (PDT) Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.west.internal (Postfix) with ESMTP id A03F032005C1; Mon, 15 Aug 2022 00:13:18 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Mon, 15 Aug 2022 00:13:19 -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=fm2; t=1660536798; x=1660623198; bh=RX 0SlEktfrQtPXw+non/OchyG9cDMb9wJ6p6VMV+d1s=; b=EwSRzuob6nUdMkFGOq OtlL8jLm0ztjwX8kZ6U1ruba8+lk7YbMSl9l3tcE5/95GvZibNmn7sN/Fz5iOVc7 qcg+l17CrGgzC8MDVxBZlD9ATI0Tf/bqUvOyiyGXl8GgwPiD2RlHs+r4+EmV1YhC FHzPWI2xSaaKJ8695KV8ZAYmsr5BBLGGlpg46BDzAZCOQg0NKY93gVEI/W8kopjU 3oQE0RiOfPj30lsC5gnH1YWQJ3u2xodlinChYTRhUNRogAr2IL815lWzpcsXHJyE ntNWGBjcqip97YnRRwtg1X9B2rIQF/cJbN78Sn7GXPmkyNHEPxj0RaZzjtS4uQSl tCTg== 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=1660536798; x=1660623198; bh=RX0SlEktfrQtP Xw+non/OchyG9cDMb9wJ6p6VMV+d1s=; b=PI544408CbPVobr4ngPD4cmYSzoQe BwCmcS5c/KAiflTF3MuhegUJ3F3Qct7zeQMqNAZPlPec/Sft73jQItlzghw7yueY dhEpRZSYf73e6IsrNf3GddKTv8PSw3jbNSOi8jHCVR/KQEtNXz5Ssymk+YY9dtaV zLPadexzfADR3X4vqK8iiZAwDQB5jSC9B1MxnhI47mb7pFiYeUEhuCT5zbS3JsUq 6Adpu5j+SJMbhd+BVXN1AWUaieeFTjFiJqr3A+yTwQBlDgMYzUHFof4n6CYjUcbw XKL+hESNObgp+hSZZNbplECgp8Z71YTgMPDno5lp56ULMKFI0MKpfhcrQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrvdehuddgkeegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomhepufgrmhhu vghlucfjohhllhgrnhguuceoshgrmhhuvghlsehshhholhhlrghnugdrohhrgheqnecugg ftrfgrthhtvghrnhepudekteeuudehtdelteevgfduvddvjefhfedulefgudevgeeghefg udefiedtveetnecuvehluhhsthgvrhfuihiivgepvdenucfrrghrrghmpehmrghilhhfrh homhepshgrmhhuvghlsehshhholhhlrghnugdrohhrgh X-ME-Proxy: Feedback-ID: i0ad843c9:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 15 Aug 2022 00:13:17 -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 v2 08/10] soc: sunxi: sram: Save a pointer to the OF match data Date: Sun, 14 Aug 2022 23:12:45 -0500 Message-Id: <20220815041248.53268-9-samuel@sholland.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220815041248.53268-1-samuel@sholland.org> References: <20220815041248.53268-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. Acked-by: Jernej Skrabec Signed-off-by: Samuel Holland Reviewed-by: Heiko Stuebner Tested-by: Heiko Stuebner --- (no changes since v1) 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 Sat Apr 11 06:31:32 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 79D4BC00140 for ; Mon, 15 Aug 2022 04:13:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240739AbiHOENv (ORCPT ); Mon, 15 Aug 2022 00:13:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40920 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240419AbiHOENZ (ORCPT ); Mon, 15 Aug 2022 00:13:25 -0400 Received: from wout1-smtp.messagingengine.com (wout1-smtp.messagingengine.com [64.147.123.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 33C9714093; Sun, 14 Aug 2022 21:13:23 -0700 (PDT) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id 06FB132005D8; Mon, 15 Aug 2022 00:13:21 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Mon, 15 Aug 2022 00:13: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=fm2; t=1660536801; x=1660623201; bh=9B C0LSiPGpFiksVoDFV8G0WmbmUqGVokgFnFCFXLEhw=; b=mV9deqOP4HVpwJzUVi 6gZ24/IBdEJVUOcoJxJ5FUR4wtecQswdVNL3hR41XcubZjrP0taz1SOc7uYn0b1D RcxWROtd5nc9ICKtvpyzwBVyFYRl5OlDFzt7URr9Ei+DsIW9eEGBvP2n0QNF8Lqd tr24vKmmf8eQK6K3tGS+AR5idO2CGfqA0OveWoLFHggH7kzczjYUC+wgVYVAUgS3 zEeV2UqS0/FFarPuYtU5pcPMubeyPYTjrVI6rrJRPaAZf/cyCMpRBnGs0s9Hotp1 Sg5PxdRfgLVxsjE6D+TNPPfDI05JVruz+PIYd3x2P1vwp9RZOZ00oVkRTQ238P+Y cibg== 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=1660536801; x=1660623201; bh=9BC0LSiPGpFik sVoDFV8G0WmbmUqGVokgFnFCFXLEhw=; b=QNgedk6eIxXmLDs8HLQaP4CbIW0uv 4R5fmJ96hF9HyYQjzCM6MFWU3mpXxao8C70CFuRct+KRgHRZlnXU+ro6WCemeovA A1vyR2pAb0rPPoKrKxAnj4AksZw3TCeUJTJvUbG3bNnhJC08S/Z+iEDgFVKGo60f KWV/og1OIHeNXyjYvy09FMJsJ5yxR8rJMopQUwIR9SHWEcJQZkvCa9HHJqv/845j 8nsJUgCEJvCtUCya1ys5GgoaPx0lj3yzDAxbEcJp909AGV0V/JniGDePTXi7hoAG nc6yVqYV3A/msnyL9g1bnlXCKaN79Xlwb9fboXaF1nWmHexJKQgvwV+2w== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrvdehuddgkeehucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomhepufgrmhhu vghlucfjohhllhgrnhguuceoshgrmhhuvghlsehshhholhhlrghnugdrohhrgheqnecugg ftrfgrthhtvghrnhepudekteeuudehtdelteevgfduvddvjefhfedulefgudevgeeghefg udefiedtveetnecuvehluhhsthgvrhfuihiivgepgeenucfrrghrrghmpehmrghilhhfrh homhepshgrmhhuvghlsehshhholhhlrghnugdrohhrgh X-ME-Proxy: Feedback-ID: i0ad843c9:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 15 Aug 2022 00:13:20 -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 v2 09/10] soc: sunxi: sram: Export the LDO control register Date: Sun, 14 Aug 2022 23:12:46 -0500 Message-Id: <20220815041248.53268-10-samuel@sholland.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220815041248.53268-1-samuel@sholland.org> References: <20220815041248.53268-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. Acked-by: Jernej Skrabec Signed-off-by: Samuel Holland Reviewed-by: Heiko Stuebner Tested-by: Heiko Stuebner --- (no changes since v1) 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 Sat Apr 11 06:31:32 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 8AE0FC25B0E for ; Mon, 15 Aug 2022 04:13:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240762AbiHOEN5 (ORCPT ); Mon, 15 Aug 2022 00:13:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41014 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240512AbiHOENa (ORCPT ); Mon, 15 Aug 2022 00:13:30 -0400 Received: from wout1-smtp.messagingengine.com (wout1-smtp.messagingengine.com [64.147.123.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 31974140AA; Sun, 14 Aug 2022 21:13:27 -0700 (PDT) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id 5963D3200564; Mon, 15 Aug 2022 00:13:25 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Mon, 15 Aug 2022 00:13: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=fm2; t=1660536804; x=1660623204; bh=Nq FKEkODlx0WhlIOI2ngbEzxnvj41xzTMmfpeow5T8U=; b=KscRtCvSYKbRtCLpwr Sp4z5EuprCpPXar0hKXZhnlD7Cv7VJOkMSoIB5WuG3bGOK0DhT69byuadTIkv/r/ Rbzf5ulg8+KFX7rRqRCgY5kuqcE5XFQUoyPbSwDDA7fp4SZXIinRGqdpCLqTY86p UJiY/gds2GX5H0WcVwqUTIDFhm7shns3pQMsYabc3aZHNWrPaPuW2MQxn4xvhMqN +MilaUecbEEuRgw4V6FZxHzW4knY7quIBF06i/dnD1KQDPuMdNRSwO0xBx9QHNBS q/m37bKstFBSMH5UTh/ylYmdzUn9VkkHQtbNcGAt7PpJTkG61bQVQH1bJNcsonnQ Q5GQ== 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=1660536804; x=1660623204; bh=NqFKEkODlx0Wh lIOI2ngbEzxnvj41xzTMmfpeow5T8U=; b=KUU90m5RsYrHCN2++nqvIfeeMgWRd ujq9Uq1RXhSQSgKWbkDxBoNWr+NvMBzdRACtylRuXar3axPIgvavTrcbjj5oUoHS C8qI6Xl9FPbjOWCcbXZjVJ6HhudxjjmhPRH8FGPovhYW02UET+sXvUAAau0HYZmR pwGFSiBIgNvifJ5BJ502tgsfyWU49qjappoZxkH6ss8UTwWnV6H+UIuNyIhL7rAN JekZjIxpZV+9dG4b/jXLgCWvR6gag3qZiR5X235ByZDF/83glnL6RQNFoB9KsVIe LsbyuUBIc/D07J2PZgcCw/2MlM0XNdOdmyB4HnnzQ5gGM9ua04784Lx2A== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrvdehuddgkeehucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomhepufgrmhhu vghlucfjohhllhgrnhguuceoshgrmhhuvghlsehshhholhhlrghnugdrohhrgheqnecugg ftrfgrthhtvghrnhepudekteeuudehtdelteevgfduvddvjefhfedulefgudevgeeghefg udefiedtveetnecuvehluhhsthgvrhfuihiivgepgeenucfrrghrrghmpehmrghilhhfrh homhepshgrmhhuvghlsehshhholhhlrghnugdrohhrgh X-ME-Proxy: Feedback-ID: i0ad843c9:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 15 Aug 2022 00:13: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 v2 10/10] soc: sunxi: sram: Add support for the D1 system control Date: Sun, 14 Aug 2022 23:12:47 -0500 Message-Id: <20220815041248.53268-11-samuel@sholland.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220815041248.53268-1-samuel@sholland.org> References: <20220815041248.53268-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. Acked-by: Jernej Skrabec Signed-off-by: Samuel Holland Reviewed-by: Heiko Stuebner Tested-by: Heiko Stuebner --- (no changes since v1) 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