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 EE6D9C433F5 for ; Wed, 22 Dec 2021 17:12:29 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6B36D834A7; Wed, 22 Dec 2021 18:11:55 +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="Wa9OGKiG"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 107C183112; Wed, 22 Dec 2021 18:11:45 +0100 (CET) Received: from mail-qv1-xf2e.google.com (mail-qv1-xf2e.google.com [IPv6:2607:f8b0:4864:20::f2e]) (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 2DCB08341A for ; Wed, 22 Dec 2021 18:11:33 +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-qv1-xf2e.google.com with SMTP id q3so2881027qvc.7 for ; Wed, 22 Dec 2021 09:11:33 -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=NIRdyp6fEs11Fhd3oi9tMUy3taZJQl6brHNRfeT5gqU=; b=Wa9OGKiGUhRHqHTGShVKlnsNC4/Wo+1abDhl3Io4zupbz5uulWUW46BT9V8jXV3/uK GoQA/xwO7FOqEtn0mjUqgPfCvJR0yzbWDmSXaoQc6y1gcSTd783b37E9NHoVHuwkdpoB cXN5UzPT9lLV7ac6UE9N8lsjlRwjSW4adoBXGWeKCMDzGqQB6RVoIUJ0grW7TEkKmtqg 2XIrdv2yoUqEny/2OdFU9YE37GJ6l87c/1TPQVc6Wjth1u8EVMwkwXWG2BMOlXTTYtPS cne/nUXdwCw8GpbSzzQ4nknH81LKI5/BafzO4SlXaJCkbvmGH5LWsbonxRnVdtqi5rTW mG3A== 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=NIRdyp6fEs11Fhd3oi9tMUy3taZJQl6brHNRfeT5gqU=; b=EPXOItafrMoJ7ylyr8wrUVv2SJ40cjS4x5vSWmn0FTtVZDUSkJQVa9AMlhN18R/jH2 9X4OadvkbBRoouoNXZpQ2o1niHAeL2KTfjkosEYdregrAGoj1qy/DY75VamMSvvHkTup sXsX1WnULQNQIaECt6/DYcgmkNwOD2aU2Hrbz0QdT8y/SFWR8qvnscall5uFYYGqzNKN VxiNbH90lc2Glm89A2Ga0snlPrOcVwgzcK//IzGJbqA3jwhsYyaMDPXvWdkH2rw/I8oV Az2zjLKRtSItMlFi3saCKT3cJ0bbrfvp+jhcxWS4VReamKM8l0Elvdhmk2bV+QlC8RuU 5UuA== X-Gm-Message-State: AOAM532nkXFoKceJ5RjksYKpTUImAXw3YwSXyD3/8uIZwdS3dDPpdmw0 lF0y7U0VDXfm+MmocGkwvI8GOdr6rM4= X-Google-Smtp-Source: ABdhPJwHJz2W6HWH7e8hTleqZxYrmLdvuwcK4KZcCnKfBC3qffaeSRWkrKND7LCEcW1gJYMjIMzc9w== X-Received: by 2002:a05:6214:da7:: with SMTP id h7mr3181843qvh.99.1640193091914; Wed, 22 Dec 2021 09:11:31 -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 j21sm2099609qkk.27.2021.12.22.09.11.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Dec 2021 09:11:31 -0800 (PST) From: Sean Anderson To: u-boot@lists.denx.de Cc: Simon Glass , Lukasz Majewski , Dario Binacchi , Sean Anderson , Neil Armstrong , Michal Simek , u-boot-amlogic@groups.io Subject: [PATCH v2 5/5] clk: Add clk_get_by_name_optional Date: Wed, 22 Dec 2021 12:11:14 -0500 Message-Id: <20211222171114.3091780-6-seanga2@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211222171114.3091780-1-seanga2@gmail.com> References: <20211222171114.3091780-1-seanga2@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.38 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 --- (no changes since v1) 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..9308b57167 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