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 CE450C433F5 for ; Wed, 1 Dec 2021 18:44:53 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 110D8830ED; Wed, 1 Dec 2021 19:44:11 +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="mc8O+W+B"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B3E5F830BC; Wed, 1 Dec 2021 19:43:59 +0100 (CET) Received: from mail-qk1-x734.google.com (mail-qk1-x734.google.com [IPv6:2607:f8b0:4864:20::734]) (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 496C8830D8 for ; Wed, 1 Dec 2021 19:43:48 +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-qk1-x734.google.com with SMTP id m186so32086121qkb.4 for ; Wed, 01 Dec 2021 10:43:48 -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=1i5gpERchbyLnXRKL4lQvA13oaUuqiAW22ZFwpDRqu0=; b=mc8O+W+BJKHRvNl+3eXo4wIn5DTi1U5+PNDjRQPUaIg4xwcGV7GSCAtJgumtm1llmI B0XuYmjwDsFhBFu7Rg21jQkn1FhUm+QEJQd8ycldL7JF+O62PyGaps/rYoYSHSAAClW+ W18OK+WgxKJztozQ/AkKJHkfO9eZBRWbybbuLF0DkznFnnoUDp/YOtffloyZyzXuqnVB k3Gn0HtWaFv5TsTBbqMDwr3KPGL9m/Rnzs+M00BrDzgXlspN2TAU+xOWKVR6uxNmQ96A faU+yuiRrkkzl3YFX33i6lHBRcCIIul8niakfsF6VcZZwbrPYSIDhWlzpkrXd1wO7shD 1Z0A== 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=1i5gpERchbyLnXRKL4lQvA13oaUuqiAW22ZFwpDRqu0=; b=RM1CPdPnf3MnCDHc6AP4SBCmowkdyFcdVVOSsySp88jllD88dWAjU/xcDKJRV7bh+a OO5bRIn4ZnfLQf13B+yq0eqrHwmOTHGwFzDCYBuSC8e6v4S1RyGuEdZhKiSQSBohZCDi CW5Nl/nLmS5WbGt/W2L+2Vr29IL5rFGWkQD+kUjqdBBH+ago90W6loNBSv2IoCGNP5Pe 2gFknzkIltFGCMkKBKChbkASQ24CwN94hmzAIQibPw683yXWPLvte6SDq+G2jyv8NWNf 8QEDLN4R1TWrizUd0qWCjjEcxqmmYdlDsT4mwpDgLE7ZMGNxvlWwt4oJ4KZA7oecNL6A 5L5g== X-Gm-Message-State: AOAM533er/dKSP+6v3Ag1RdonD2XEHbq6IW7vK2i43H5Ho5rIMimO3qA EicG/M9aGNOogxUbwogrAulBdMUpjnU= X-Google-Smtp-Source: ABdhPJwrWl9+BW+UK6oY1FcLYfzSfJa0DZG4PpBZ1NTLYe2zTIug0TELMyxktE7Xaqz2WaDEOPWJ/g== X-Received: by 2002:a05:620a:468a:: with SMTP id bq10mr8310152qkb.541.1638384227013; Wed, 01 Dec 2021 10:43:47 -0800 (PST) Received: from godwin.fios-router.home (pool-108-18-207-184.washdc.fios.verizon.net. [108.18.207.184]) by smtp.gmail.com with ESMTPSA id u10sm310138qkp.104.2021.12.01.10.43.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Dec 2021 10:43:46 -0800 (PST) From: Sean Anderson To: u-boot@lists.denx.de Cc: Dario Binacchi , Simon Glass , Lukasz Majewski , Sean Anderson , Michal Simek , Neil Armstrong , u-boot-amlogic@groups.io Subject: [PATCH 5/5] clk: Add clk_get_by_name_optional Date: Wed, 1 Dec 2021 13:43:32 -0500 Message-Id: <20211201184332.2166897-6-seanga2@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211201184332.2166897-1-seanga2@gmail.com> References: <20211201184332.2166897-1-seanga2@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.37 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 --- 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 103ef16bf9..36721188d0 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_optional(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.33.0