[v10,04/11] regulator: sy7636a: Use the regmap directly

Message ID	20210807103940.152-5-alistair@alistair23.me
State	Accepted
Commit	27fdd3bbb7a13830c05b6bf777e45c392cb00f63
Headers	show Return-Path: <devicetree-owner@kernel.org> From: Alistair Francis <alistair@alistair23.me> To: lee.jones@linaro.org, robh+dt@kernel.org, lgirdwood@gmail.com, broonie@kernel.org, linux-imx@nxp.com, kernel@pengutronix.de Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, alistair23@gmail.com, Alistair Francis <alistair@alistair23.me> Subject: [PATCH v10 04/11] regulator: sy7636a: Use the regmap directly Date: Sat, 7 Aug 2021 20:39:33 +1000 Message-Id: <20210807103940.152-5-alistair@alistair23.me> In-Reply-To: <20210807103940.152-1-alistair@alistair23.me> References: <20210807103940.152-1-alistair@alistair23.me> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	Add support for the silergy,sy7636a \| expand [v10,00/11] Add support for the silergy,sy7636a [v10,01/11] dt-bindings: mfd: Initial commit of silergy,sy7636a.yaml [v10,02/11] mfd: simple-mfd-i2c: Add a Kconfig name [v10,03/11] mfd: simple-mfd-i2c: Enable support for the silergy,sy7636a [v10,04/11] regulator: sy7636a: Use the regmap directly [v10,05/11] regulator: sy7636a: Remove requirement on sy7636a mfd [v10,06/11] thermal: sy7636a: Add thermal driver for sy7636a [v10,07/11] hwmon: sy7636a: Add temperature driver for sy7636a [v10,08/11] ARM: imx_v6_v7_defconfig: Enable silergy,sy7636a [v10,09/11] ARM: dts: imx7d: remarkable2: Enable silergy,sy7636a [v10,10/11] ARM: imx_v6_v7_defconfig: Enable backlight class devices [v10,11/11] ARM: dts: imx7d: remarkable2: Enable lcdif

Message ID

20210807103940.152-5-alistair@alistair23.me

State

Accepted

Commit

27fdd3bbb7a13830c05b6bf777e45c392cb00f63

Headers

From: Alistair Francis <alistair@alistair23.me>
To: lee.jones@linaro.org, robh+dt@kernel.org, lgirdwood@gmail.com,
	broonie@kernel.org, linux-imx@nxp.com, kernel@pengutronix.de
Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
	alistair23@gmail.com, Alistair Francis <alistair@alistair23.me>
Subject: [PATCH v10 04/11] regulator: sy7636a: Use the regmap directly
Date: Sat,  7 Aug 2021 20:39:33 +1000
Message-Id: <20210807103940.152-5-alistair@alistair23.me>
In-Reply-To: <20210807103940.152-1-alistair@alistair23.me>
References: <20210807103940.152-1-alistair@alistair23.me>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

Add support for the silergy,sy7636a | expand

Commit Message

Alistair Aug. 7, 2021, 10:39 a.m. UTC

Signed-off-by: Alistair Francis <alistair@alistair23.me>
---
 drivers/regulator/sy7636a-regulator.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/drivers/regulator/sy7636a-regulator.c b/drivers/regulator/sy7636a-regulator.c
index 37bf2a3c06b7..8360b3947ead 100644
--- a/drivers/regulator/sy7636a-regulator.c
+++ b/drivers/regulator/sy7636a-regulator.c
@@ -14,7 +14,7 @@ 
 #include <linux/mfd/sy7636a.h>
 
 struct sy7636a_data {
-	struct sy7636a *sy7636a;
+	struct regmap *regmap;
 	struct gpio_desc *pgood_gpio;
 };
 
@@ -70,14 +70,14 @@  static const struct regulator_desc desc = {
 
 static int sy7636a_regulator_probe(struct platform_device *pdev)
 {
-	struct sy7636a *sy7636a = dev_get_drvdata(pdev->dev.parent);
+	struct regmap *regmap = dev_get_drvdata(pdev->dev.parent);
 	struct regulator_config config = { };
 	struct regulator_dev *rdev;
 	struct gpio_desc *gdp;
 	struct sy7636a_data *data;
 	int ret;
 
-	if (!sy7636a)
+	if (!regmap)
 		return -EPROBE_DEFER;
 
 	gdp = devm_gpiod_get(pdev->dev.parent, "epd-pwr-good", GPIOD_IN);
@@ -90,12 +90,12 @@  static int sy7636a_regulator_probe(struct platform_device *pdev)
 	if (!data)
 		return -ENOMEM;
 
-	data->sy7636a = sy7636a;
+	data->regmap = regmap;
 	data->pgood_gpio = gdp;
 
 	platform_set_drvdata(pdev, data);
 
-	ret = regmap_write(sy7636a->regmap, SY7636A_REG_POWER_ON_DELAY_TIME, 0x0);
+	ret = regmap_write(regmap, SY7636A_REG_POWER_ON_DELAY_TIME, 0x0);
 	if (ret) {
 		dev_err(pdev->dev.parent, "Failed to initialize regulator: %d\n", ret);
 		return ret;
@@ -103,8 +103,7 @@  static int sy7636a_regulator_probe(struct platform_device *pdev)
 
 	config.dev = &pdev->dev;
 	config.dev->of_node = pdev->dev.parent->of_node;
-	config.driver_data = sy7636a;
-	config.regmap = sy7636a->regmap;
+	config.regmap = regmap;
 
 	rdev = devm_regulator_register(&pdev->dev, &desc, &config);
 	if (IS_ERR(rdev)) {

[v10,04/11] regulator: sy7636a: Use the regmap directly

Commit Message

Patch