From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8F459C4743D for ; Fri, 11 Jun 2021 04:17:08 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E75DB61181 for ; Fri, 11 Jun 2021 04:17:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E75DB61181 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id ABB9982F1A; Fri, 11 Jun 2021 06:16:44 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="G5EeGSFM"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 32DF882F34; Fri, 11 Jun 2021 06:16:38 +0200 (CEST) Received: from mail-qt1-x830.google.com (mail-qt1-x830.google.com [IPv6:2607:f8b0:4864:20::830]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id AD6AC82EDE for ; Fri, 11 Jun 2021 06:16:31 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=seanga2@gmail.com Received: by mail-qt1-x830.google.com with SMTP id p21so1663586qtw.6 for ; Thu, 10 Jun 2021 21:16:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xtb4SC3CY2Ol4pgdO58JOnNw1oJxooX8e9xtFrnFpyE=; b=G5EeGSFMkNHtF+MFVJtZ91gCIGNYA6u3Dxi+E05uYkLLCigW8aqYo2PzR1Xq1uGo9u JJ4SPqmxS31GOLwhbSLYIbr+dXSAkCDeuM/y39m/QLmGc1OiNe0TLCiQnPOlyJx8JFB1 IOG3tLuq68bJTYTXtGsZt8adF0jYdpiu2Cd/KB7kEe4DQXfG+h+D9Euf9J7xyjimEwtI a2bg9qOwIgEAY3VP2XnIfVuZ/988wn4PSNrf5zsNtMcc58ukIj7br1u47hEikqG3NK4M 1OllxtUne7JOlQV1ZWXvOyT1cmkz87/Duq8pmRu1BPYROkM6nvF1zM+6FUcoWLNoHoxM OKRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xtb4SC3CY2Ol4pgdO58JOnNw1oJxooX8e9xtFrnFpyE=; b=HqYtY58aS94NsDRPqDAWOTPYixydtxzrsqr4NeLL+JIazUHo3D/ixTixD4FvH3s6r4 6oPmAgI9EAJ9LjPALn6RYDmOrpBtUK3Uud/HYgPNPgGeX29PxzEJY/7jcb+GPBHV0Ih6 3YWFN9/jZXvDp6mZ+a4sJvJmN7htR3RYyOC0GA6nqOF5KiwdJoGiK3bVBAYPmPNylzTi H8Pe2pu8U51GtVb6RX+EICTksj8d96vvGbbx43pTQM7w4TOzuslzXFyGjLfssx3uodiD VOK0pTaBkn7BqXQmIbP/X3zhkTvgjEztYNQQ7+mll4ivVewKrQLm8YkC8+Tt49pegSRM ShgA== X-Gm-Message-State: AOAM5317vC2KcXYNbYm7puOeybfXNEM8AIVd838G50HnRRM3rMM57ayp V/zBSp9H5MoEBlBXogSnWahpMGc1Ghg= X-Google-Smtp-Source: ABdhPJyWJg8kjCFhVzmigw+HfM8umFGtcplNRWm4mQ7K625eK3GOIM4R522LAiawKXKudyau8qXcMg== X-Received: by 2002:ac8:7ed8:: with SMTP id x24mr2153613qtj.148.1623384990223; Thu, 10 Jun 2021 21:16:30 -0700 (PDT) Received: from godwin.fios-router.home (pool-74-96-87-9.washdc.fios.verizon.net. [74.96.87.9]) by smtp.gmail.com with ESMTPSA id d16sm3399033qtj.69.2021.06.10.21.16.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Jun 2021 21:16:29 -0700 (PDT) From: Sean Anderson To: u-boot@lists.denx.de Cc: Damien Le Moal , Leo Liang , Lukasz Majewski , Sean Anderson Subject: [PATCH v3 04/11] clk: k210: Implement soc_clk_dump Date: Fri, 11 Jun 2021 00:16:10 -0400 Message-Id: <20210611041617.1665833-5-seanga2@gmail.com> X-Mailer: git-send-email 2.31.0 In-Reply-To: <20210611041617.1665833-1-seanga2@gmail.com> References: <20210611041617.1665833-1-seanga2@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.4 at phobos.denx.de X-Virus-Status: Clean Since we are no longer using CCF we cannot use the default soc_clk_dump. Instead, implement our own. Signed-off-by: Sean Anderson --- (no changes since v1) drivers/clk/kendryte/clk.c | 68 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 66 insertions(+), 2 deletions(-) diff --git a/drivers/clk/kendryte/clk.c b/drivers/clk/kendryte/clk.c index de9db84361..203d5f741c 100644 --- a/drivers/clk/kendryte/clk.c +++ b/drivers/clk/kendryte/clk.c @@ -925,14 +925,19 @@ static void k210_pll_waitfor_lock(struct k210_clk_priv *priv, int id) } } +static bool k210_pll_enabled(u32 reg) +{ + return (reg & K210_PLL_PWRD) && (reg & K210_PLL_EN) && + !(reg & K210_PLL_RESET); +} + /* Adapted from sysctl_pll_enable */ static int k210_pll_enable(struct k210_clk_priv *priv, int id) { const struct k210_pll_params *pll = &k210_plls[id]; u32 reg = readl(priv->base + pll->off); - if ((reg & K210_PLL_PWRD) && (reg & K210_PLL_EN) && - !(reg & K210_PLL_RESET)) + if (k210_pll_enabled(reg)) return 0; reg |= K210_PLL_PWRD; @@ -1174,3 +1179,62 @@ U_BOOT_DRIVER(k210_clk) = { .probe = k210_clk_probe, .priv_auto = sizeof(struct k210_clk_priv), }; + +#if CONFIG_IS_ENABLED(CMD_CLK) +static char show_enabled(struct k210_clk_priv *priv, int id) +{ + bool enabled; + + if (k210_clks[id].flags & K210_CLKF_PLL) { + const struct k210_pll_params *pll = + &k210_plls[k210_clks[id].pll]; + + enabled = k210_pll_enabled(readl(priv->base + pll->off)); + } else if (k210_clks[id].gate == K210_CLK_GATE_NONE) { + return '-'; + } else { + const struct k210_gate_params *gate = + &k210_gates[k210_clks[id].gate]; + + enabled = k210_clk_readl(priv, gate->off, gate->bit_idx, 1); + } + + return enabled ? 'y' : 'n'; +} + +static void show_clks(struct k210_clk_priv *priv, int id, int depth) +{ + int i; + + for (i = 0; i < ARRAY_SIZE(k210_clks); i++) { + if (k210_clk_get_parent(priv, i) != id) + continue; + + printf(" %-9lu %-7c %*s%s\n", do_k210_clk_get_rate(priv, i), + show_enabled(priv, i), depth * 4, "", + k210_clks[i].name); + + show_clks(priv, i, depth + 1); + } +} + +int soc_clk_dump(void) +{ + int ret; + struct udevice *dev; + struct k210_clk_priv *priv; + + ret = uclass_get_device_by_driver(UCLASS_CLK, DM_DRIVER_GET(k210_clk), + &dev); + if (ret) + return ret; + priv = dev_get_priv(dev); + + puts(" Rate Enabled Name\n"); + puts("------------------------\n"); + printf(" %-9lu %-7c %*s%s\n", clk_get_rate(&priv->in0), 'y', 0, "", + priv->in0.dev->name); + show_clks(priv, K210_CLK_IN0, 1); + return 0; +} +#endif -- 2.31.0