From nobody Wed Apr 8 01:49:29 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 9EB34C433FE for ; Thu, 20 Oct 2022 20:43:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229695AbiJTUnN (ORCPT ); Thu, 20 Oct 2022 16:43:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33924 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229489AbiJTUnK (ORCPT ); Thu, 20 Oct 2022 16:43:10 -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 776DC1F810A; Thu, 20 Oct 2022 13:42:56 -0700 (PDT) Received: from jupiter.universe (dyndsl-091-096-059-009.ewe-ip-backbone.de [91.96.59.9]) (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 9AFB8660250A; Thu, 20 Oct 2022 21:42:54 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1666298574; bh=UP5o/tvjF82X745/6YwLJBWyLQY3SW00yYxIUB5+Do8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lyOVSWyKlZo3CKhTdjNO4jIL6KMkKJhWK2bhpQLW15YPV5+wGEJpJ3d5R0BP76Ihe /WNrklAWhUrXxJV44uwj3sX3KNEHYXXUmmgaH4FmqKtJnHML4tcg7ObEAT8uICLwvP 5a4AdXNTGFC8v/GGinsYweRC7mm9F2s3zInQqZetU0d0xrz8qrWx9cjif3bOfZOxwp qwI5Wi/ySVgqfYEEA9Bhi1knzOepvxpekeZ2vofyGQc9WemQub/2LJGk4B20HMy6aW 9i1EAnPDEXyTIo3PKWNWeJ7BhhEt0U/VhLZolFVrrSchlLeLpVzs5obXSrFiGPM5lC sUOmgmKeUpj2g== Received: by jupiter.universe (Postfix, from userid 1000) id 52567480897; Thu, 20 Oct 2022 22:42:52 +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 Subject: [PATCHv4 02/13] regulator: rk808: reduce 'struct rk808' usage Date: Thu, 20 Oct 2022 22:42:40 +0200 Message-Id: <20221020204251.108565-3-sebastian.reichel@collabora.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221020204251.108565-1-sebastian.reichel@collabora.com> References: <20221020204251.108565-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: Mark Brown Signed-off-by: Sebastian Reichel --- drivers/regulator/rk808-regulator.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/drivers/regulator/rk808-regulator.c b/drivers/regulator/rk808-= regulator.c index 127dc2e2e690..ce9c64cadeba 100644 --- a/drivers/regulator/rk808-regulator.c +++ b/drivers/regulator/rk808-regulator.c @@ -14,7 +14,6 @@ =20 #include #include -#include #include #include #include @@ -1286,19 +1285,23 @@ static int rk808_regulator_dt_parse_pdata(struct de= vice *dev, static int rk808_regulator_probe(struct platform_device *pdev) { struct rk808 *rk808 =3D dev_get_drvdata(pdev->dev.parent); - struct i2c_client *client =3D rk808->i2c; struct regulator_config config =3D {}; struct regulator_dev *rk808_rdev; struct rk808_regulator_data *pdata; const struct regulator_desc *regulators; + struct regmap *regmap; int ret, i, nregulators; =20 + regmap =3D dev_get_regmap(pdev->dev.parent, NULL); + if (!regmap) + return -ENODEV; + pdata =3D devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL); if (!pdata) return -ENOMEM; =20 - ret =3D rk808_regulator_dt_parse_pdata(&pdev->dev, &client->dev, - rk808->regmap, pdata); + ret =3D rk808_regulator_dt_parse_pdata(&pdev->dev, pdev->dev.parent, + regmap, pdata); if (ret < 0) return ret; =20 @@ -1326,21 +1329,22 @@ static int rk808_regulator_probe(struct platform_de= vice *pdev) nregulators =3D RK818_NUM_REGULATORS; break; default: - dev_err(&client->dev, "unsupported RK8XX ID %lu\n", + dev_err(&pdev->dev, "unsupported RK8XX ID %lu\n", rk808->variant); return -EINVAL; } =20 - config.dev =3D &client->dev; + config.dev =3D &pdev->dev; + config.dev->of_node =3D pdev->dev.parent->of_node; config.driver_data =3D pdata; - config.regmap =3D rk808->regmap; + config.regmap =3D regmap; =20 /* Instantiate the regulators */ for (i =3D 0; i < nregulators; i++) { rk808_rdev =3D devm_regulator_register(&pdev->dev, ®ulators[i], &config); if (IS_ERR(rk808_rdev)) { - dev_err(&client->dev, + dev_err(&pdev->dev, "failed to register %d regulator\n", i); return PTR_ERR(rk808_rdev); } --=20 2.35.1