From nobody Wed Feb 11 21:14:35 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8201BC7EE2D for ; Thu, 4 May 2023 17:36:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229965AbjEDRg3 (ORCPT ); Thu, 4 May 2023 13:36:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35258 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229892AbjEDRg0 (ORCPT ); Thu, 4 May 2023 13:36:26 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e5ab]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ED95549CD; Thu, 4 May 2023 10:36:24 -0700 (PDT) Received: from jupiter.universe (dyndsl-091-248-211-176.ewe-ip-backbone.de [91.248.211.176]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: sre) by madras.collabora.co.uk (Postfix) with ESMTPSA id EA68866056FE; Thu, 4 May 2023 18:36:22 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1683221783; bh=9fsvo32acedHCaThtF8k2m1ur9c/GCPctR4GqCPEwXU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NpltqfSVFS0l3UzBXGVQYp1rpHIyYiBMQEu/w1CF1ofYQizDApeT0rnqHYR+HqsJ9 MyAYN99RubFxctBVkDUP1MGfghZW2mtSgMQ9tVpEHMCcimpH6gXxnCrG/Z7OWU5Ldo 3jT1TkDeaU27adW+Koy3GZkNgViWfurWkdL2KyJE7BTDSnH5FJZnmKepTkstvT6xYB ZL1rqG4Ymt93PwXwHw9lOMHvo4XCBcoZg/OVmXFk78+LCG3s1NAReDedEJQ9UbA1b8 5ZAyma6XLXzi11BjpbnynKyuusDt9RGkb6cI8GuS5jmDu9DBszlLF3doyWroY6dYWw XfsTDzPugGUgQ== Received: by jupiter.universe (Postfix, from userid 1000) id D68834807E0; Thu, 4 May 2023 19:36:20 +0200 (CEST) From: Sebastian Reichel To: Heiko Stuebner , Rob Herring , Krzysztof Kozlowski , Lee Jones Cc: Michael Turquette , Stephen Boyd , Linus Walleij , Mark Brown , Liam Girdwood , Alexandre Belloni , Alessandro Zummo , linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Sebastian Reichel , kernel@collabora.com, Diederik de Haas , Vincent Legoll Subject: [PATCH v8 01/14] clk: RK808: reduce 'struct rk808' usage Date: Thu, 4 May 2023 19:36:05 +0200 Message-Id: <20230504173618.142075-2-sebastian.reichel@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230504173618.142075-1-sebastian.reichel@collabora.com> References: <20230504173618.142075-1-sebastian.reichel@collabora.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Reduce usage of 'struct rk808' (driver data of the parent MFD), so that only the chip variant field is still being accessed directly. This allows restructuring the MFD driver to support SPI based PMICs. Acked-by: Stephen Boyd Tested-by: Diederik de Haas # Rock64, Quartz64 Mode= l A + B Tested-by: Vincent Legoll # Pine64 QuartzPro64 Signed-off-by: Sebastian Reichel --- drivers/clk/clk-rk808.c | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/drivers/clk/clk-rk808.c b/drivers/clk/clk-rk808.c index 32f833d732ed..f7412b137e5e 100644 --- a/drivers/clk/clk-rk808.c +++ b/drivers/clk/clk-rk808.c @@ -12,10 +12,9 @@ #include #include #include -#include =20 struct rk808_clkout { - struct rk808 *rk808; + struct regmap *regmap; struct clk_hw clkout1_hw; struct clk_hw clkout2_hw; }; @@ -31,9 +30,8 @@ static int rk808_clkout2_enable(struct clk_hw *hw, bool e= nable) struct rk808_clkout *rk808_clkout =3D container_of(hw, struct rk808_clkout, clkout2_hw); - struct rk808 *rk808 =3D rk808_clkout->rk808; =20 - return regmap_update_bits(rk808->regmap, RK808_CLK32OUT_REG, + return regmap_update_bits(rk808_clkout->regmap, RK808_CLK32OUT_REG, CLK32KOUT2_EN, enable ? CLK32KOUT2_EN : 0); } =20 @@ -52,10 +50,9 @@ static int rk808_clkout2_is_prepared(struct clk_hw *hw) struct rk808_clkout *rk808_clkout =3D container_of(hw, struct rk808_clkout, clkout2_hw); - struct rk808 *rk808 =3D rk808_clkout->rk808; uint32_t val; =20 - int ret =3D regmap_read(rk808->regmap, RK808_CLK32OUT_REG, &val); + int ret =3D regmap_read(rk808_clkout->regmap, RK808_CLK32OUT_REG, &val); =20 if (ret < 0) return ret; @@ -93,9 +90,8 @@ static int rk817_clkout2_enable(struct clk_hw *hw, bool e= nable) struct rk808_clkout *rk808_clkout =3D container_of(hw, struct rk808_clkout, clkout2_hw); - struct rk808 *rk808 =3D rk808_clkout->rk808; =20 - return regmap_update_bits(rk808->regmap, RK817_SYS_CFG(1), + return regmap_update_bits(rk808_clkout->regmap, RK817_SYS_CFG(1), RK817_CLK32KOUT2_EN, enable ? RK817_CLK32KOUT2_EN : 0); } @@ -115,10 +111,9 @@ static int rk817_clkout2_is_prepared(struct clk_hw *hw) struct rk808_clkout *rk808_clkout =3D container_of(hw, struct rk808_clkout, clkout2_hw); - struct rk808 *rk808 =3D rk808_clkout->rk808; unsigned int val; =20 - int ret =3D regmap_read(rk808->regmap, RK817_SYS_CFG(1), &val); + int ret =3D regmap_read(rk808_clkout->regmap, RK817_SYS_CFG(1), &val); =20 if (ret < 0) return 0; @@ -153,18 +148,21 @@ static const struct clk_ops *rkpmic_get_ops(long vari= ant) static int rk808_clkout_probe(struct platform_device *pdev) { struct rk808 *rk808 =3D dev_get_drvdata(pdev->dev.parent); - struct i2c_client *client =3D rk808->i2c; - struct device_node *node =3D client->dev.of_node; + struct device *dev =3D &pdev->dev; struct clk_init_data init =3D {}; struct rk808_clkout *rk808_clkout; int ret; =20 - rk808_clkout =3D devm_kzalloc(&client->dev, + dev->of_node =3D pdev->dev.parent->of_node; + + rk808_clkout =3D devm_kzalloc(dev, sizeof(*rk808_clkout), GFP_KERNEL); if (!rk808_clkout) return -ENOMEM; =20 - rk808_clkout->rk808 =3D rk808; + rk808_clkout->regmap =3D dev_get_regmap(pdev->dev.parent, NULL); + if (!rk808_clkout->regmap) + return -ENODEV; =20 init.parent_names =3D NULL; init.num_parents =3D 0; @@ -173,10 +171,10 @@ static int rk808_clkout_probe(struct platform_device = *pdev) rk808_clkout->clkout1_hw.init =3D &init; =20 /* optional override of the clockname */ - of_property_read_string_index(node, "clock-output-names", + of_property_read_string_index(dev->of_node, "clock-output-names", 0, &init.name); =20 - ret =3D devm_clk_hw_register(&client->dev, &rk808_clkout->clkout1_hw); + ret =3D devm_clk_hw_register(dev, &rk808_clkout->clkout1_hw); if (ret) return ret; =20 @@ -185,10 +183,10 @@ static int rk808_clkout_probe(struct platform_device = *pdev) rk808_clkout->clkout2_hw.init =3D &init; =20 /* optional override of the clockname */ - of_property_read_string_index(node, "clock-output-names", + of_property_read_string_index(dev->of_node, "clock-output-names", 1, &init.name); =20 - ret =3D devm_clk_hw_register(&client->dev, &rk808_clkout->clkout2_hw); + ret =3D devm_clk_hw_register(dev, &rk808_clkout->clkout2_hw); if (ret) return ret; =20 --=20 2.39.2