From patchwork Fri Apr 9 02:13:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1464123 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=N9dQzKxB; 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 4FGhXS0Q0Fz9sSC for ; Fri, 9 Apr 2021 12:14:32 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0B731802BF; Fri, 9 Apr 2021 04:13:51 +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="N9dQzKxB"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 370BB800D7; Fri, 9 Apr 2021 04:13:33 +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=ham autolearn_force=no version=3.4.2 Received: from mail-qk1-x732.google.com (mail-qk1-x732.google.com [IPv6:2607:f8b0:4864:20::732]) (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 D119D800D7 for ; Fri, 9 Apr 2021 04:13:27 +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-qk1-x732.google.com with SMTP id q26so4445137qkm.6 for ; Thu, 08 Apr 2021 19:13:27 -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=EpxeyEpyg5Ou2UZFh5+GzQFalg9GeIAA/F1gkxfm6cM=; b=N9dQzKxByGmUayV6bODN95Se+pzoUCix3Ef75bdySqwDjwE19nBb2C7b79DYcck43m /UU+aOv+aslsl3SHiG2U/zWqw+LYjVnmkv+12awo1PNkGnaA3EqFbqDxObwi+8gK5Shy XKBcpVJej+o+444cY5iHSLGqPpxGBpR7r5vdMoeQzkoM6SsqN8ZSasZwEaT71M59j1kq QsXax+PzJq1p9qBm7imt5Q1l3fQ+oTQ/lNtvAKpgURxno0EF+AcEc4nfXAoo6Jk6eWzs B2Y6nwcF0utG7lkqkJov10KZLXmeo+AX1eZqnpTAeKHOhSDajNtJXIipMio4o+CmIY0w hcoA== 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=EpxeyEpyg5Ou2UZFh5+GzQFalg9GeIAA/F1gkxfm6cM=; b=MvbtNe7Di2JikZqGngio3GTQ/KIrnpJccoKgOH8Pp1ebkCeZNryXX3HjvJBII5uJHc 0dVbTamm3NDhYGDEHQ9d9G6brRIVaEniTdaBj11/k3l8+tQIxys1i4tC0Em1KT/aBTif tQJpTEQzcsc4hhyShMgcjH8MSb1NDLuCcy1BMAYhbKPrJaB6nmWkZ++msfAb1BNC2bV1 eg49g0SQTVCPgLj+aaoTgE4hVWNYVsWJxVFSWPhzIhfPw3tYSo5PNr9S3z2PT0kRDSd3 Twl1QxsOCdON2ZdsiuEEg7bilTIMhYvt8d84n4XJ9Q0VwlqKXg5UDHjXvwZiLDIMju93 TC3A== X-Gm-Message-State: AOAM530cTKOIkxYch1PsYvcPY5+dxdjJa5hLvwj4ktI//t3QbXPI3CXW CtJozjNd0VOf43k7jodfNiCpOJG8csk= X-Google-Smtp-Source: ABdhPJxR09mp5lc05TddXr5aIbhK04zcoInVkuaYnHjb6EmD/OCtCbPfKTfidk/W1Okw+z//uGsGsw== X-Received: by 2002:a37:9e4e:: with SMTP id h75mr11625350qke.180.1617934406645; Thu, 08 Apr 2021 19:13:26 -0700 (PDT) Received: from godwin.fios-router.home (pool-108-51-35-162.washdc.fios.verizon.net. [108.51.35.162]) by smtp.gmail.com with ESMTPSA id h8sm951678qta.53.2021.04.08.19.13.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Apr 2021 19:13:26 -0700 (PDT) From: Sean Anderson To: u-boot@lists.denx.de Cc: Bin Meng , Leo Liang , Rick Chen , Heinrich Schuchardt , Sean Anderson , Lukasz Majewski Subject: [PATCH v3 04/11] clk: k210: Remove k210_register_pll Date: Thu, 8 Apr 2021 22:13:06 -0400 Message-Id: <20210409021313.433558-5-seanga2@gmail.com> X-Mailer: git-send-email 2.31.0 In-Reply-To: <20210409021313.433558-1-seanga2@gmail.com> References: <20210409021313.433558-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 This simplifies the PLL creation process, since we don't have to pass all the parameters individually. Signed-off-by: Sean Anderson --- (no changes since v2) Changes in v2: - New drivers/clk/kendryte/clk.c | 10 +++------- drivers/clk/kendryte/pll.c | 21 --------------------- include/kendryte/pll.h | 4 ---- 3 files changed, 3 insertions(+), 32 deletions(-) diff --git a/drivers/clk/kendryte/clk.c b/drivers/clk/kendryte/clk.c index 3b674a998e..ab86533bb4 100644 --- a/drivers/clk/kendryte/clk.c +++ b/drivers/clk/kendryte/clk.c @@ -528,14 +528,10 @@ static int k210_clk_probe(struct udevice *dev) return -ENOMEM; } - { - const struct k210_pll_params *params = &k210_plls[1]; - + pll = k210_create_pll(&k210_plls[1], base); + if (pll) clk_dm(K210_CLK_PLL1, - k210_register_pll("pll1", in0, base + params->off, - base + params->lock_off, params->shift, - params->width)); - } + k210_register_pll_struct("pll1", in0, pll)); /* PLL2 is muxed, so set up a composite clock */ mux = k210_create_mux(&k210_muxes[MUXIFY(K210_CLK_PLL2)], base); diff --git a/drivers/clk/kendryte/pll.c b/drivers/clk/kendryte/pll.c index d46fd0ebbf..184f37aaf2 100644 --- a/drivers/clk/kendryte/pll.c +++ b/drivers/clk/kendryte/pll.c @@ -578,27 +578,6 @@ struct clk *k210_register_pll_struct(const char *name, const char *parent_name, return clk; } -struct clk *k210_register_pll(const char *name, const char *parent_name, - void __iomem *reg, void __iomem *lock, u8 shift, - u8 width) -{ - struct clk *clk; - struct k210_pll *pll; - - pll = kzalloc(sizeof(*pll), GFP_KERNEL); - if (!pll) - return ERR_PTR(-ENOMEM); - pll->reg = reg; - pll->lock = lock; - pll->shift = shift; - pll->width = width; - - clk = k210_register_pll_struct(name, parent_name, pll); - if (IS_ERR(clk)) - kfree(pll); - return clk; -} - U_BOOT_DRIVER(k210_pll) = { .name = CLK_K210_PLL, .id = UCLASS_CLK, diff --git a/include/kendryte/pll.h b/include/kendryte/pll.h index 55a40b9c97..95b8494f40 100644 --- a/include/kendryte/pll.h +++ b/include/kendryte/pll.h @@ -55,8 +55,4 @@ extern const struct clk_ops k210_pll_ops; struct clk *k210_register_pll_struct(const char *name, const char *parent_name, struct k210_pll *pll); -struct clk *k210_register_pll(const char *name, const char *parent_name, - void __iomem *reg, void __iomem *lock, u8 shift, - u8 width); - #endif /* K210_PLL_H */