Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 03A2BC28B2C for ; Sat, 13 Aug 2022 04:18:14 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9E1078415E; Sat, 13 Aug 2022 06:18:12 +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="h8qlzHM6"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 005D684978; Sat, 13 Aug 2022 06:18:10 +0200 (CEST) Received: from mail-qv1-xf29.google.com (mail-qv1-xf29.google.com [IPv6:2607:f8b0:4864:20::f29]) (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 89CD584133 for ; Sat, 13 Aug 2022 06:18:07 +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-xf29.google.com with SMTP id h8so1970688qvs.6 for ; Fri, 12 Aug 2022 21:18:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:content-language:in-reply-to:mime-version :user-agent:date:message-id:from:references:cc:to:subject:from:to:cc; bh=deH/Utvr1XTbhTVh0dIwt+gGCnfoPVFDHwdamhFr0Y4=; b=h8qlzHM6dVXbow2ujbjxaQQAdeaOn3fzZKNy0nEABr7Zuf0Ig28A5z/VPH0p3IbocT GdkF2VK2Z2LOHHt3zw2raXroXHeZUXzt4sx5ncbImSJCVyGZFWX+SDXIqaTTjaYrd/O8 1y26v1aVnAcIkXkcFUr8BTa1Q90Wg7mOoaYgjLOidlMuQcS+f5lsIj8Tm17XuK3hZlkg 5ZT1eSlY4+7AR1lLFpjUkjvxBJ3gL0QtHUKPpOEQiOVfc8b5EqUK+dKYGq1nzEJDmx9U 4dUR8PLd1JrTWlrSF5991E+RKLmBzqH3ITzB3jrCCNzhWJoJErH+Qyiivvdacagg6BCj UBXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:content-language:in-reply-to:mime-version :user-agent:date:message-id:from:references:cc:to:subject :x-gm-message-state:from:to:cc; bh=deH/Utvr1XTbhTVh0dIwt+gGCnfoPVFDHwdamhFr0Y4=; b=NAdYcgn7msSR/MLX+mwvCp0AlzsTyKFtO6OqB+BDcQDQzbASSGUN59Genj2HhzguSc S/hudVg6LgJBVnVVFHlfhmNG1jxS3CIrD/hfvKKRZ7to4FG+3G5ygis0t9qSv1X+pAM1 PEp99VPh04xUrlu8YTKUdHxWotr9g4m9JA07tBFEkoKMBUgV/C7p+wnml2PrDzzho2j3 2PdHHEmbr3bT1PTOZh4lvq/y37Sb+qkcFmjNH1/ArnSiycoqfvSkgZbccaqIRnbAKYEY +VlCY/uPfIvEimvRVm+krleDDMTR5keJvfFcDWa/Fu4AhACGGaDrbC1nepElRIsZ+kN5 RIfA== X-Gm-Message-State: ACgBeo0Poqnt4O8VdTHT1KdtU1RuZ2TzVb/gzG6q8NH0vZKQJnMtXBG8 flQN3jKUDyyKWOskMf0sl20= X-Google-Smtp-Source: AA6agR6FkX3Hnats4nD/KxJ47u+vL3me4WwhO4URloMu8cEDy9RPbjO54MviUO0cBcXVem5a1SithA== X-Received: by 2002:a0c:e244:0:b0:476:a281:f090 with SMTP id x4-20020a0ce244000000b00476a281f090mr6064810qvl.92.1660364286125; Fri, 12 Aug 2022 21:18:06 -0700 (PDT) Received: from [192.168.1.201] (pool-173-73-95-180.washdc.fios.verizon.net. [173.73.95.180]) by smtp.gmail.com with ESMTPSA id hf24-20020a05622a609800b0034361fb2f75sm2913232qtb.22.2022.08.12.21.18.05 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 12 Aug 2022 21:18:05 -0700 (PDT) Subject: Re: [PATCH 23/31] clk: mediatek: add support to configure clock driver parent To: Weijie Gao , u-boot@lists.denx.de Cc: GSS_MTK_Uboot_upstream , Lukasz Majewski References: <239a96b2760e0a014b9046cd94b7760317c24511.1659581119.git.weijie.gao@mediatek.com> From: Sean Anderson Message-ID: <51eddb1d-c9d5-34d5-cedf-07acd9ae34a5@gmail.com> Date: Sat, 13 Aug 2022 00:18:05 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.12.0 MIME-Version: 1.0 In-Reply-To: <239a96b2760e0a014b9046cd94b7760317c24511.1659581119.git.weijie.gao@mediatek.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.103.6 at phobos.denx.de X-Virus-Status: Clean On 8/3/22 11:36 PM, Weijie Gao wrote: > This patch adds support for a clock node to configure its parent clock > where possible. > > Signed-off-by: Weijie Gao > --- > drivers/clk/mediatek/clk-mtk.c | 79 ++++++++++++++++++++-------------- > drivers/clk/mediatek/clk-mtk.h | 2 + > 2 files changed, 48 insertions(+), 33 deletions(-) > > diff --git a/drivers/clk/mediatek/clk-mtk.c b/drivers/clk/mediatek/clk-mtk.c > index d99ea55df0..908ed2b4ba 100644 > --- a/drivers/clk/mediatek/clk-mtk.c > +++ b/drivers/clk/mediatek/clk-mtk.c > @@ -42,20 +42,14 @@ > * the accurate frequency. > */ > static ulong mtk_clk_find_parent_rate(struct clk *clk, int id, > - const struct driver *drv) > + struct udevice *pdev) > { > struct clk parent = { .id = id, }; > > - if (drv) { > - struct udevice *dev; > - > - if (uclass_get_device_by_driver(UCLASS_CLK, drv, &dev)) > - return -ENODEV; > - > - parent.dev = dev; > - } else { > + if (pdev) > + parent.dev = pdev; > + else > parent.dev = clk->dev; > - } > > return clk_get_rate(&parent); You must call clk_request(parent) before calling clk_get_rate. > } > @@ -296,7 +290,7 @@ static ulong mtk_topckgen_get_factor_rate(struct clk > *clk, u32 off) > switch (fdiv->flags & CLK_PARENT_MASK) { > case CLK_PARENT_APMIXED: > rate = mtk_clk_find_parent_rate(clk, fdiv->parent, > - DM_DRIVER_GET(mtk_clk_apmixedsys)); > + priv->parent); > break; > case CLK_PARENT_TOPCKGEN: > rate = mtk_clk_find_parent_rate(clk, fdiv->parent, NULL); > @@ -322,9 +316,18 @@ static ulong mtk_topckgen_get_mux_rate(struct clk *clk, > u32 off) > > if (mux->parent[index] == CLK_XTAL && priv->tree->flags & CLK_BYPASS_XTAL) > flag = 1; > - if (mux->parent[index] > 0 || flag == 1) > - return mtk_clk_find_parent_rate(clk, mux->parent[index], > - NULL); > + if (mux->parent[index] > 0 || flag == 1) { > + switch (mux->flags & CLK_PARENT_MASK) { > + case CLK_PARENT_APMIXED: > + return mtk_clk_find_parent_rate(clk, mux->parent[index], > + priv->parent); > + break; > + default: > + return mtk_clk_find_parent_rate(clk, mux->parent[index], > + NULL); > + break; > + } > + } > > return priv->tree->xtal_rate; > } > @@ -343,7 +346,7 @@ static ulong mtk_topckgen_get_rate(struct clk *clk) > priv->tree->muxes_offs); > } > > -static int mtk_topckgen_enable(struct clk *clk) > +static int mtk_clk_mux_enable(struct clk *clk) > { > struct mtk_clk_priv *priv = dev_get_priv(clk->dev); > const struct mtk_composite *mux; > @@ -376,7 +379,7 @@ static int mtk_topckgen_enable(struct clk *clk) > return 0; > } > > -static int mtk_topckgen_disable(struct clk *clk) > +static int mtk_clk_mux_disable(struct clk *clk) > { > struct mtk_clk_priv *priv = dev_get_priv(clk->dev); > const struct mtk_composite *mux; > @@ -402,7 +405,7 @@ static int mtk_topckgen_disable(struct clk *clk) > return 0; > } > > -static int mtk_topckgen_set_parent(struct clk *clk, struct clk *parent) > +static int mtk_common_clk_set_parent(struct clk *clk, struct clk *parent) > { > struct mtk_clk_priv *priv = dev_get_priv(clk->dev); > > @@ -474,19 +477,7 @@ static ulong mtk_clk_gate_get_rate(struct clk *clk) > struct mtk_cg_priv *priv = dev_get_priv(clk->dev); > const struct mtk_gate *gate = &priv->gates[clk->id]; > > - switch (gate->flags & CLK_PARENT_MASK) { > - case CLK_PARENT_APMIXED: > - return mtk_clk_find_parent_rate(clk, gate->parent, > - DM_DRIVER_GET(mtk_clk_apmixedsys)); > - break; > - case CLK_PARENT_TOPCKGEN: > - return mtk_clk_find_parent_rate(clk, gate->parent, > - DM_DRIVER_GET(mtk_clk_topckgen)); > - break; > - > - default: > - return priv->tree->xtal_rate; > - } > + return mtk_clk_find_parent_rate(clk, gate->parent, priv->parent); > } > > const struct clk_ops mtk_clk_apmixedsys_ops = { > @@ -497,10 +488,10 @@ const struct clk_ops mtk_clk_apmixedsys_ops = { > }; > > const struct clk_ops mtk_clk_topckgen_ops = { > - .enable = mtk_topckgen_enable, > - .disable = mtk_topckgen_disable, > + .enable = mtk_clk_mux_enable, > + .disable = mtk_clk_mux_disable, > .get_rate = mtk_topckgen_get_rate, > - .set_parent = mtk_topckgen_set_parent, > + .set_parent = mtk_common_clk_set_parent, > }; > > const struct clk_ops mtk_clk_gate_ops = { > @@ -513,11 +504,22 @@ int mtk_common_clk_init(struct udevice *dev, > const struct mtk_clk_tree *tree) > { > struct mtk_clk_priv *priv = dev_get_priv(dev); > + struct udevice *parent; > + int ret; > > priv->base = dev_read_addr_ptr(dev); > if (!priv->base) > return -ENOENT; > > + ret = uclass_get_device_by_phandle(UCLASS_CLK, dev, "clock-parent", > &parent); > + if (ret || !parent) { > + ret = uclass_get_device_by_driver(UCLASS_CLK, > + DM_DRIVER_GET(mtk_clk_apmixedsys), &parent); > + if (ret || !parent) > + return -ENOENT; > + } > + > + priv->parent = parent; > priv->tree = tree; > > return 0; > @@ -528,11 +530,22 @@ int mtk_common_clk_gate_init(struct udevice *dev, > const struct mtk_gate *gates) > { > struct mtk_cg_priv *priv = dev_get_priv(dev); > + struct udevice *parent; > + int ret; > > priv->base = dev_read_addr_ptr(dev); > if (!priv->base) > return -ENOENT; > > + ret = uclass_get_device_by_phandle(UCLASS_CLK, dev, "clock-parent", > &parent); Why not just use clk_get? > + if (ret || !parent) { > + ret = uclass_get_device_by_driver(UCLASS_CLK, > + DM_DRIVER_GET(mtk_clk_topckgen), &parent); > + if (ret || !parent) > + return -ENOENT; > + } > + > + priv->parent = parent; > priv->tree = tree; > priv->gates = gates; > > diff --git a/drivers/clk/mediatek/clk-mtk.h b/drivers/clk/mediatek/clk-mtk.h > index 0ab6912bf0..7955d469db 100644 > --- a/drivers/clk/mediatek/clk-mtk.h > +++ b/drivers/clk/mediatek/clk-mtk.h > @@ -203,11 +203,13 @@ struct mtk_clk_tree { > }; > > struct mtk_clk_priv { > + struct udevice *parent; > void __iomem *base; > const struct mtk_clk_tree *tree; > }; > > struct mtk_cg_priv { > + struct udevice *parent; > void __iomem *base; > const struct mtk_clk_tree *tree; > const struct mtk_gate *gates; > --Sean