From: Alistair Francis <alistair@alistair23.me>
To: robh+dt@kernel.org, kernel@pengutronix.de, lgirdwood@gmail.com,
lee.jones@linaro.org, broonie@kernel.org
Cc: s.hauer@pengutronix.de, rui.zhang@intel.com,
linux-hwmon@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, amitk@kernel.org,
shawnguo@kernel.org, alistair23@gmail.com,
devicetree@vger.kernel.org, linux-imx@nxp.com,
andreas@kemnade.info, linux-pm@vger.kernel.org,
linux-kernel@vger.kernel.org,
Alistair Francis <alistair@alistair23.me>
Subject: [PATCH v14 4/8] regulator: sy7636a: Remove requirement on sy7636a mfd
Date: Mon, 25 Oct 2021 20:53:05 +1000 [thread overview]
Message-ID: <20211025105309.37942-5-alistair@alistair23.me> (raw)
In-Reply-To: <20211025105309.37942-1-alistair@alistair23.me>
Signed-off-by: Alistair Francis <alistair@alistair23.me>
---
drivers/regulator/Kconfig | 1 -
drivers/regulator/sy7636a-regulator.c | 9 ++++++---
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index 4fd13b06231f..21077cb14625 100644
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -1199,7 +1199,6 @@ config REGULATOR_STW481X_VMMC
config REGULATOR_SY7636A
tristate "Silergy SY7636A voltage regulator"
- depends on MFD_SY7636A
help
This driver supports Silergy SY3686A voltage regulator.
diff --git a/drivers/regulator/sy7636a-regulator.c b/drivers/regulator/sy7636a-regulator.c
index 8360b3947ead..29fc27c2cda0 100644
--- a/drivers/regulator/sy7636a-regulator.c
+++ b/drivers/regulator/sy7636a-regulator.c
@@ -7,11 +7,14 @@
// Authors: Lars Ivar Miljeteig <lars.ivar.miljeteig@remarkable.com>
// Alistair Francis <alistair@alistair23.me>
+#include <linux/gpio/consumer.h>
+#include <linux/i2c.h>
+#include <linux/mfd/sy7636a.h>
#include <linux/module.h>
#include <linux/platform_device.h>
+#include <linux/regulator/driver.h>
+#include <linux/regulator/machine.h>
#include <linux/regmap.h>
-#include <linux/gpio/consumer.h>
-#include <linux/mfd/sy7636a.h>
struct sy7636a_data {
struct regmap *regmap;
@@ -70,7 +73,7 @@ static const struct regulator_desc desc = {
static int sy7636a_regulator_probe(struct platform_device *pdev)
{
- struct regmap *regmap = dev_get_drvdata(pdev->dev.parent);
+ struct regmap *regmap = dev_get_regmap(pdev->dev.parent, NULL);
struct regulator_config config = { };
struct regulator_dev *rdev;
struct gpio_desc *gdp;
--
2.31.1
next prev parent reply other threads:[~2021-10-25 10:54 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-25 10:53 [PATCH v14 0/8] Add support for the silergy,sy7636a Alistair Francis
2021-10-25 10:53 ` [PATCH v14 1/8] dt-bindings: mfd: Initial commit of silergy,sy7636a.yaml Alistair Francis
2021-10-25 10:53 ` [PATCH v14 2/8] mfd: simple-mfd-i2c: Add a Kconfig name Alistair Francis
2021-10-25 10:53 ` [PATCH v14 3/8] mfd: simple-mfd-i2c: Enable support for the silergy,sy7636a Alistair Francis
2021-10-25 10:53 ` Alistair Francis [this message]
2021-10-25 10:53 ` [PATCH v14 5/8] hwmon: sy7636a: Add temperature driver for sy7636a Alistair Francis
2021-10-25 14:26 ` Guenter Roeck
2021-10-25 10:53 ` [PATCH v14 6/8] ARM: imx_v6_v7_defconfig: Enable silergy,sy7636a Alistair Francis
2021-10-25 10:53 ` [PATCH v14 7/8] ARM: dts: imx7d: remarkable2: " Alistair Francis
2021-10-25 10:53 ` [PATCH v14 8/8] ARM: dts: imx7d: remarkable2: Enable lcdif Alistair Francis
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211025105309.37942-5-alistair@alistair23.me \
--to=alistair@alistair23.me \
--cc=alistair23@gmail.com \
--cc=amitk@kernel.org \
--cc=andreas@kemnade.info \
--cc=broonie@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=kernel@pengutronix.de \
--cc=lee.jones@linaro.org \
--cc=lgirdwood@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-hwmon@vger.kernel.org \
--cc=linux-imx@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=robh+dt@kernel.org \
--cc=rui.zhang@intel.com \
--cc=s.hauer@pengutronix.de \
--cc=shawnguo@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).