Patchwork [U-Boot,v2,08/21] pmic: Move pmic related code to ./drivers/power directory

login
register
mail settings
Submitter Łukasz Majewski
Date Oct. 5, 2012, 8:16 a.m.
Message ID <1349425003-32523-9-git-send-email-l.majewski@samsung.com>
Download mbox | patch
Permalink /patch/189435/
State Changes Requested
Delegated to: Stefano Babic
Headers show

Comments

Łukasz Majewski - Oct. 5, 2012, 8:16 a.m.
The PMIC framework has been moved to its more natural place
./drivers/power from ./drivers/misc directory.

Signed-off-by: Lukasz Majewski <l.majewski@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
---
Changes for v2:
- New patch for v2
---
 drivers/misc/Makefile                          |    7 -------
 drivers/power/Makefile                         |    8 ++++++++
 drivers/{misc => power/max8997}/pmic_max8997.c |    0
 drivers/{misc => power/max8998}/pmic_max8998.c |    0
 drivers/{misc => power}/pmic_core.c            |    0
 drivers/{misc => power}/pmic_dialog.c          |    0
 drivers/{misc => power}/pmic_fsl.c             |    0
 drivers/{misc => power}/pmic_i2c.c             |    0
 drivers/{misc => power}/pmic_spi.c             |    0
 9 files changed, 8 insertions(+), 7 deletions(-)
 rename drivers/{misc => power/max8997}/pmic_max8997.c (100%)
 rename drivers/{misc => power/max8998}/pmic_max8998.c (100%)
 rename drivers/{misc => power}/pmic_core.c (100%)
 rename drivers/{misc => power}/pmic_dialog.c (100%)
 rename drivers/{misc => power}/pmic_fsl.c (100%)
 rename drivers/{misc => power}/pmic_i2c.c (100%)
 rename drivers/{misc => power}/pmic_spi.c (100%)

diff --git a/drivers/misc/pmic_max8997.c b/drivers/power/max8997/pmic_max8997.c
similarity index 100%
rename from drivers/misc/pmic_max8997.c
rename to drivers/power/max8997/pmic_max8997.c
diff --git a/drivers/misc/pmic_max8998.c b/drivers/power/max8998/pmic_max8998.c
similarity index 100%
rename from drivers/misc/pmic_max8998.c
rename to drivers/power/max8998/pmic_max8998.c
diff --git a/drivers/misc/pmic_core.c b/drivers/power/pmic_core.c
similarity index 100%
rename from drivers/misc/pmic_core.c
rename to drivers/power/pmic_core.c
diff --git a/drivers/misc/pmic_dialog.c b/drivers/power/pmic_dialog.c
similarity index 100%
rename from drivers/misc/pmic_dialog.c
rename to drivers/power/pmic_dialog.c
diff --git a/drivers/misc/pmic_fsl.c b/drivers/power/pmic_fsl.c
similarity index 100%
rename from drivers/misc/pmic_fsl.c
rename to drivers/power/pmic_fsl.c
diff --git a/drivers/misc/pmic_i2c.c b/drivers/power/pmic_i2c.c
similarity index 100%
rename from drivers/misc/pmic_i2c.c
rename to drivers/power/pmic_i2c.c
diff --git a/drivers/misc/pmic_spi.c b/drivers/power/pmic_spi.c
similarity index 100%
rename from drivers/misc/pmic_spi.c
rename to drivers/power/pmic_spi.c
Stefano Babic - Oct. 9, 2012, 8:58 a.m.
On 05/10/2012 10:16, Lukasz Majewski wrote:
> The PMIC framework has been moved to its more natural place
> ./drivers/power from ./drivers/misc directory.
> 
> Signed-off-by: Lukasz Majewski <l.majewski@samsung.com>
> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
> ---
> Changes for v2:
> - New patch for v2
> ---
>  drivers/misc/Makefile                          |    7 -------
>  drivers/power/Makefile                         |    8 ++++++++
>  drivers/{misc => power/max8997}/pmic_max8997.c |    0
>  drivers/{misc => power/max8998}/pmic_max8998.c |    0
>  drivers/{misc => power}/pmic_core.c            |    0
>  drivers/{misc => power}/pmic_dialog.c          |    0
>  drivers/{misc => power}/pmic_fsl.c             |    0
>  drivers/{misc => power}/pmic_i2c.c             |    0
>  drivers/{misc => power}/pmic_spi.c             |    0
>  9 files changed, 8 insertions(+), 7 deletions(-)
>  rename drivers/{misc => power/max8997}/pmic_max8997.c (100%)
>  rename drivers/{misc => power/max8998}/pmic_max8998.c (100%)
>  rename drivers/{misc => power}/pmic_core.c (100%)
>  rename drivers/{misc => power}/pmic_dialog.c (100%)
>  rename drivers/{misc => power}/pmic_fsl.c (100%)
>  rename drivers/{misc => power}/pmic_i2c.c (100%)
>  rename drivers/{misc => power}/pmic_spi.c (100%)
> 
> diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
> index 271463c..cdec88b 100644
> --- a/drivers/misc/Makefile
> +++ b/drivers/misc/Makefile
> @@ -34,13 +34,6 @@ COBJS-$(CONFIG_NS87308) += ns87308.o
>  COBJS-$(CONFIG_PDSP188x) += pdsp188x.o
>  COBJS-$(CONFIG_STATUS_LED) += status_led.o
>  COBJS-$(CONFIG_TWL4030_LED) += twl4030_led.o
> -COBJS-$(CONFIG_PMIC) += pmic_core.o
> -COBJS-$(CONFIG_DIALOG_PMIC) += pmic_dialog.o
> -COBJS-$(CONFIG_PMIC_FSL) += pmic_fsl.o
> -COBJS-$(CONFIG_PMIC_I2C) += pmic_i2c.o
> -COBJS-$(CONFIG_PMIC_SPI) += pmic_spi.o
> -COBJS-$(CONFIG_PMIC_MAX8998) += pmic_max8998.o
> -COBJS-$(CONFIG_PMIC_MAX8997) += pmic_max8997.o
>  
>  COBJS	:= $(COBJS-y)
>  SRCS	:= $(COBJS:.o=.c)
> diff --git a/drivers/power/Makefile b/drivers/power/Makefile
> index 6bf388c..7016d5b 100644
> --- a/drivers/power/Makefile
> +++ b/drivers/power/Makefile
> @@ -31,6 +31,14 @@ COBJS-$(CONFIG_TWL4030_POWER)	+= twl4030.o
>  COBJS-$(CONFIG_TWL6030_POWER)	+= twl6030.o
>  COBJS-$(CONFIG_TWL6035_POWER)	+= twl6035.o
>  
> +COBJS-$(CONFIG_PMIC) += pmic_core.o
> +COBJS-$(CONFIG_DIALOG_PMIC) += pmic_dialog.o
> +COBJS-$(CONFIG_PMIC_FSL) += pmic_fsl.o
> +COBJS-$(CONFIG_PMIC_I2C) += pmic_i2c.o
> +COBJS-$(CONFIG_PMIC_SPI) += pmic_spi.o
> +COBJS-$(CONFIG_PMIC_MAX8998) += max8998/pmic_max8998.o
> +COBJS-$(CONFIG_PMIC_MAX8997) += max8997/pmic_max8997.o
> +
>  COBJS	:= $(COBJS-y)
>  SRCS 	:= $(COBJS:.o=.c)
>  OBJS 	:= $(addprefix $(obj),$(COBJS))
> diff --git a/drivers/misc/pmic_max8997.c b/drivers/power/max8997/pmic_max8997.c
> similarity index 100%
> rename from drivers/misc/pmic_max8997.c
> rename to drivers/power/max8997/pmic_max8997.c
> diff --git a/drivers/misc/pmic_max8998.c b/drivers/power/max8998/pmic_max8998.c
> similarity index 100%
> rename from drivers/misc/pmic_max8998.c
> rename to drivers/power/max8998/pmic_max8998.c
> diff --git a/drivers/misc/pmic_core.c b/drivers/power/pmic_core.c
> similarity index 100%
> rename from drivers/misc/pmic_core.c
> rename to drivers/power/pmic_core.c
> diff --git a/drivers/misc/pmic_dialog.c b/drivers/power/pmic_dialog.c
> similarity index 100%
> rename from drivers/misc/pmic_dialog.c
> rename to drivers/power/pmic_dialog.c
> diff --git a/drivers/misc/pmic_fsl.c b/drivers/power/pmic_fsl.c
> similarity index 100%
> rename from drivers/misc/pmic_fsl.c
> rename to drivers/power/pmic_fsl.c
> diff --git a/drivers/misc/pmic_i2c.c b/drivers/power/pmic_i2c.c
> similarity index 100%
> rename from drivers/misc/pmic_i2c.c
> rename to drivers/power/pmic_i2c.c
> diff --git a/drivers/misc/pmic_spi.c b/drivers/power/pmic_spi.c
> similarity index 100%
> rename from drivers/misc/pmic_spi.c
> rename to drivers/power/pmic_spi.c
> 

Fully agree.

Acked-by: Stefano Babic <sbabic@denx.de>

Best regards,
Stefano Babic
Łukasz Majewski - Oct. 9, 2012, 10:37 a.m.
Hi Stefano,

> On 05/10/2012 10:16, Lukasz Majewski wrote:
> > The PMIC framework has been moved to its more natural place
> > ./drivers/power from ./drivers/misc directory.
> > 
> > Signed-off-by: Lukasz Majewski <l.majewski@samsung.com>
> > Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
> > ---
> > Changes for v2:
> > - New patch for v2
> > ---
> >  drivers/misc/Makefile                          |    7 -------
> >  drivers/power/Makefile                         |    8 ++++++++
> >  drivers/{misc => power/max8997}/pmic_max8997.c |    0
> >  drivers/{misc => power/max8998}/pmic_max8998.c |    0
> >  drivers/{misc => power}/pmic_core.c            |    0
> >  drivers/{misc => power}/pmic_dialog.c          |    0
> >  drivers/{misc => power}/pmic_fsl.c             |    0
> >  drivers/{misc => power}/pmic_i2c.c             |    0
> >  drivers/{misc => power}/pmic_spi.c             |    0
> >  9 files changed, 8 insertions(+), 7 deletions(-)
> >  rename drivers/{misc => power/max8997}/pmic_max8997.c (100%)
> >  rename drivers/{misc => power/max8998}/pmic_max8998.c (100%)
> >  rename drivers/{misc => power}/pmic_core.c (100%)
> >  rename drivers/{misc => power}/pmic_dialog.c (100%)
> >  rename drivers/{misc => power}/pmic_fsl.c (100%)
> >  rename drivers/{misc => power}/pmic_i2c.c (100%)
> >  rename drivers/{misc => power}/pmic_spi.c (100%)
> > 
> > diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
> > index 271463c..cdec88b 100644
> > --- a/drivers/misc/Makefile
> > +++ b/drivers/misc/Makefile
> > @@ -34,13 +34,6 @@ COBJS-$(CONFIG_NS87308) += ns87308.o
> >  COBJS-$(CONFIG_PDSP188x) += pdsp188x.o
> >  COBJS-$(CONFIG_STATUS_LED) += status_led.o
> >  COBJS-$(CONFIG_TWL4030_LED) += twl4030_led.o
> > -COBJS-$(CONFIG_PMIC) += pmic_core.o
> > -COBJS-$(CONFIG_DIALOG_PMIC) += pmic_dialog.o
> > -COBJS-$(CONFIG_PMIC_FSL) += pmic_fsl.o
> > -COBJS-$(CONFIG_PMIC_I2C) += pmic_i2c.o
> > -COBJS-$(CONFIG_PMIC_SPI) += pmic_spi.o
> > -COBJS-$(CONFIG_PMIC_MAX8998) += pmic_max8998.o
> > -COBJS-$(CONFIG_PMIC_MAX8997) += pmic_max8997.o
> >  
> >  COBJS	:= $(COBJS-y)
> >  SRCS	:= $(COBJS:.o=.c)
> > diff --git a/drivers/power/Makefile b/drivers/power/Makefile
> > index 6bf388c..7016d5b 100644
> > --- a/drivers/power/Makefile
> > +++ b/drivers/power/Makefile
> > @@ -31,6 +31,14 @@ COBJS-$(CONFIG_TWL4030_POWER)	+= twl4030.o
> >  COBJS-$(CONFIG_TWL6030_POWER)	+= twl6030.o
> >  COBJS-$(CONFIG_TWL6035_POWER)	+= twl6035.o
> >  
> > +COBJS-$(CONFIG_PMIC) += pmic_core.o
> > +COBJS-$(CONFIG_DIALOG_PMIC) += pmic_dialog.o
> > +COBJS-$(CONFIG_PMIC_FSL) += pmic_fsl.o
> > +COBJS-$(CONFIG_PMIC_I2C) += pmic_i2c.o
> > +COBJS-$(CONFIG_PMIC_SPI) += pmic_spi.o
> > +COBJS-$(CONFIG_PMIC_MAX8998) += max8998/pmic_max8998.o
> > +COBJS-$(CONFIG_PMIC_MAX8997) += max8997/pmic_max8997.o
> > +
> >  COBJS	:= $(COBJS-y)
> >  SRCS 	:= $(COBJS:.o=.c)
> >  OBJS 	:= $(addprefix $(obj),$(COBJS))
> > diff --git a/drivers/misc/pmic_max8997.c
> > b/drivers/power/max8997/pmic_max8997.c similarity index 100%
> > rename from drivers/misc/pmic_max8997.c
> > rename to drivers/power/max8997/pmic_max8997.c
> > diff --git a/drivers/misc/pmic_max8998.c
> > b/drivers/power/max8998/pmic_max8998.c similarity index 100%
> > rename from drivers/misc/pmic_max8998.c
> > rename to drivers/power/max8998/pmic_max8998.c
> > diff --git a/drivers/misc/pmic_core.c b/drivers/power/pmic_core.c
> > similarity index 100%
> > rename from drivers/misc/pmic_core.c
> > rename to drivers/power/pmic_core.c
> > diff --git a/drivers/misc/pmic_dialog.c
> > b/drivers/power/pmic_dialog.c similarity index 100%
> > rename from drivers/misc/pmic_dialog.c
> > rename to drivers/power/pmic_dialog.c
> > diff --git a/drivers/misc/pmic_fsl.c b/drivers/power/pmic_fsl.c
> > similarity index 100%
> > rename from drivers/misc/pmic_fsl.c
> > rename to drivers/power/pmic_fsl.c
> > diff --git a/drivers/misc/pmic_i2c.c b/drivers/power/pmic_i2c.c
> > similarity index 100%
> > rename from drivers/misc/pmic_i2c.c
> > rename to drivers/power/pmic_i2c.c
> > diff --git a/drivers/misc/pmic_spi.c b/drivers/power/pmic_spi.c
> > similarity index 100%
> > rename from drivers/misc/pmic_spi.c
> > rename to drivers/power/pmic_spi.c
> > 
> 
> Fully agree.
> 
> Acked-by: Stefano Babic <sbabic@denx.de>

Some names haven't been changed (e.g. pmic_core.c -> power_core.c). This
is to reduce number of changes in the patch series and keep the PMIC
subsystem working.

Further rename (PMIC->POWER) will be performed when the initial
PMIC_v2.0 would be merged to mainline.

I simply want to avoid changing too many things at a time (now the
patch series counts of 21 patches).

Patch

diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index 271463c..cdec88b 100644
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -34,13 +34,6 @@  COBJS-$(CONFIG_NS87308) += ns87308.o
 COBJS-$(CONFIG_PDSP188x) += pdsp188x.o
 COBJS-$(CONFIG_STATUS_LED) += status_led.o
 COBJS-$(CONFIG_TWL4030_LED) += twl4030_led.o
-COBJS-$(CONFIG_PMIC) += pmic_core.o
-COBJS-$(CONFIG_DIALOG_PMIC) += pmic_dialog.o
-COBJS-$(CONFIG_PMIC_FSL) += pmic_fsl.o
-COBJS-$(CONFIG_PMIC_I2C) += pmic_i2c.o
-COBJS-$(CONFIG_PMIC_SPI) += pmic_spi.o
-COBJS-$(CONFIG_PMIC_MAX8998) += pmic_max8998.o
-COBJS-$(CONFIG_PMIC_MAX8997) += pmic_max8997.o
 
 COBJS	:= $(COBJS-y)
 SRCS	:= $(COBJS:.o=.c)
diff --git a/drivers/power/Makefile b/drivers/power/Makefile
index 6bf388c..7016d5b 100644
--- a/drivers/power/Makefile
+++ b/drivers/power/Makefile
@@ -31,6 +31,14 @@  COBJS-$(CONFIG_TWL4030_POWER)	+= twl4030.o
 COBJS-$(CONFIG_TWL6030_POWER)	+= twl6030.o
 COBJS-$(CONFIG_TWL6035_POWER)	+= twl6035.o
 
+COBJS-$(CONFIG_PMIC) += pmic_core.o
+COBJS-$(CONFIG_DIALOG_PMIC) += pmic_dialog.o
+COBJS-$(CONFIG_PMIC_FSL) += pmic_fsl.o
+COBJS-$(CONFIG_PMIC_I2C) += pmic_i2c.o
+COBJS-$(CONFIG_PMIC_SPI) += pmic_spi.o
+COBJS-$(CONFIG_PMIC_MAX8998) += max8998/pmic_max8998.o
+COBJS-$(CONFIG_PMIC_MAX8997) += max8997/pmic_max8997.o
+
 COBJS	:= $(COBJS-y)
 SRCS 	:= $(COBJS:.o=.c)
 OBJS 	:= $(addprefix $(obj),$(COBJS))