From patchwork Tue Apr 4 15:53:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Rokosov X-Patchwork-Id: 79216 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp3140121vqo; Tue, 4 Apr 2023 09:03:46 -0700 (PDT) X-Google-Smtp-Source: AKy350anDTF2dp5QGadEFEvUJ93UpJv/fnHgPF0tloJT8uSnGgJqon0cpR3kVt8eMuyUYscrak5X X-Received: by 2002:aa7:d7d8:0:b0:502:9c52:4482 with SMTP id e24-20020aa7d7d8000000b005029c524482mr17839eds.6.1680624226566; Tue, 04 Apr 2023 09:03:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680624226; cv=none; d=google.com; s=arc-20160816; b=bxRjhkI5jm0Tl0JMmpDPSTWZKBPyeOK3btJhT4dZ1LAYYTjkaEgpRw1IulNqnbdmoK Ptr74OPHmc3VwQcdClXm3+yISdGTibpm+2+PC3Jn8Q2sCggdWKHNKshIxbt027xeFHrm /EqPHMFW2eVh6ZGb6mBPQefBUZPq9NwKU6aBTjQm65hlLoojJI7AuBV0YgLBxc3D3jyL hz8TNEABe8qBbKKfzCwDk6Vnr6/NgvNbvjYj90RgPSZcixObYebCRAboLJfbqXPF6Twm PsN2uyNo8Tedf01IKdQWyxKvheA9OtrQ0tsC2z3MuMSjKbX+gK1hjoCcziPqNjq/iCF/ Zj5A== 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=iMVZEo0kkhL704dd977NCLklvtesd801jnvZxR2VNPZSE8gfP9ITpsUCDrkc8wAdRn VFwPOOmVQKGhlrf9GUOxEVsofZUQ2iBmQMnAmjk9F4ILuWiXL1wf7/W9xobmXE/kEtjx JbObDJKgu95ZZ50JIOVbLyAMuLcgwAKEKqoXHbUZfNDqpuKa+qQkhvKK2g3xJDXbykc7 +htRKh1PhQuEtCcELBc3ctV6FXdkel3Ll5EgXgagHw/7yocmqJpoMfbro7PePxZ9IXXm 0zLRZm+8fSJ34KQUhrzce9Fy0Zolx5znvV02s4pvfLuVdFcjdrIKqtJ0SKzpcmTr/+MG BrTQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=rVijqstK; 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 bm10-20020a0564020b0a00b004af6a805793si9452353edb.601.2023.04.04.09.03.19; Tue, 04 Apr 2023 09:03:46 -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=rVijqstK; 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 S235271AbjDDPyz (ORCPT + 99 others); Tue, 4 Apr 2023 11:54:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54560 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231447AbjDDPyl (ORCPT ); Tue, 4 Apr 2023 11:54:41 -0400 Received: from mx.sberdevices.ru (mx.sberdevices.ru [45.89.227.171]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C01FF469C; Tue, 4 Apr 2023 08:54:12 -0700 (PDT) Received: from s-lin-edge02.sberdevices.ru (localhost [127.0.0.1]) by mx.sberdevices.ru (Postfix) with ESMTP id 03E775FD06; Tue, 4 Apr 2023 18:53:44 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1680623624; bh=qcIGKcZIb5cUrNAdB7ZZAIiITgzMPRGFSQuzjV413Y4=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type; b=rVijqstKiazhPPlX1RRGA1OocHCi7wVeMlDTohHJ9zst9D3k7w/l3LHZpiBTTMap4 oNKqNMm5n096o+IK2J+PuxmYL9iZhvESCD50zbF01yWztJttpFOHWbkg3hNN3jSjSo bljibP9xje2NFoidR7XxYlP0UjmdO7RN14buLlmqPN48SppRwzNDTzpq3ffrs+SPQK adtSox8oiToZlbEa9N0FDa0QOyaQiSlpj2K8FvbZkQOZni2MwMqYksvnOln/D+Q0aY rbhlxZ8XACzDnXIXK/U7Ks+FEYHqMuNbxinCA464Odwf4rqYR1KKLW2m598vRE002Z uTAbuZvxnrYYQ== Received: from S-MS-EXCH01.sberdevices.ru (S-MS-EXCH01.sberdevices.ru [172.16.1.4]) by mx.sberdevices.ru (Postfix) with ESMTP; Tue, 4 Apr 2023 18:53:43 +0300 (MSK) From: Dmitry Rokosov To: , , , , , , , CC: , , , , , , , , Dmitry Rokosov Subject: [PATCH v12 1/6] clk: meson: make pll rst bit as optional Date: Tue, 4 Apr 2023 18:53:27 +0300 Message-ID: <20230404155332.9571-2-ddrokosov@sberdevices.ru> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20230404155332.9571-1-ddrokosov@sberdevices.ru> References: <20230404155332.9571-1-ddrokosov@sberdevices.ru> MIME-Version: 1.0 X-Originating-IP: [172.16.1.6] X-ClientProxiedBy: S-MS-EXCH01.sberdevices.ru (172.16.1.4) 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/04/04 13:20:00 #21030339 X-KSMG-AntiVirus-Status: Clean, skipped X-Spam-Status: No, score=-0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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?1762262228808908060?= X-GMAIL-MSGID: =?utf-8?q?1762262228808908060?= 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);