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 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 B06D8C433F5 for ; Sat, 15 Jan 2022 20:53:18 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B99348351A; Sat, 15 Jan 2022 21:53:10 +0100 (CET) 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="FliQBBH1"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5057E83458; Sat, 15 Jan 2022 21:53:08 +0100 (CET) Received: from mail-qt1-x82a.google.com (mail-qt1-x82a.google.com [IPv6:2607:f8b0:4864:20::82a]) (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 909D783510 for ; Sat, 15 Jan 2022 21:53:04 +0100 (CET) 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-x82a.google.com with SMTP id bp39so14480464qtb.6 for ; Sat, 15 Jan 2022 12:53:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=g6rAy8PywjJ6+3cgovb2i6zwoG6Q2eJiSlNu1vLib3A=; b=FliQBBH1g0ndsxkon3ePL7OSWdO7fWu3oYvwcvmweuskD3CS2xF25HR0ep8aHTwa8h jR9xXihmBs6NOxuQ+AKeako4XTpTMxdMs06aoy3iom/h7IucVeIeDZldpwRDxtcAufeL qmnl5nbnUKIv0PfzBfBeHOyQiGnffxHanOXJHuATwH645MlkScUFTzqDnkIvFBefny5p plo3BytaVF2hG2QY1arPg8yUxFDok+eH7Bup6S4fJjJHvDH3tGBjzARHqOgPzoDGjvoZ yPYq9a6sLjieZ0ItBYglwQqmIZDnLV3svqjManIXZaA8F5xgOwE+b0BB1DOSJ1ka7ZFW oZeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=g6rAy8PywjJ6+3cgovb2i6zwoG6Q2eJiSlNu1vLib3A=; b=eDnrboGZqhhYb81P0lmkz8WBgW+cjymei9j6qWkUu94JBskAYwLgE9tWRVgBrxUPDZ xFV3Bap3QVbXujEX0jZfKgoVpPcNyDwkBLPQNnXjMkGfsocK8NSBQnDgZBLEJs2FjN5N vKqLiQij31YCJfTygViKE6GTQo5Qu+CWyXxD7agIRDtiGHJApkxSXTjIKTxz/V79GgTv eUO7KftRaT6vO5xQ3qUaYsUMoFuRGr3ligVyWvzKOnMDlDty4RMuaHA6IrKhmDCpbyLL At1NnUrkT4PWcYOeLaEnzYbKlu5fBdN/z/tstNBmVPUHO7xOesFr+tTnhQ/wc0nqC52f Mmrw== X-Gm-Message-State: AOAM53237TD59g/ooms8sZdu4VX5ztfmv0SpCqWsOA8mwy48zTy/e8Rz dwxp3665m/NoCVOAd6/3kM6cOdoW3TU= X-Google-Smtp-Source: ABdhPJy+XbAH6rBDMvH+fRY5F+ZgPPMFPnlQO1uDKyXQHI6kXZI+np931RBx/dCX+n9g73FDI3ksLw== X-Received: by 2002:ac8:4a9a:: with SMTP id l26mr9970684qtq.417.1642279983156; Sat, 15 Jan 2022 12:53:03 -0800 (PST) Received: from godwin.fios-router.home (pool-108-18-137-133.washdc.fios.verizon.net. [108.18.137.133]) by smtp.gmail.com with ESMTPSA id h16sm3544304qko.51.2022.01.15.12.53.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Jan 2022 12:53:02 -0800 (PST) From: Sean Anderson To: u-boot@lists.denx.de Cc: Dario Binacchi , Simon Glass , Lukasz Majewski , Sean Anderson , Neil Armstrong , Michal Simek , u-boot-amlogic@groups.io Subject: [PATCH v3 1/1] clk: Add clk_get_by_name_optional Date: Sat, 15 Jan 2022 15:52:47 -0500 Message-Id: <20220115205247.566210-2-seanga2@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220115205247.566210-1-seanga2@gmail.com> References: <20220115205247.566210-1-seanga2@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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.2 at phobos.denx.de X-Virus-Status: Clean This adds a helper function for clk_get_by_name in cases where the clock is optional. Hopefully this helps point driver writers in the right direction. Also convert some existing users. Signed-off-by: Sean Anderson Reviewed-by: Neil Armstrong Reviewed-by: Simon Glass --- Changes in v3: - Fix clk_get_by_name_optional recursing drivers/clk/clk_zynq.c | 5 +++-- drivers/rng/meson-rng.c | 4 ++-- include/clk.h | 24 ++++++++++++++++++++++++ 3 files changed, 29 insertions(+), 4 deletions(-) diff --git a/drivers/clk/clk_zynq.c b/drivers/clk/clk_zynq.c index 18915c3e04..e80500e382 100644 --- a/drivers/clk/clk_zynq.c +++ b/drivers/clk/clk_zynq.c @@ -472,8 +472,9 @@ static int zynq_clk_probe(struct udevice *dev) for (i = 0; i < 2; i++) { sprintf(name, "gem%d_emio_clk", i); - ret = clk_get_by_name(dev, name, &priv->gem_emio_clk[i]); - if (ret < 0 && ret != -ENODATA) { + ret = clk_get_by_name_optional(dev, name, + &priv->gem_emio_clk[i]); + if (ret) { dev_err(dev, "failed to get %s clock\n", name); return ret; } diff --git a/drivers/rng/meson-rng.c b/drivers/rng/meson-rng.c index 5a4f45ad5a..e0a1e8c7e0 100644 --- a/drivers/rng/meson-rng.c +++ b/drivers/rng/meson-rng.c @@ -91,8 +91,8 @@ static int meson_rng_of_to_plat(struct udevice *dev) return -ENODEV; /* Get optional "core" clock */ - err = clk_get_by_name(dev, "core", &pdata->clk); - if (err && err != -ENODATA) + err = clk_get_by_name_optional(dev, "core", &pdata->clk); + if (err) return err; return 0; diff --git a/include/clk.h b/include/clk.h index 33f448eb89..c30a5dba97 100644 --- a/include/clk.h +++ b/include/clk.h @@ -292,6 +292,30 @@ static inline int clk_release_all(struct clk *clk, int count) } #endif +/** + * clk_get_by_name_optional() - Get/request a optional clock by name. + * @dev: The client device. + * @name: The name of the clock to request, within the client's list of + * clocks. + * @clk: A pointer to a clock struct to initialize. + * + * Behaves the same as clk_get_by_name(), except when there is no clock + * provider. In the latter case, return 0. + * + * Return: 0 if OK, or a negative error code. + */ +static inline int clk_get_by_name_optional(struct udevice *dev, + const char *name, struct clk *clk) +{ + int ret; + + ret = clk_get_by_name(dev, name, clk); + if (ret == -ENODATA) + return 0; + + return ret; +} + /** * clk_get_by_name_nodev_optional - Get/request an optinonal clock by name * without a device. -- 2.34.1