From patchwork Mon Mar 1 23:24:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 388767 Delivered-To: patch@linaro.org Received: by 2002:a02:290e:0:0:0:0:0 with SMTP id p14csp3773593jap; Mon, 1 Mar 2021 15:26:35 -0800 (PST) X-Google-Smtp-Source: ABdhPJza2zyZbJnjxnGIqk2F8Jhftyi144QhNPtYMD8kuSEFPwZ1ysPKnM153BfJHj9T6gbd9iP+ X-Received: by 2002:a17:902:aa4b:b029:e2:bb4b:a63 with SMTP id c11-20020a170902aa4bb02900e2bb4b0a63mr956322plr.7.1614641195805; Mon, 01 Mar 2021 15:26:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614641195; cv=none; d=google.com; s=arc-20160816; b=cXwQ80GIPKavh6iunlZPlNiXhzdkvvoim++ruxKjsL8PVzlJM2BKWXGGISUqSI202P JGcPUcEpuvvSCebE7QK0DK+odvK2JCiHOZiSKsd1pnOUZv8mi9WgG/XS+diAiPC77mWT kPqi3isJhdCFEHmxzRe3BVKIb8ZOz1KHXir2vPoZCDTcxOjuU++iUkwXR/SNabu3aATV PGBJOxSsGccK7yq24GT8/JHE9C5ZH0pEjIuVHewshit8z+GZZPH+UVhHYW6N3+Wey6sJ 6V/+JR+jbdHfbpkJibofD1MpRZZDs3ExQpPes1usLCQI+NhBNH7OkwnJMgW6jycz45JP 5jdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:mime-version:references:in-reply-to:message-id:date :subject:to:from:dkim-signature:delivered-to; bh=F1DfD7XA0JsxzsyfO1KlSrtbcYg3qwXkPElAcfjGcuo=; b=Ws+zJ0BcpOJvTWdBo0XbxBK+3EFKsLjv21cSmmGJdhw0zfRYKmcFGQoju/jmdYeq1w IJ/eTckLRXJ/2iz75JVVkIjFxGNNj1TP4qrFJABHIeK5irgcBONZiDqtFoLTPfhm237H Vwfs9VEtJou5/YWV09CpgF6Ln0x8PYj20PTVM08NO96scJdxlXDoUyJlzyUd/Y1dDpbd +HihwJJadaD9UkPNKxMhjqNcO2SSilp0KeYq8oW/O/UU970wssS7/ina+zAzJ1YBsLp/ kVhXznvEBrSTDIKvtKkxF5LzCeS758uSZwCqPdnmvCCzwCe/agBK6KMykWvZ+EQc+V2Q phmw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=E6l0v+eq; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTPS id c67si19371726pfa.191.2021.03.01.15.26.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Mar 2021 15:26:35 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=E6l0v+eq; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3C9F189F2E; Mon, 1 Mar 2021 23:26:18 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lj1-x22c.google.com (mail-lj1-x22c.google.com [IPv6:2a00:1450:4864:20::22c]) by gabe.freedesktop.org (Postfix) with ESMTPS id C00856E0C8 for ; Mon, 1 Mar 2021 23:26:16 +0000 (UTC) Received: by mail-lj1-x22c.google.com with SMTP id q23so21597892lji.8 for ; Mon, 01 Mar 2021 15:26:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=i7JxfEOiT7doc9bceVt7LQIeJ4pML0irOGPzAfMrTt8=; b=E6l0v+eqcwSupcmH++VK45o34oa4nPc4etdc7kijF77tYLq2eQb3CywuiXRK/BFjsM wmZO2fbDWY0gqJsZBwIv0Y3QWZGRUFP5aAXnyrbHSDoGMrr/ooHY4N4rAU/QtraiqLC/ Rh1BYI2k/mA1Te5x9eEH3jtruTCPIbNoOz+QjHNCLmMMTt0uMTFrkqR6/PLqoux8lYg6 04x0jbLp/Yh6JwtSGOTCTn6kagifWW+ll2wj8w0xENAVEpH/gEcu2G3WDBe1p4JLgu4s LBRU2gtFpMhaxO7rqYzWMfU/BlSp9xH68lICQs/NeZQMLf4U49vaMmDOC5L1CuQ+PL1n ECsQ== 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=i7JxfEOiT7doc9bceVt7LQIeJ4pML0irOGPzAfMrTt8=; b=YVVcBK9Sgb4Iug74B7ih5fzlL9xYvRdxE6dlN+EShM0wCjmY+6drfm9Kzr8vnf5QEu G5IXEWxnUOsqnRDBxzepURpsuJ1wBuLc16zUzNStao893HgbXO7o06mihGDijlFtJiGb DTz325x6+iDbD32tQf2lpNLgpsNj6lS70HcVmxOwl7aSgaIs6EhXPIblpuZ7v0J1Z8A/ GlzN5OKEx8JCnvbzuAw6LD5kjg5wh/m8NHbAaY0EBG7c1pLD7Thxq2DaRwCxtXjCGwRh +QYcTjfrw7QgHROsrAUGmagMyXALpHzZFR5ubdnNoHCGRkKzS8oE+p7RMH0Ppj5aQWiB i0IA== X-Gm-Message-State: AOAM5325alKMiLB8/lYXk+mC/VwSvTjx0PiKMLtXVYqF7NVZ1JZ7QKnf vUoURzxxRNqTvJPlWgY+BOpMWg== X-Received: by 2002:a2e:b817:: with SMTP id u23mr6503299ljo.44.1614641175190; Mon, 01 Mar 2021 15:26:15 -0800 (PST) Received: from eriador.lan ([37.153.55.125]) by smtp.gmail.com with ESMTPSA id b20sm154749lfa.183.2021.03.01.15.26.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Mar 2021 15:26:14 -0800 (PST) From: Dmitry Baryshkov To: Rob Clark , Sean Paul , Jonathan Marek Subject: [RFC 09/24] clk: mux: provide devm_clk_hw_register_mux() Date: Tue, 2 Mar 2021 02:24:52 +0300 Message-Id: <20210301232506.3057401-10-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210301232506.3057401-1-dmitry.baryshkov@linaro.org> References: <20210301232506.3057401-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stephen Boyd , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, David Airlie , freedreno@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Add devm_clk_hw_register_mux() - devres-managed version of clk_hw_register_mux(). Signed-off-by: Dmitry Baryshkov --- drivers/clk/clk-mux.c | 35 +++++++++++++++++++++++++++++++++++ include/linux/clk-provider.h | 13 +++++++++++++ 2 files changed, 48 insertions(+) -- 2.30.0 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel diff --git a/drivers/clk/clk-mux.c b/drivers/clk/clk-mux.c index e54e79714818..20582aae7a35 100644 --- a/drivers/clk/clk-mux.c +++ b/drivers/clk/clk-mux.c @@ -8,6 +8,7 @@ */ #include +#include #include #include #include @@ -206,6 +207,40 @@ struct clk_hw *__clk_hw_register_mux(struct device *dev, struct device_node *np, } EXPORT_SYMBOL_GPL(__clk_hw_register_mux); +static void devm_clk_hw_release_mux(struct device *dev, void *res) +{ + clk_hw_unregister_mux(*(struct clk_hw **)res); +} + +struct clk_hw *__devm_clk_hw_register_mux(struct device *dev, struct device_node *np, + const char *name, u8 num_parents, + const char * const *parent_names, + const struct clk_hw **parent_hws, + const struct clk_parent_data *parent_data, + unsigned long flags, void __iomem *reg, u8 shift, u32 mask, + u8 clk_mux_flags, u32 *table, spinlock_t *lock) +{ + struct clk_hw **ptr, *hw; + + ptr = devres_alloc(devm_clk_hw_release_mux, sizeof(*ptr), GFP_KERNEL); + if (!ptr) + return ERR_PTR(-ENOMEM); + + hw = __clk_hw_register_mux(dev, np, name, num_parents, parent_names, parent_hws, + parent_data, flags, reg, shift, mask, + clk_mux_flags, table, lock); + + if (!IS_ERR(hw)) { + *ptr = hw; + devres_add(dev, ptr); + } else { + devres_free(ptr); + } + + return hw; +} +EXPORT_SYMBOL_GPL(__devm_clk_hw_register_mux); + struct clk *clk_register_mux_table(struct device *dev, const char *name, const char * const *parent_names, u8 num_parents, unsigned long flags, void __iomem *reg, u8 shift, u32 mask, diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h index 58f6fe866ae9..3eb15e0262f5 100644 --- a/include/linux/clk-provider.h +++ b/include/linux/clk-provider.h @@ -868,6 +868,13 @@ struct clk_hw *__clk_hw_register_mux(struct device *dev, struct device_node *np, const struct clk_parent_data *parent_data, unsigned long flags, void __iomem *reg, u8 shift, u32 mask, u8 clk_mux_flags, u32 *table, spinlock_t *lock); +struct clk_hw *__devm_clk_hw_register_mux(struct device *dev, struct device_node *np, + const char *name, u8 num_parents, + const char * const *parent_names, + const struct clk_hw **parent_hws, + const struct clk_parent_data *parent_data, + unsigned long flags, void __iomem *reg, u8 shift, u32 mask, + u8 clk_mux_flags, u32 *table, spinlock_t *lock); struct clk *clk_register_mux_table(struct device *dev, const char *name, const char * const *parent_names, u8 num_parents, unsigned long flags, void __iomem *reg, u8 shift, u32 mask, @@ -902,6 +909,12 @@ struct clk *clk_register_mux_table(struct device *dev, const char *name, __clk_hw_register_mux((dev), NULL, (name), (num_parents), NULL, NULL, \ (parent_data), (flags), (reg), (shift), \ BIT((width)) - 1, (clk_mux_flags), NULL, (lock)) +#define devm_clk_hw_register_mux(dev, name, parent_names, num_parents, flags, reg, \ + shift, width, clk_mux_flags, lock) \ + __devm_clk_hw_register_mux((dev), NULL, (name), (num_parents), \ + (parent_names), NULL, NULL, (flags), (reg), \ + (shift), BIT((width)) - 1, (clk_mux_flags), \ + NULL, (lock)) int clk_mux_val_to_index(struct clk_hw *hw, u32 *table, unsigned int flags, unsigned int val);