From patchwork Tue May 23 13:53:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Rokosov X-Patchwork-Id: 97999 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2161355vqo; Tue, 23 May 2023 06:57:59 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4f2oZUqJKzjG3qrMrUKpfayX/kMnmDwXOXHFtBofAkK54kQZ46WTDLXS+MtuTjk3R0CXV2 X-Received: by 2002:a17:902:7d8d:b0:1a6:dba5:2e60 with SMTP id a13-20020a1709027d8d00b001a6dba52e60mr13090702plm.25.1684850279117; Tue, 23 May 2023 06:57:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684850279; cv=none; d=google.com; s=arc-20160816; b=0DxiEtfA6oo8SxHTUCGN9qHclGcJPP9NYXxRObBBAZrYIzu2aws3KV9KG7xtVyhB+Y FCP5nq7ZDL3tTgtHQtJvWVXA8B7zf0+0coR517se1EmOC7NGrFnnmVMiPkXP5Fpiggm9 FOD0ZviC7Wme59IM1lp4bFWKPPtXBESdesMBaNPGYyKVKKOeUcspAA+oCX+gqKx8MpUp S/ceWYsVKZVY1zbWi0Z6Mk7IDWeaQ8P1qi+4TtqZ3/lyQUT9xMuajPRAPQgRqF1yLqxe 3X2Fmb5Tu/c1P+5hOW3APqmGj3mEiJA6pZcAbYSqViOcrhEGIyWC1S808vZcjS765oqv 9Wuw== 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 :dkim-signature; bh=qcIGKcZIb5cUrNAdB7ZZAIiITgzMPRGFSQuzjV413Y4=; b=fcaMNHb8P2grFVxkJ0p+VeqSXrmTuUFqfTvnV1qTEIpX3xawdT5yg+p7J06Wv/xxdd FD8Zt1NEplqZdtVhwQ6iOB62Vv5PZdbMJG2OXGcixiIIveO5XgVvjOIPReWANoXmRuSd sHiz5w76HKRIpIDsMFz2I14/NLpOEsuq0N/CaWnyYWTlF+gUR9n2mZIVle3Xc9ijpmqB sJ36r642EgMSxtzCUnGfCq3bKJ15YNJSgnd4qwCR/6CLhlV7BRNSJ9/NUvc8bZvd/D2X 1Q2Vb8653GGdwPPcqUzyM7rbRCBaW6WVwzS4xYvOoPJMVDEVLTkwPK8XuCXSH+nqClhv b7UA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=GISDTv73; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=sberdevices.ru Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n13-20020a170902d2cd00b001a979141a25si896913plc.243.2023.05.23.06.57.45; Tue, 23 May 2023 06:57:59 -0700 (PDT) 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=@sberdevices.ru header.s=mail header.b=GISDTv73; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=sberdevices.ru Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237030AbjEWNyQ (ORCPT + 99 others); Tue, 23 May 2023 09:54:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37898 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237007AbjEWNyH (ORCPT ); Tue, 23 May 2023 09:54:07 -0400 Received: from mx.sberdevices.ru (mx.sberdevices.ru [45.89.227.171]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E98C0E9; Tue, 23 May 2023 06:54:03 -0700 (PDT) Received: from s-lin-edge02.sberdevices.ru (localhost [127.0.0.1]) by mx.sberdevices.ru (Postfix) with ESMTP id 479715FD65; Tue, 23 May 2023 16:54:02 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1684850042; bh=qcIGKcZIb5cUrNAdB7ZZAIiITgzMPRGFSQuzjV413Y4=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type; b=GISDTv73zFtfRebTlG8zJm4c59zAOD5oaTHD9ca4uNEBiloa8vF+IeBEj+ZKT1D/a lZJW/8IK8SR0MU4u+6IOkC18fRqKM/GiQFU7rbuJyvcf8KJ4SZd7F8wG/RM2kwIb15 D9BpF468uDRmwH4RDnYguT4ogBwe+cWhXXjlgRhIFRarlA8xMp7jauUxwyRvUYGZyY r5bOGaxHN1hSnCqOITVqExIHHml2aVgFmuNF9f1Z0qmSjXc1gy8z/fkMDVGFGxC6+Y /+9Hq1+VZ5Kn6azQX1sJwnJI1YV1fwh9jHBHACKPBKNIBzmB/O9LGC896M+CLq0JhO 3hS73RAkPCoHw== Received: from S-MS-EXCH01.sberdevices.ru (S-MS-EXCH01.sberdevices.ru [172.16.1.4]) by mx.sberdevices.ru (Postfix) with ESMTP; Tue, 23 May 2023 16:54:02 +0300 (MSK) From: Dmitry Rokosov To: , , , , , , , CC: , , , , , , , , Dmitry Rokosov Subject: [PATCH v16 1/6] clk: meson: make pll rst bit as optional Date: Tue, 23 May 2023 16:53:46 +0300 Message-ID: <20230523135351.19133-2-ddrokosov@sberdevices.ru> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20230523135351.19133-1-ddrokosov@sberdevices.ru> References: <20230523135351.19133-1-ddrokosov@sberdevices.ru> MIME-Version: 1.0 X-Originating-IP: [172.16.1.6] X-ClientProxiedBy: S-MS-EXCH02.sberdevices.ru (172.16.1.5) To S-MS-EXCH01.sberdevices.ru (172.16.1.4) X-KSMG-Rule-ID: 4 X-KSMG-Message-Action: clean X-KSMG-AntiSpam-Status: not scanned, disabled by settings X-KSMG-AntiSpam-Interceptor-Info: not scanned X-KSMG-AntiPhishing: not scanned, disabled by settings X-KSMG-AntiVirus: Kaspersky Secure Mail Gateway, version 1.1.2.30, bases: 2023/05/23 12:15:00 #21372692 X-KSMG-AntiVirus-Status: Clean, skipped X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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?1766693566515282893?= X-GMAIL-MSGID: =?utf-8?q?1766693566515282893?= Compared with the previous SoCs, self-adaption current module is newly added for A1, and there is no reset parameter except the fixed pll. Since we use clk-pll generic driver for A1 pll implementation, rst bit should be optional to support new behavior. Signed-off-by: Jian Hu Acked-by: Martin Blumenstingl Signed-off-by: Dmitry Rokosov --- drivers/clk/meson/clk-pll.c | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/drivers/clk/meson/clk-pll.c b/drivers/clk/meson/clk-pll.c index afefeba6e458..314ca945a4d0 100644 --- a/drivers/clk/meson/clk-pll.c +++ b/drivers/clk/meson/clk-pll.c @@ -295,10 +295,14 @@ static int meson_clk_pll_init(struct clk_hw *hw) struct meson_clk_pll_data *pll = meson_clk_pll_data(clk); if (pll->init_count) { - meson_parm_write(clk->map, &pll->rst, 1); + if (MESON_PARM_APPLICABLE(&pll->rst)) + meson_parm_write(clk->map, &pll->rst, 1); + regmap_multi_reg_write(clk->map, pll->init_regs, pll->init_count); - meson_parm_write(clk->map, &pll->rst, 0); + + if (MESON_PARM_APPLICABLE(&pll->rst)) + meson_parm_write(clk->map, &pll->rst, 0); } return 0; @@ -309,8 +313,11 @@ static int meson_clk_pll_is_enabled(struct clk_hw *hw) struct clk_regmap *clk = to_clk_regmap(hw); struct meson_clk_pll_data *pll = meson_clk_pll_data(clk); - if (meson_parm_read(clk->map, &pll->rst) || - !meson_parm_read(clk->map, &pll->en) || + if (MESON_PARM_APPLICABLE(&pll->rst) && + meson_parm_read(clk->map, &pll->rst)) + return 0; + + if (!meson_parm_read(clk->map, &pll->en) || !meson_parm_read(clk->map, &pll->l)) return 0; @@ -341,13 +348,15 @@ static int meson_clk_pll_enable(struct clk_hw *hw) return 0; /* Make sure the pll is in reset */ - meson_parm_write(clk->map, &pll->rst, 1); + if (MESON_PARM_APPLICABLE(&pll->rst)) + meson_parm_write(clk->map, &pll->rst, 1); /* Enable the pll */ meson_parm_write(clk->map, &pll->en, 1); /* Take the pll out reset */ - meson_parm_write(clk->map, &pll->rst, 0); + if (MESON_PARM_APPLICABLE(&pll->rst)) + meson_parm_write(clk->map, &pll->rst, 0); if (meson_clk_pll_wait_lock(hw)) return -EIO; @@ -361,7 +370,8 @@ static void meson_clk_pll_disable(struct clk_hw *hw) struct meson_clk_pll_data *pll = meson_clk_pll_data(clk); /* Put the pll is in reset */ - meson_parm_write(clk->map, &pll->rst, 1); + if (MESON_PARM_APPLICABLE(&pll->rst)) + meson_parm_write(clk->map, &pll->rst, 1); /* Disable the pll */ meson_parm_write(clk->map, &pll->en, 0);