From patchwork Fri Jun 4 03:58:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1487554 X-Patchwork-Delegate: uboot@andestech.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=QRO/4nN8; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Fx8CY1rFtz9sRK for ; Fri, 4 Jun 2021 13:59:21 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 112D483005; Fri, 4 Jun 2021 05:58:55 +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="QRO/4nN8"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C57C183001; Fri, 4 Jun 2021 05:58:51 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-qv1-xf2f.google.com (mail-qv1-xf2f.google.com [IPv6:2607:f8b0:4864:20::f2f]) (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 7E1D382FEB for ; Fri, 4 Jun 2021 05:58:43 +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-qv1-xf2f.google.com with SMTP id im10so3474783qvb.3 for ; Thu, 03 Jun 2021 20:58:43 -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=QRO/4nN8Nay88kbKaJp5FOIFsf4KkHc7HxqujVmCoIvZYBJpIJrCoyjFbxWFOtPOgV A5+B1jjEysEOQ3V2hxE+iqcAX4BWtNDJxwpp2boMuBNqyIrhFcHC+WfBPv6bf+bkZiov f0Ic7KwPgz4CKfkzrvnDS0v0IsLjBn6DL796eZ9Sn7bxs1JbW7ACUZFQcQ6LlhOlPrjt kEu6GVA0lsAYXJrgQ3apUshrBq05Y3GRdy/U6f/04DrI7fggcdLHLB9xSeuNtHXhkSg5 XWdXpQKl4H9Hd+goaXtxleh+yz49TwcMM64L35SrScqf1ez1Q8KCoO+RJ7BuupjbFaAF XS6Q== 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=UttivxbqwAIDaY75nTDcKIwJ88VBQQAEThZ9FYeW3Tby6UxwhWlrSF8Va6nw0uN76A VqGCPaq5kX1eMsyyMz4Mydv+0WOF371echNohvoh1Vbv2eZqy8qkl3OjIkhd5/I55qid 1z5nRvF4cjcM/8PG9u7eEfuLEVVDUaR3Lpxmocz07HByRwL1uk9R9jQKun9ouJavgbLa FMSQazJZXWaGiOIUC6thGMaBAd1jFDXLQgWP9NUklkn+wW0XXMuSJALIyWu+LAnxA8v0 v3TMrz5JNAnf7PbKMF9sWE+7OTCZXqNwQTJBavAO0La9da6sRTa9k9qGfpsLKrd1ueHK GY9w== X-Gm-Message-State: AOAM5338+uKm8WDj0attvWqMZJmjKReJYYrfl7jyVsHGj32IM2w4MfpN 1awbjrb/Pg2A5WnUrbJwijvC4evdQk0= X-Google-Smtp-Source: ABdhPJyvvxt0AY9WKH93mCHLNSLB6VUnfAfOdUTf4U+muIulULUWbpXH3vQX9qudQanhwn13o5XyCQ== X-Received: by 2002:a0c:ee23:: with SMTP id l3mr2640683qvs.55.1622779122152; Thu, 03 Jun 2021 20:58:42 -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 s10sm3120612qkj.77.2021.06.03.20.58.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Jun 2021 20:58:41 -0700 (PDT) From: Sean Anderson To: u-boot@lists.denx.de Cc: Lukasz Majewski , Leo Liang , Damien Le Moal , Sean Anderson Subject: [PATCH v2 04/11] clk: k210: Implement soc_clk_dump Date: Thu, 3 Jun 2021 23:58:27 -0400 Message-Id: <20210604035834.625772-5-seanga2@gmail.com> X-Mailer: git-send-email 2.31.0 In-Reply-To: <20210604035834.625772-1-seanga2@gmail.com> References: <20210604035834.625772-1-seanga2@gmail.com> MIME-Version: 1.0 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