From patchwork Wed Feb 8 23:43:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Protsenko X-Patchwork-Id: 54646 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp7516wrn; Wed, 8 Feb 2023 15:46:16 -0800 (PST) X-Google-Smtp-Source: AK7set+03M14Bmn860kxsDlz7DfkJaMIRVQ28qooo+SOtociR/BN+1ss0YIA7b009fm2WLiXYzJn X-Received: by 2002:a05:6a20:8e19:b0:b8:84d2:f9aa with SMTP id y25-20020a056a208e1900b000b884d2f9aamr6030047pzj.2.1675899976317; Wed, 08 Feb 2023 15:46:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675899976; cv=none; d=google.com; s=arc-20160816; b=xriuJkG2GgCktcP1Qo4oN1/bdKMuBLSAqK/WuSCIbX0qjWxUr7ci+rO5Q/jINP3Y3X i6Qp1Q1ExVScnU9tI9m/ClipIoHc6kDZb3b1aXCBm/t0hnNh7k1Gj1wjD3UEN+ZtoDiU K9KOL+dkNM4sminv8e/ir1wctNvYn12DTmsJN0lyqoDklrPvebVd+QrY67eoZTTDo0ou 2wtn/m1Juo40kyv/UKaI3dXXU5Vdz/dRpZrLEEjWryX50NpXvUW4devCfY9tDhFXfwLJ H8RN/zap98UC45Wgxw42v7yspM7tniPyIPKAq1DRaa7+vqhyHjVmlcl+2rEieyURzs/o Vg/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=u3TQijj1zNEkMgIbB33746rNlmKDxV7N66SIgj0jQUQ=; b=MONFNjaydV1CimEOQWzD8fx884ptJh2nDQaueUSn6QdEInOgiLDsvkox9lgdDYvEcJ +2e6PSCM7AcKzecfHsStRp7Zc9UQLv4PwhLwC5MXWfKEQJgOTacNz5QlovHtTuKhFa4a 7YZb3FhQRnonE1dtudxi0ykf/PBqGQ5zsmAi3V9H9KVtoEf4w7vVWJVbIPgjqDSUCcn+ k+078X1wSfNx1lWjF/vp9vZI8SWAsiMAIWcO0CWWTDQruit/ZKXb8fdwHr77sUyFpgDs 3a/cbgn20OfizNgxVQuh0Hu/T24lQx4Hsxsi5q7ChW7n7lBGZ0Luk/1GTSGKeoGZDunL TkIA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=r4nQNOWB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x20-20020a17090a8a9400b00230cc557396si182717pjn.73.2023.02.08.15.46.03; Wed, 08 Feb 2023 15:46:16 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=r4nQNOWB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229848AbjBHXnS (ORCPT + 99 others); Wed, 8 Feb 2023 18:43:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58912 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229843AbjBHXnH (ORCPT ); Wed, 8 Feb 2023 18:43:07 -0500 Received: from mail-oa1-x2c.google.com (mail-oa1-x2c.google.com [IPv6:2001:4860:4864:20::2c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D929D1CAE5 for ; Wed, 8 Feb 2023 15:43:03 -0800 (PST) Received: by mail-oa1-x2c.google.com with SMTP id 586e51a60fabf-16a291b16bfso559092fac.7 for ; Wed, 08 Feb 2023 15:43:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=u3TQijj1zNEkMgIbB33746rNlmKDxV7N66SIgj0jQUQ=; b=r4nQNOWBzVynaqZrRXOi+W5IJ7rgPu8UYjOMJ7CcciSMSGYOewBVZTIL4nbqb9znCz 6Pplrqd+dG5YTCBaHulkQodV6zHxIhhhMDz2Fz/EhFW9o7sWHEXnyAwg/u8h28RvUY+3 sfM+WZw7mX4NpYEmF/bPadKseepuZgDD7GhmNZOmGW5yl2wNphCUIwFeP459GjJ64iYs 4gxIQo4hbJbz2Tfw31seJEcZ+ULccIWGT4v9Dpkbjb+kYFycCcaz+YpCXbOmrHexy2/m PrxddhxFE8PRZQ6c4R2aw1gsheQ8UhRjf57QNer5HeKy8Q9mPMP8hUpDxqpAx6LO4cFf Hhzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=u3TQijj1zNEkMgIbB33746rNlmKDxV7N66SIgj0jQUQ=; b=s3AZn5VX4LGh9hkF74+3OC1b66hBUFioFmDehUZ5+QenDRzWohWlois7D1Iup+IDjz R1pX68XphjrxQd9hLi/n85FI0X5MaVEQWxzcAdzHvBARxeyNBQQBlFdkKS5HgUS+kVFT y7JmTHZw3E7MpVqQw3VSCrSgxrFJ32VSZ6vkQTygqxgLnJhBoZvPdtFuOss5jVDfVaMl sOBW5frlNUcKLHwW3m4Ger+/WIMaa0upvXUhWUQVA6fNLXOiHopx/SQFh/1XM48XnezV 85NaQcGPsGGix3QONu9abVImaW/Dwa1TsrI/9wWYoxWrPZJahprbHMp6cWZxOE+77FET 8KcQ== X-Gm-Message-State: AO0yUKVMZpfzP/DHTeZrqm/HSObkszyNO2/9N8bbEaiKHDjcxfuY9zHp vRQvmuxDqnWcBzJ9ISbykgKU1g== X-Received: by 2002:a05:6870:783:b0:15b:b523:3299 with SMTP id en3-20020a056870078300b0015bb5233299mr4714452oab.28.1675899783303; Wed, 08 Feb 2023 15:43:03 -0800 (PST) Received: from localhost ([136.49.140.41]) by smtp.gmail.com with ESMTPSA id zf18-20020a0568716a9200b0016a629e1917sm3672069oab.52.2023.02.08.15.43.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Feb 2023 15:43:02 -0800 (PST) From: Sam Protsenko To: Marek Szyprowski , Krzysztof Kozlowski , Sylwester Nawrocki , Chanwoo Choi Cc: Tomasz Figa , Alim Akhtar , Chanho Park , David Virag , Sumit Semwal , Michael Turquette , Stephen Boyd , linux-samsung-soc@vger.kernel.org, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 5/6] clk: samsung: Extract parent clock enabling to common function Date: Wed, 8 Feb 2023 17:43:12 -0600 Message-Id: <20230208234313.23863-6-semen.protsenko@linaro.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230208234313.23863-1-semen.protsenko@linaro.org> References: <20230208234313.23863-1-semen.protsenko@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757308493509375796?= X-GMAIL-MSGID: =?utf-8?q?1757308493509375796?= Extract parent clock enabling from exynos_arm64_register_cmu() to dedicated function. Tested-by: Marek Szyprowski Signed-off-by: Sam Protsenko --- Changes in v2: - Rebased on top of latest soc/for-next tree - Improved English in kernel doc comment - Added clk_prepare_enable() return value check - Added exynos_arm64_enable_bus_clk() check in exynos_arm64_register_cmu() - Changed the commit message to reflect code changes drivers/clk/samsung/clk-exynos-arm64.c | 51 ++++++++++++++++++-------- 1 file changed, 35 insertions(+), 16 deletions(-) diff --git a/drivers/clk/samsung/clk-exynos-arm64.c b/drivers/clk/samsung/clk-exynos-arm64.c index b921b9a1134a..2aa3f0a5644e 100644 --- a/drivers/clk/samsung/clk-exynos-arm64.c +++ b/drivers/clk/samsung/clk-exynos-arm64.c @@ -56,6 +56,37 @@ static void __init exynos_arm64_init_clocks(struct device_node *np, iounmap(reg_base); } +/** + * exynos_arm64_enable_bus_clk - Enable parent clock of specified CMU + * + * @dev: Device object; may be NULL if this function is not being + * called from platform driver probe function + * @np: CMU device tree node + * @cmu: CMU data + * + * Keep CMU parent clock running (needed for CMU registers access). + * + * Return: 0 on success or a negative error code on failure. + */ +static int __init exynos_arm64_enable_bus_clk(struct device *dev, + struct device_node *np, const struct samsung_cmu_info *cmu) +{ + struct clk *parent_clk; + + if (!cmu->clk_name) + return 0; + + if (dev) + parent_clk = clk_get(dev, cmu->clk_name); + else + parent_clk = of_clk_get_by_name(np, cmu->clk_name); + + if (IS_ERR(parent_clk)) + return PTR_ERR(parent_clk); + + return clk_prepare_enable(parent_clk); +} + /** * exynos_arm64_register_cmu - Register specified Exynos CMU domain * @dev: Device object; may be NULL if this function is not being @@ -72,23 +103,11 @@ static void __init exynos_arm64_init_clocks(struct device_node *np, void __init exynos_arm64_register_cmu(struct device *dev, struct device_node *np, const struct samsung_cmu_info *cmu) { - /* Keep CMU parent clock running (needed for CMU registers access) */ - if (cmu->clk_name) { - struct clk *parent_clk; - - if (dev) - parent_clk = clk_get(dev, cmu->clk_name); - else - parent_clk = of_clk_get_by_name(np, cmu->clk_name); - - if (IS_ERR(parent_clk)) { - pr_err("%s: could not find bus clock %s; err = %ld\n", - __func__, cmu->clk_name, PTR_ERR(parent_clk)); - } else { - clk_prepare_enable(parent_clk); - } - } + int err; + err = exynos_arm64_enable_bus_clk(dev, np, cmu); + if (err) + panic("%s: could not enable bus clock\n", __func__); exynos_arm64_init_clocks(np, cmu->clk_regs, cmu->nr_clk_regs); samsung_cmu_register_one(np, cmu); }