From patchwork Sun Jan 1 18:33:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Holland X-Patchwork-Id: 37980 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp3868684wrt; Sun, 1 Jan 2023 10:35:07 -0800 (PST) X-Google-Smtp-Source: AMrXdXv935l6JJU5s1FJJrB/mamSNcTeAr2c1mrHZo2ktf37sZV0ebhIKRRo9qqxX/oB+j7mcpRW X-Received: by 2002:a05:6402:375:b0:46d:ea1e:fed0 with SMTP id s21-20020a056402037500b0046dea1efed0mr41512144edw.40.1672598107190; Sun, 01 Jan 2023 10:35:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672598107; cv=none; d=google.com; s=arc-20160816; b=Cksre2I0/Q/b1O1ETbV05zNr6CN8eKSbwnkw3DobTn80Njm1Da8drP8ZOV/IT80CIj PBta5UfvG8h5+7iZO2PLEdygwPt2uSk1vZ/7ZB9j1vaIzkuF1PYeqmJygtM6zoN2e9DL sS8cLXSfbiD6kCthBTkyaWlP1WyTe0pC+x7qhoXx31M0axLx8w47IPcPybJ8S+xMB+ib WH9bpJFTDO5/K4XgD4hmnyTmGsdujKXqDzEjym0qwf6CRqWS+q1ZpZiT66KAu6kCBv3I +W9N7ZmNncQcn793ULaIxf3rXZfSrXEk/4gcbTTpfW3Gt7m0inG5rgzb22LlxmeLI067 FqGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :feedback-id:dkim-signature:dkim-signature; bh=gFJp7uQ/NboepQjd9pK1M3B4deROdXdMSMySU0IDyhg=; b=mzByjjpo2/W8ZgTtzdfcm0qLTYp93Z7YeFMJAKrxJTIBntNWqX4I16hQy4PW+vQfiD +e5Tva4JOa1Y7RPJmCIZrDVrcvca172iSDjvAJxD7LN9Mm3NrQ84xM2G8OIk87yvhbEg YlP/pqTpmq1D+cfViWKu+zY9x06NFFLy7zggkFbqwDqQ8ieEAIBBfpCjX/n+o/LHpsQ4 WqLeJ+FNTVhHtMdy9xA8B0DHat58HqxwKXyzpfl/Pbi0Y2qBd1U+iFxtJqk/WMyIw8UN YhMuTSOBWW+BUPdBE4c9oWRs/zeOqXDPiyXgGwgAWdig3HvWwkj0zS8b47DYtVF1VB2X kRBA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sholland.org header.s=fm3 header.b=G1bvr603; dkim=pass header.i=@messagingengine.com header.s=fm2 header.b=BZLrHMJ6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sholland.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e1-20020a056402148100b004608c0b9a8asi16951123edv.201.2023.01.01.10.34.43; Sun, 01 Jan 2023 10:35:07 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@sholland.org header.s=fm3 header.b=G1bvr603; dkim=pass header.i=@messagingengine.com header.s=fm2 header.b=BZLrHMJ6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sholland.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231298AbjAASd2 (ORCPT + 99 others); Sun, 1 Jan 2023 13:33:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60916 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230505AbjAASdY (ORCPT ); Sun, 1 Jan 2023 13:33:24 -0500 Received: from wout1-smtp.messagingengine.com (wout1-smtp.messagingengine.com [64.147.123.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E0C89270A for ; Sun, 1 Jan 2023 10:33:23 -0800 (PST) Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailout.west.internal (Postfix) with ESMTP id E1C8732005D8; Sun, 1 Jan 2023 13:33:22 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Sun, 01 Jan 2023 13:33:23 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sholland.org; h= cc:cc:content-transfer-encoding:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm3; t=1672598002; x=1672684402; bh=gF Jp7uQ/NboepQjd9pK1M3B4deROdXdMSMySU0IDyhg=; b=G1bvr603ZRIBxeV9ii m58ikTrF4KFUEqluhod1Z/SP4WP3s3e0+HpMPwYpBpHjugkRcKJ9H6/QM8LM1vO/ t65lRFm0gp516OYvHDF4bhIF3tMKL56T6xTTK6DcTMqZ1Jc5qwnuG1gG5n0NzBZT cibCNXixttIgZFKmbYzm5YHHZuc58Qoy+SYXR1zB1fvF2F5dc6Il1MTWOoOs5BEa yfK4Hl4eJ+/NpQ7lkKHCr+l4Eu89ZDs9KUh3SExnvD/CBVV5Lu0nRfYeEIFDAuHA t2/2JwrusTQY5YxN0vzsqQ19APKtSxA1URgJ6IfB1lHAuqbljGIN0E6U7YckN2+I 6UPw== 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=fm2; t=1672598002; x=1672684402; bh=gFJp7uQ/Nboep Qjd9pK1M3B4deROdXdMSMySU0IDyhg=; b=BZLrHMJ6yNFS7YrUYJCIPzaX6nal2 AMdi5SKhAF0Z9Q8BF4euGd7iHadoJcWrME+6pWsPsHiP9nI7LMUFetM5rRxFuzPP b8pGjO4O1lidzz9cE7bqiZ+gKvQD6DGEju61PJZlfAKmWFqtemQPs0IrDrp92Na5 ZAZ7xYo5C3a89CS1KaHrqMQgq1pq3muJ6rTqZae8riVC4ltNP6aiHYVQ4dC9e1IG AqyAfT1zsDvEJRe5hdYHuXWqNElxq9bu8k8/MlHzyqahGeUhjwXYZY6xVFrh/ckh HXKN3xJ7u/AS8CvWlqutSz9DKH4T/CahaFt8Cgnla40JYl03cmdI+HVKQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrjedtgdduudduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomhepufgrmhhu vghlucfjohhllhgrnhguuceoshgrmhhuvghlsehshhholhhlrghnugdrohhrgheqnecugg ftrfgrthhtvghrnhepudekteeuudehtdelteevgfduvddvjefhfedulefgudevgeeghefg udefiedtveetnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrh homhepshgrmhhuvghlsehshhholhhlrghnugdrohhrgh X-ME-Proxy: Feedback-ID: i0ad843c9:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 1 Jan 2023 13:33:21 -0500 (EST) From: Samuel Holland To: Srinivas Kandagatla , Chen-Yu Tsai , Jernej Skrabec Cc: Samuel Holland , Greg Kroah-Hartman , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-sunxi@lists.linux.dev Subject: [PATCH v2 2/2] nvmem: sunxi_sid: Drop the workaround on A64 Date: Sun, 1 Jan 2023 12:33:16 -0600 Message-Id: <20230101183316.43642-3-samuel@sholland.org> X-Mailer: git-send-email 2.37.4 In-Reply-To: <20230101183316.43642-1-samuel@sholland.org> References: <20230101183316.43642-1-samuel@sholland.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1753846233117095391?= X-GMAIL-MSGID: =?utf-8?q?1753846233117095391?= Now that the SRAM readout code is fixed by using 32-bit accesses, it always returns the same values as register readout, so the A64 variant no longer needs the workaround. This makes the D1 variant structure redundant, so remove it. Signed-off-by: Samuel Holland --- (no changes since v1) drivers/nvmem/sunxi_sid.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/nvmem/sunxi_sid.c b/drivers/nvmem/sunxi_sid.c index 92dfe4cb10e3..a970f1741cc6 100644 --- a/drivers/nvmem/sunxi_sid.c +++ b/drivers/nvmem/sunxi_sid.c @@ -197,15 +197,9 @@ static const struct sunxi_sid_cfg sun8i_h3_cfg = { .need_register_readout = true, }; -static const struct sunxi_sid_cfg sun20i_d1_cfg = { - .value_offset = 0x200, - .size = 0x100, -}; - static const struct sunxi_sid_cfg sun50i_a64_cfg = { .value_offset = 0x200, .size = 0x100, - .need_register_readout = true, }; static const struct sunxi_sid_cfg sun50i_h6_cfg = { @@ -218,7 +212,7 @@ static const struct of_device_id sunxi_sid_of_match[] = { { .compatible = "allwinner,sun7i-a20-sid", .data = &sun7i_a20_cfg }, { .compatible = "allwinner,sun8i-a83t-sid", .data = &sun50i_a64_cfg }, { .compatible = "allwinner,sun8i-h3-sid", .data = &sun8i_h3_cfg }, - { .compatible = "allwinner,sun20i-d1-sid", .data = &sun20i_d1_cfg }, + { .compatible = "allwinner,sun20i-d1-sid", .data = &sun50i_a64_cfg }, { .compatible = "allwinner,sun50i-a64-sid", .data = &sun50i_a64_cfg }, { .compatible = "allwinner,sun50i-h5-sid", .data = &sun50i_a64_cfg }, { .compatible = "allwinner,sun50i-h6-sid", .data = &sun50i_h6_cfg },