From patchwork Tue Mar 21 19:30:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Rokosov X-Patchwork-Id: 73013 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp1972089wrt; Tue, 21 Mar 2023 12:39:08 -0700 (PDT) X-Google-Smtp-Source: AK7set/odQrqUr80CMAO3ayK9JOwnQ3uLmu1CGDNddBZOdg7Dmycjhhjtm2Qph4t+18BG6NnH0Gu X-Received: by 2002:a17:90b:3145:b0:23f:3:49c5 with SMTP id ip5-20020a17090b314500b0023f000349c5mr936680pjb.2.1679427548127; Tue, 21 Mar 2023 12:39:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679427548; cv=none; d=google.com; s=arc-20160816; b=tNXLOPYrxHdOj2pVrXNewEYj0HYW9Djwt7MmubXvZF6F1ZS4ZPTGRqGxcNN7+UGsBo ZDfwo4iE0NTHiCH2ojbtSfw86IN9sZXDi0PGRtqhONZbN5C3iHFcDiBjbUdJFr+RNb+F Z6TXjASZ1sTvghUlRUItbMjUWDsJjLOZvxAGWU4odbWvVmlCvvJWR60q5lkD9GOG7dTy AOibfLnEN486g2yeSPjlDkgnFqv/awV5zXzn5/p44+Q+EzxgW81zjpzwcLVA0SX7cHYK Jj0JLSl9PtMXdoFLdPzrfR7zXsxgSzD9v200/3FGah2vSskqKmDoTV4EWHvX45gIqJgv s/Fw== 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=QACcL2z5H0WiVPZBqWtG1qVoEZA/+FwC6rxiZKbXGhQ=; b=boEJ6ju5MxU6sLI0dZ7882/4+26ofsgVAfvUzVN2U+sKJtAI77NmjOopeiMqZgrLKf IyRGtovLuQjKHZ+gFX7izcPQFmMi2XFeMr4Pqj0DeltBCGCQGsqplmGYL+pqBz4ve1eL veSv803c3EFi9I/vLPkEYEnQ3PfZa47oRPvPktY4BdDPIkFjchooXdLTyD3MWCSZe6at qM6TY6884GQdDpmB8bvAbJMj/Zk5QZaWFD2FLEvSe7LfB107/eIwaLNGl/Rt8sTWkDwJ 01Ns27XhiNzGbbZp8bKH9nbcsbL31yXkkSnDhY9qihdEP3Ke/cLkXpOOv6dlOKt98nbj m28Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=CTLOxJuC; 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 mv18-20020a17090b199200b0023d3f32f569si14351593pjb.3.2023.03.21.12.38.55; Tue, 21 Mar 2023 12:39:08 -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=CTLOxJuC; 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 S230213AbjCUTak (ORCPT + 99 others); Tue, 21 Mar 2023 15:30:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44490 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229778AbjCUTac (ORCPT ); Tue, 21 Mar 2023 15:30:32 -0400 Received: from mx.sberdevices.ru (mx.sberdevices.ru [45.89.227.171]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 472EF27986; Tue, 21 Mar 2023 12:30:28 -0700 (PDT) Received: from s-lin-edge02.sberdevices.ru (localhost [127.0.0.1]) by mx.sberdevices.ru (Postfix) with ESMTP id 9F2925FD3E; Tue, 21 Mar 2023 22:30:26 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1679427026; bh=QACcL2z5H0WiVPZBqWtG1qVoEZA/+FwC6rxiZKbXGhQ=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type; b=CTLOxJuC8Yau5Z11slIJzxqXQWaTpmHOkOt4TioK5IiwabCP3L5tAjZDPRaquJ8ZH 9Wtx7kes49GgdlL6lmB714erbnOy8b974TXLVylqSRYxpgAnpaxtybqwO7gLfejzNs 8mWqYdPpW/ymoCUaQsea8GT2xub5jNL8bDPgqLmjXGp8cEkM+nt2t/YljSPRdIUqG+ UcAhLzbR04e/hmmqXpaVU4vRvzaPhaquSTKaUKqwsGWgcNo3e+JSI1hHjNP5uD7k7S iFjDy3zLsAi7oawy5b6MqkM0b7thXhWBn3ixpuIx9Q0tzhYhNTho0HeVTT/HcFGVId Z8JCEaaqYn36g== Received: from S-MS-EXCH01.sberdevices.ru (S-MS-EXCH01.sberdevices.ru [172.16.1.4]) by mx.sberdevices.ru (Postfix) with ESMTP; Tue, 21 Mar 2023 22:30:26 +0300 (MSK) From: Dmitry Rokosov To: , , , , , , , CC: , , , , , , , , Dmitry Rokosov Subject: [PATCH v11 2/5] clk: meson: introduce new pll power-on sequence for A1 SoC family Date: Tue, 21 Mar 2023 22:30:11 +0300 Message-ID: <20230321193014.26349-3-ddrokosov@sberdevices.ru> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20230321193014.26349-1-ddrokosov@sberdevices.ru> References: <20230321193014.26349-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/03/21 14:08:00 #20985970 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_PASS, 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?1761007420424516185?= X-GMAIL-MSGID: =?utf-8?q?1761007420424516185?= Modern meson PLL IPs are a little bit different from early known PLLs. The main difference is located in the init/enable/disable sequences; the rate logic is the same. In A1 PLL, the PLL enable sequence is different, so add new optional pll reg bits and use the new power-on sequence to enable the PLL: 1. enable the pll, delay for 10us 2. enable the pll self-adaption current module, delay for 40us 3. enable the lock detect module Signed-off-by: Jian Hu Acked-by: Martin Blumenstingl Signed-off-by: Dmitry Rokosov --- drivers/clk/meson/clk-pll.c | 23 +++++++++++++++++++++++ drivers/clk/meson/clk-pll.h | 2 ++ 2 files changed, 25 insertions(+) diff --git a/drivers/clk/meson/clk-pll.c b/drivers/clk/meson/clk-pll.c index 314ca945a4d0..56ec2210f1ad 100644 --- a/drivers/clk/meson/clk-pll.c +++ b/drivers/clk/meson/clk-pll.c @@ -358,6 +358,25 @@ static int meson_clk_pll_enable(struct clk_hw *hw) if (MESON_PARM_APPLICABLE(&pll->rst)) meson_parm_write(clk->map, &pll->rst, 0); + /* + * Compared with the previous SoCs, self-adaption current module + * is newly added for A1, keep the new power-on sequence to enable the + * PLL. The sequence is: + * 1. enable the pll, delay for 10us + * 2. enable the pll self-adaption current module, delay for 40us + * 3. enable the lock detect module + */ + if (MESON_PARM_APPLICABLE(&pll->current_en)) { + usleep_range(10, 20); + meson_parm_write(clk->map, &pll->current_en, 1); + usleep_range(40, 50); + }; + + if (MESON_PARM_APPLICABLE(&pll->l_detect)) { + meson_parm_write(clk->map, &pll->l_detect, 1); + meson_parm_write(clk->map, &pll->l_detect, 0); + } + if (meson_clk_pll_wait_lock(hw)) return -EIO; @@ -375,6 +394,10 @@ static void meson_clk_pll_disable(struct clk_hw *hw) /* Disable the pll */ meson_parm_write(clk->map, &pll->en, 0); + + /* Disable PLL internal self-adaption current module */ + if (MESON_PARM_APPLICABLE(&pll->current_en)) + meson_parm_write(clk->map, &pll->current_en, 0); } static int meson_clk_pll_set_rate(struct clk_hw *hw, unsigned long rate, diff --git a/drivers/clk/meson/clk-pll.h b/drivers/clk/meson/clk-pll.h index 367efd0f6410..a2228c0fdce5 100644 --- a/drivers/clk/meson/clk-pll.h +++ b/drivers/clk/meson/clk-pll.h @@ -36,6 +36,8 @@ struct meson_clk_pll_data { struct parm frac; struct parm l; struct parm rst; + struct parm current_en; + struct parm l_detect; const struct reg_sequence *init_regs; unsigned int init_count; const struct pll_params_table *table;