| Message ID | 20190318154759.21978-5-wsa+renesas@sang-engineering.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Geert Uytterhoeven |
| Headers | show |
| Series | mfd: da9063: remove platform_data | expand |
On Mon, Mar 18, 2019 at 04:47:56PM +0100, Wolfram Sang wrote: > Those definitions are only used within the driver meanwhile, so put them > there. > > Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Reviewed-by: Simon Horman <horms+renesas@verge.net.au> > --- > 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 >
On Mon, Mar 18, 2019 at 04:47:56PM +0100, Wolfram Sang wrote: > Those definitions are only used within the driver meanwhile, so put them > there. Acked-by: Mark Brown <broonie@kernel.org>
Hi, On 18 March 2019 15:48, Wolfram Sang wrote: > Subject: [PATCH 4/6] regulator: da9063: move definitions out of a header into the driver > > 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 Thanks! Acked-by: Steve Twiss <stwiss.opensource@diasemi.com> Tested-by: Steve Twiss <stwiss.opensource@diasemi.com> Regards, Steve
On Tue, Mar 19, 2019 at 01:01:34PM +0000, Mark Brown wrote: > On Mon, Mar 18, 2019 at 04:47:56PM +0100, Wolfram Sang wrote: > > Those definitions are only used within the driver meanwhile, so put them > > there. > > Acked-by: Mark Brown <broonie@kernel.org> Mark, if you are OK with all the patches going in via MFD, could you ack the other regulator patches, too? Steve is fine with the patches and tested them, too.
On Wed, Apr 03, 2019 at 11:22:30AM +0200, Wolfram Sang wrote: > Mark, if you are OK with all the patches going in via MFD, could you ack > the other regulator patches, too? Steve is fine with the patches and > tested them, too. I don't recall any more patches, sorry. Probably they're fine because the whole series looked straightforward enough so I guess. Acked-by: Mark Brown <broonie@kernel.org>
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 */
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(-)