From: Wolfram Sang <wsa+renesas@sang-engineering.com>
To: linux-kernel@vger.kernel.org
Cc: linux-renesas-soc@vger.kernel.org,
Lee Jones <lee.jones@linaro.org>, Mark Brown <broonie@kernel.org>,
Support Opensource <support.opensource@diasemi.com>,
Wolfram Sang <wsa+renesas@sang-engineering.com>,
Liam Girdwood <lgirdwood@gmail.com>
Subject: [PATCH 6/6] regulator: da9063: platform_data is gone, depend on OF
Date: Mon, 18 Mar 2019 16:47:58 +0100 [thread overview]
Message-ID: <20190318154759.21978-7-wsa+renesas@sang-engineering.com> (raw)
In-Reply-To: <20190318154759.21978-1-wsa+renesas@sang-engineering.com>
With OF being the only configuration possibility left, depend on it to
simplify some code.
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
drivers/regulator/Kconfig | 2 +-
drivers/regulator/da9063-regulator.c | 10 ----------
2 files changed, 1 insertion(+), 11 deletions(-)
diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index b7f249ee5e68..6663cd6cb96c 100644
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -256,7 +256,7 @@ config REGULATOR_DA9062
config REGULATOR_DA9063
tristate "Dialog Semiconductor DA9063 regulators"
- depends on MFD_DA9063
+ depends on MFD_DA9063 && OF
help
Say y here to support the BUCKs and LDOs regulators found on
DA9063 PMICs.
diff --git a/drivers/regulator/da9063-regulator.c b/drivers/regulator/da9063-regulator.c
index c05859ad63d8..2eda8d985756 100644
--- a/drivers/regulator/da9063-regulator.c
+++ b/drivers/regulator/da9063-regulator.c
@@ -681,7 +681,6 @@ static const struct regulator_init_data *da9063_get_regulator_initdata(
return NULL;
}
-#ifdef CONFIG_OF
static struct of_regulator_match da9063_matches[] = {
[DA9063_ID_BCORE1] = { .name = "bcore1" },
[DA9063_ID_BCORE2] = { .name = "bcore2" },
@@ -759,15 +758,6 @@ static struct da9063_regulators_pdata *da9063_parse_regulators_dt(
*da9063_reg_matches = da9063_matches;
return pdata;
}
-#else
-static struct da9063_regulators_pdata *da9063_parse_regulators_dt(
- struct platform_device *pdev,
- struct of_regulator_match **da9063_reg_matches)
-{
- *da9063_reg_matches = NULL;
- return ERR_PTR(-ENODEV);
-}
-#endif
static int da9063_regulator_probe(struct platform_device *pdev)
{
--
2.11.0
next prev parent reply other threads:[~2019-03-18 15:49 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-18 15:47 [PATCH 0/6] mfd: da9063: remove platform_data Wolfram Sang
2019-03-18 15:47 ` [PATCH 1/6] regulator: da9063: remove platform_data support Wolfram Sang
2019-03-19 12:49 ` Simon Horman
2019-03-29 10:57 ` Steve Twiss
2019-03-18 15:47 ` [PATCH 2/6] input: da9063_onkey: " Wolfram Sang
2019-03-19 12:49 ` Simon Horman
2019-03-29 10:58 ` Steve Twiss
2019-04-03 9:24 ` Wolfram Sang
2019-03-18 15:47 ` [PATCH 3/6] mfd: da9063: " Wolfram Sang
2019-03-19 12:25 ` Simon Horman
2019-03-25 20:22 ` Wolfram Sang
2019-03-19 12:49 ` Simon Horman
2019-03-29 10:58 ` Steve Twiss
2019-04-03 8:02 ` Lee Jones
2019-03-18 15:47 ` [PATCH 4/6] regulator: da9063: move definitions out of a header into the driver Wolfram Sang
2019-03-19 12:49 ` Simon Horman
2019-03-19 13:01 ` Mark Brown
2019-04-03 9:22 ` Wolfram Sang
2019-04-03 10:07 ` Mark Brown
2019-03-29 11:00 ` Steve Twiss
2019-03-18 15:47 ` [PATCH 5/6] mfd: da9063: remove leftover platform_data definitions Wolfram Sang
2019-03-19 12:49 ` Simon Horman
2019-03-29 11:00 ` Steve Twiss
2019-04-03 8:07 ` Lee Jones
2019-04-03 8:50 ` Wolfram Sang
2019-04-03 9:03 ` Lee Jones
2019-03-18 15:47 ` Wolfram Sang [this message]
2019-03-19 12:50 ` [PATCH 6/6] regulator: da9063: platform_data is gone, depend on OF Simon Horman
2019-03-29 11:01 ` Steve Twiss
2019-03-18 16:34 ` [PATCH 0/6] mfd: da9063: remove platform_data Steve Twiss
2019-03-29 11:02 ` Steve Twiss
2019-03-29 11:27 ` Wolfram Sang
2019-03-29 11:28 ` Steve Twiss
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=20190318154759.21978-7-wsa+renesas@sang-engineering.com \
--to=wsa+renesas@sang-engineering.com \
--cc=broonie@kernel.org \
--cc=lee.jones@linaro.org \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=support.opensource@diasemi.com \
/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).