linux-renesas-soc.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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 4/6] regulator: da9063: move definitions out of a header into the driver
Date: Mon, 18 Mar 2019 16:47:56 +0100	[thread overview]
Message-ID: <20190318154759.21978-5-wsa+renesas@sang-engineering.com> (raw)
In-Reply-To: <20190318154759.21978-1-wsa+renesas@sang-engineering.com>

Those definitions are only used within the driver meanwhile, so put them
there.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
 drivers/regulator/da9063-regulator.c | 44 +++++++++++++++++++++++++++++++-
 include/linux/mfd/da9063/pdata.h     | 49 ------------------------------------
 2 files changed, 43 insertions(+), 50 deletions(-)

diff --git a/drivers/regulator/da9063-regulator.c b/drivers/regulator/da9063-regulator.c
index 73c85039d0cf..c05859ad63d8 100644
--- a/drivers/regulator/da9063-regulator.c
+++ b/drivers/regulator/da9063-regulator.c
@@ -25,7 +25,6 @@
 #include <linux/regulator/machine.h>
 #include <linux/regulator/of_regulator.h>
 #include <linux/mfd/da9063/core.h>
-#include <linux/mfd/da9063/pdata.h>
 #include <linux/mfd/da9063/registers.h>
 
 
@@ -34,6 +33,49 @@
 	REG_FIELD(_reg, __builtin_ffs((int)_mask) - 1, \
 		sizeof(unsigned int) * 8 - __builtin_clz((_mask)) - 1)
 
+/* DA9063 and DA9063L regulator IDs */
+enum {
+	/* BUCKs */
+	DA9063_ID_BCORE1,
+	DA9063_ID_BCORE2,
+	DA9063_ID_BPRO,
+	DA9063_ID_BMEM,
+	DA9063_ID_BIO,
+	DA9063_ID_BPERI,
+
+	/* BCORE1 and BCORE2 in merged mode */
+	DA9063_ID_BCORES_MERGED,
+	/* BMEM and BIO in merged mode */
+	DA9063_ID_BMEM_BIO_MERGED,
+	/* When two BUCKs are merged, they cannot be reused separately */
+
+	/* LDOs on both DA9063 and DA9063L */
+	DA9063_ID_LDO3,
+	DA9063_ID_LDO7,
+	DA9063_ID_LDO8,
+	DA9063_ID_LDO9,
+	DA9063_ID_LDO11,
+
+	/* DA9063-only LDOs */
+	DA9063_ID_LDO1,
+	DA9063_ID_LDO2,
+	DA9063_ID_LDO4,
+	DA9063_ID_LDO5,
+	DA9063_ID_LDO6,
+	DA9063_ID_LDO10,
+};
+
+/* Old regulator platform data */
+struct da9063_regulator_data {
+	int				id;
+	struct regulator_init_data	*initdata;
+};
+
+struct da9063_regulators_pdata {
+	unsigned int			n_regulators;
+	struct da9063_regulator_data	*regulator_data;
+};
+
 /* Regulator capabilities and registers description */
 struct da9063_regulator_info {
 	struct regulator_desc desc;
diff --git a/include/linux/mfd/da9063/pdata.h b/include/linux/mfd/da9063/pdata.h
index 50bed4f89c1a..21a2d107f0cf 100644
--- a/include/linux/mfd/da9063/pdata.h
+++ b/include/linux/mfd/da9063/pdata.h
@@ -16,55 +16,6 @@
 #ifndef __MFD_DA9063_PDATA_H__
 #define __MFD_DA9063_PDATA_H__
 
-#include <linux/regulator/machine.h>
-
-/*
- * Regulator configuration
- */
-/* DA9063 and DA9063L regulator IDs */
-enum {
-	/* BUCKs */
-	DA9063_ID_BCORE1,
-	DA9063_ID_BCORE2,
-	DA9063_ID_BPRO,
-	DA9063_ID_BMEM,
-	DA9063_ID_BIO,
-	DA9063_ID_BPERI,
-
-	/* BCORE1 and BCORE2 in merged mode */
-	DA9063_ID_BCORES_MERGED,
-	/* BMEM and BIO in merged mode */
-	DA9063_ID_BMEM_BIO_MERGED,
-	/* When two BUCKs are merged, they cannot be reused separately */
-
-	/* LDOs on both DA9063 and DA9063L */
-	DA9063_ID_LDO3,
-	DA9063_ID_LDO7,
-	DA9063_ID_LDO8,
-	DA9063_ID_LDO9,
-	DA9063_ID_LDO11,
-
-	/* DA9063-only LDOs */
-	DA9063_ID_LDO1,
-	DA9063_ID_LDO2,
-	DA9063_ID_LDO4,
-	DA9063_ID_LDO5,
-	DA9063_ID_LDO6,
-	DA9063_ID_LDO10,
-};
-
-/* Regulators platform data */
-struct da9063_regulator_data {
-	int				id;
-	struct regulator_init_data	*initdata;
-};
-
-struct da9063_regulators_pdata {
-	unsigned			n_regulators;
-	struct da9063_regulator_data	*regulator_data;
-};
-
-
 /*
  * RGB LED configuration
  */
-- 
2.11.0


  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 ` Wolfram Sang [this message]
2019-03-19 12:49   ` [PATCH 4/6] regulator: da9063: move definitions out of a header into the driver 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 ` [PATCH 6/6] regulator: da9063: platform_data is gone, depend on OF Wolfram Sang
2019-03-19 12:50   ` 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-5-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).