[PATCH 0/2] power: move power_max77696_init() to board file

[PATCH 0/2] power: move power_max77696_init() to board file

[Jaehoon Chung]

It's only one board which is using max_77696_init().
pmic_max77696.c didn't convert from no-DM to DM.
So it's waste to maintain in driver directory.

Jaehoon Chung (2):
  board: warp: add power_max77696_init() function
  power: pmic: remove pmic_max77696.c file

 board/warp/warp.c                  | 68 +++++++++++++++++++++++++++++-
 drivers/power/pmic/Makefile        |  1 -
 drivers/power/pmic/pmic_max77696.c | 31 --------------
 include/configs/warp.h             |  1 -
 include/power/max77696_pmic.h      | 59 --------------------------
 5 files changed, 67 insertions(+), 93 deletions(-)
 delete mode 100644 drivers/power/pmic/pmic_max77696.c
 delete mode 100644 include/power/max77696_pmic.h

-- 
2.29.0

[PATCH 1/2] board: warp: add power_max77696_init() function

[Jaehoon Chung]

Add power_max77696_init() function.
Since warp doesn't support DM, the keeping its code in board file is
better than maintainig the file of driver.

Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
---
 board/warp/warp.c      | 68 +++++++++++++++++++++++++++++++++++++++++-
 include/configs/warp.h |  1 -
 2 files changed, 67 insertions(+), 2 deletions(-)

diff --git a/board/warp/warp.c b/board/warp/warp.c
index 85da9c1bd435..56c07d862440 100644
--- a/board/warp/warp.c
+++ b/board/warp/warp.c
@@ -25,7 +25,6 @@
 #include <mmc.h>
 #include <usb.h>
 #include <power/pmic.h>
-#include <power/max77696_pmic.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -44,6 +43,53 @@ DECLARE_GLOBAL_DATA_PTR;
 		      PAD_CTL_DSE_40ohm | PAD_CTL_HYS |		\
 		      PAD_CTL_ODE | PAD_CTL_SRE_FAST)
 
+#define CONFIG_POWER_MAX77696_I2C_ADDR	0x3C
+
+enum {
+	L01_CNFG1 =	0x43,
+	L01_CNFG2,
+	L02_CNFG1,
+	L02_CNFG2,
+	L03_CNFG1,
+	L03_CNFG2,
+	L04_CNFG1,
+	L04_CNFG2,
+	L05_CNFG1,
+	L05_CNFG2,
+	L06_CNFG1,
+	L06_CNFG2,
+	L07_CNFG1,
+	L07_CNFG2,
+	L08_CNFG1,
+	L08_CNFG2,
+	L09_CNFG1,
+	L09_CNFG2,
+	L10_CNFG1,
+	L10_CNFG2,
+	LDO_INT1,
+	LDO_INT2,
+	LDO_INT1M,
+	LDO_INT2M,
+	LDO_CNFG3,
+	SW1_CNTRL,
+	SW2_CNTRL,
+	SW3_CNTRL,
+	SW4_CNTRL,
+	EPDCNFG,
+	EPDINTS,
+	EPDINT,
+	EPDINTM,
+	EPDVCOM,
+	EPDVEE,
+	EPDVNEG,
+	EPDVPOS,
+	EPDVDDH,
+	EPDSEQ,
+	EPDOKINTS,
+	CID =	0x9c,
+	PMIC_NUM_OF_REGS,
+};
+
 int dram_init(void)
 {
 	gd->ram_size = imx_ddr_size();
@@ -113,6 +159,26 @@ struct i2c_pads_info i2c_pad_info1 = {
 	},
 };
 
+static int power_max77696_init(unsigned char bus)
+{
+	static const char name[] = "MAX77696";
+	struct pmic *p = pmic_alloc();
+
+	if (!p) {
+		printf("%s: POWER allocation error!\n", __func__);
+		return -ENOMEM;
+	}
+
+	p->name = name;
+	p->interface = PMIC_I2C;
+	p->number_of_regs = PMIC_NUM_OF_REGS;
+	p->hw.i2c.addr = CONFIG_POWER_MAX77696_I2C_ADDR;
+	p->hw.i2c.tx_num = 1;
+	p->bus = bus;
+
+	return 0;
+}
+
 int power_init_board(void)
 {
 	struct pmic *p;
diff --git a/include/configs/warp.h b/include/configs/warp.h
index f17eea117f3a..0f97804eb29c 100644
--- a/include/configs/warp.h
+++ b/include/configs/warp.h
@@ -63,7 +63,6 @@
 /* PMIC */
 #define CONFIG_POWER
 #define CONFIG_POWER_I2C
-#define CONFIG_POWER_MAX77696
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"script=boot.scr\0" \
-- 
2.29.0

[PATCH 2/2] power: pmic: remove pmic_max77696.c file

[Jaehoon Chung]

Remove pmic_max77696.c file.
The maintaining pmic_max77696.c file is useless.

Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
---
 drivers/power/pmic/Makefile        |  1 -
 drivers/power/pmic/pmic_max77696.c | 31 ----------------
 include/power/max77696_pmic.h      | 59 ------------------------------
 3 files changed, 91 deletions(-)
 delete mode 100644 drivers/power/pmic/pmic_max77696.c
 delete mode 100644 include/power/max77696_pmic.h

diff --git a/drivers/power/pmic/Makefile b/drivers/power/pmic/Makefile
index 2b2a6ddb565a..8395009e08f7 100644
--- a/drivers/power/pmic/Makefile
+++ b/drivers/power/pmic/Makefile
@@ -30,7 +30,6 @@ obj-$(CONFIG_$(SPL_)PMIC_LP87565) += lp87565.o
 obj-$(CONFIG_PMIC_STPMIC1) += stpmic1.o
 
 obj-$(CONFIG_POWER_LTC3676) += pmic_ltc3676.o
-obj-$(CONFIG_POWER_MAX77696) += pmic_max77696.o
 obj-$(CONFIG_POWER_MAX8998) += pmic_max8998.o
 obj-$(CONFIG_POWER_MAX8997) += pmic_max8997.o
 obj-$(CONFIG_POWER_MUIC_MAX8997) += muic_max8997.o
diff --git a/drivers/power/pmic/pmic_max77696.c b/drivers/power/pmic/pmic_max77696.c
deleted file mode 100644
index f3a73d6405f8..000000000000
--- a/drivers/power/pmic/pmic_max77696.c
+++ /dev/null
@@ -1,31 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- *  Copyright (C) 2015 Freescale Semiconductor, Inc.
- *  Fabio Estevam <fabio.estevam@freescale.com>
- */
-
-#include <common.h>
-#include <errno.h>
-#include <i2c.h>
-#include <power/pmic.h>
-#include <power/max77696_pmic.h>
-
-int power_max77696_init(unsigned char bus)
-{
-	static const char name[] = "MAX77696";
-	struct pmic *p = pmic_alloc();
-
-	if (!p) {
-		printf("%s: POWER allocation error!\n", __func__);
-		return -ENOMEM;
-	}
-
-	p->name = name;
-	p->interface = PMIC_I2C;
-	p->number_of_regs = PMIC_NUM_OF_REGS;
-	p->hw.i2c.addr = CONFIG_POWER_MAX77696_I2C_ADDR;
-	p->hw.i2c.tx_num = 1;
-	p->bus = bus;
-
-	return 0;
-}
diff --git a/include/power/max77696_pmic.h b/include/power/max77696_pmic.h
deleted file mode 100644
index 69bb7da349f5..000000000000
--- a/include/power/max77696_pmic.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- *  Copyright (C) 2015 Freescale Semiconductor, Inc.
- *  Fabio Estevam <fabio.estevam@freescale.com>
- */
-
-#ifndef __MAX77696_PMIC_H__
-#define __MAX77696_PMIC_H__
-
-#define CONFIG_POWER_MAX77696_I2C_ADDR	0x3C
-
-enum {
-	L01_CNFG1 =	0x43,
-	L01_CNFG2,
-	L02_CNFG1,
-	L02_CNFG2,
-	L03_CNFG1,
-	L03_CNFG2,
-	L04_CNFG1,
-	L04_CNFG2,
-	L05_CNFG1,
-	L05_CNFG2,
-	L06_CNFG1,
-	L06_CNFG2,
-	L07_CNFG1,
-	L07_CNFG2,
-	L08_CNFG1,
-	L08_CNFG2,
-	L09_CNFG1,
-	L09_CNFG2,
-	L10_CNFG1,
-	L10_CNFG2,
-	LDO_INT1,
-	LDO_INT2,
-	LDO_INT1M,
-	LDO_INT2M,
-	LDO_CNFG3,
-	SW1_CNTRL,
-	SW2_CNTRL,
-	SW3_CNTRL,
-	SW4_CNTRL,
-	EPDCNFG,
-	EPDINTS,
-	EPDINT,
-	EPDINTM,
-	EPDVCOM,
-	EPDVEE,
-	EPDVNEG,
-	EPDVPOS,
-	EPDVDDH,
-	EPDSEQ,
-	EPDOKINTS,
-	CID =	0x9c,
-	PMIC_NUM_OF_REGS,
-};
-
-int power_max77696_init(unsigned char bus);
-
-#endif
-- 
2.29.0

[PATCH 0/2] power: move power_max77696_init() to board file

[Jaehoon Chung]

Dear Tom,

On 1/28/21 8:42 PM, Jaehoon Chung wrote:
> It's only one board which is using max_77696_init().
> pmic_max77696.c didn't convert from no-DM to DM.
> So it's waste to maintain in driver directory.

Is there any opinion? If there is no objection about this, let me know, plz.
I hope that remove file not to support DM in power and regulator.
This patch is my first step to do it.

Best Regards,
Jaehoon Chung

> 
> Jaehoon Chung (2):
>   board: warp: add power_max77696_init() function
>   power: pmic: remove pmic_max77696.c file
> 
>  board/warp/warp.c                  | 68 +++++++++++++++++++++++++++++-
>  drivers/power/pmic/Makefile        |  1 -
>  drivers/power/pmic/pmic_max77696.c | 31 --------------
>  include/configs/warp.h             |  1 -
>  include/power/max77696_pmic.h      | 59 --------------------------
>  5 files changed, 67 insertions(+), 93 deletions(-)
>  delete mode 100644 drivers/power/pmic/pmic_max77696.c
>  delete mode 100644 include/power/max77696_pmic.h
> 

[PATCH 0/2] power: move power_max77696_init() to board file

[Tom Rini]

On Wed, Mar 17, 2021 at 06:53:16AM +0900, Jaehoon Chung wrote:
> Dear Tom,
> 
> On 1/28/21 8:42 PM, Jaehoon Chung wrote:
> > It's only one board which is using max_77696_init().
> > pmic_max77696.c didn't convert from no-DM to DM.
> > So it's waste to maintain in driver directory.
> 
> Is there any opinion? If there is no objection about this, let me know, plz.
> I hope that remove file not to support DM in power and regulator.
> This patch is my first step to do it.

My concern is that I've posted patches to delete the warp platform but I
think Peter was going to pick it up and do the DM migrations?

> 
> Best Regards,
> Jaehoon Chung
> 
> > 
> > Jaehoon Chung (2):
> >   board: warp: add power_max77696_init() function
> >   power: pmic: remove pmic_max77696.c file
> > 
> >  board/warp/warp.c                  | 68 +++++++++++++++++++++++++++++-
> >  drivers/power/pmic/Makefile        |  1 -
> >  drivers/power/pmic/pmic_max77696.c | 31 --------------
> >  include/configs/warp.h             |  1 -
> >  include/power/max77696_pmic.h      | 59 --------------------------
> >  5 files changed, 67 insertions(+), 93 deletions(-)
> >  delete mode 100644 drivers/power/pmic/pmic_max77696.c
> >  delete mode 100644 include/power/max77696_pmic.h
> > 
> 

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20210316/00972fb7/attachment.sig>

[PATCH 0/2] power: move power_max77696_init() to board file

[Peter Robinson]

On Tue, Mar 16, 2021 at 10:25 PM Tom Rini <trini@konsulko.com> wrote:
>
> On Wed, Mar 17, 2021 at 06:53:16AM +0900, Jaehoon Chung wrote:
> > Dear Tom,
> >
> > On 1/28/21 8:42 PM, Jaehoon Chung wrote:
> > > It's only one board which is using max_77696_init().
> > > pmic_max77696.c didn't convert from no-DM to DM.
> > > So it's waste to maintain in driver directory.
> >
> > Is there any opinion? If there is no objection about this, let me know, plz.
> > I hope that remove file not to support DM in power and regulator.
> > This patch is my first step to do it.
>
> My concern is that I've posted patches to delete the warp platform but I
> think Peter was going to pick it up and do the DM migrations?

I'm working on some of the iMX based devices, in among dayjob, Fedora
and life stuff. Is this the warp or warp7, I'm not sure I have the
means to test the former, and possibly not the later either.

> >
> > Best Regards,
> > Jaehoon Chung
> >
> > >
> > > Jaehoon Chung (2):
> > >   board: warp: add power_max77696_init() function
> > >   power: pmic: remove pmic_max77696.c file
> > >
> > >  board/warp/warp.c                  | 68 +++++++++++++++++++++++++++++-
> > >  drivers/power/pmic/Makefile        |  1 -
> > >  drivers/power/pmic/pmic_max77696.c | 31 --------------
> > >  include/configs/warp.h             |  1 -
> > >  include/power/max77696_pmic.h      | 59 --------------------------
> > >  5 files changed, 67 insertions(+), 93 deletions(-)
> > >  delete mode 100644 drivers/power/pmic/pmic_max77696.c
> > >  delete mode 100644 include/power/max77696_pmic.h
> > >
> >
>
> --
> Tom

[PATCH 0/2] power: move power_max77696_init() to board file

[Simon Glass]

On Wed, 17 Mar 2021 at 10:52, Jaehoon Chung <jh80.chung@samsung.com> wrote:
>
> Dear Tom,
>
> On 1/28/21 8:42 PM, Jaehoon Chung wrote:
> > It's only one board which is using max_77696_init().
> > pmic_max77696.c didn't convert from no-DM to DM.
> > So it's waste to maintain in driver directory.
>
> Is there any opinion? If there is no objection about this, let me know, plz.
> I hope that remove file not to support DM in power and regulator.
> This patch is my first step to do it.

Reviewed-by: Simon Glass <sjg@chromium.org>


>
> Best Regards,
> Jaehoon Chung
>
> >
> > Jaehoon Chung (2):
> >   board: warp: add power_max77696_init() function
> >   power: pmic: remove pmic_max77696.c file
> >
> >  board/warp/warp.c                  | 68 +++++++++++++++++++++++++++++-
> >  drivers/power/pmic/Makefile        |  1 -
> >  drivers/power/pmic/pmic_max77696.c | 31 --------------
> >  include/configs/warp.h             |  1 -
> >  include/power/max77696_pmic.h      | 59 --------------------------
> >  5 files changed, 67 insertions(+), 93 deletions(-)
> >  delete mode 100644 drivers/power/pmic/pmic_max77696.c
> >  delete mode 100644 include/power/max77696_pmic.h
> >
>

[PATCH 0/2] power: move power_max77696_init() to board file

[Jaehoon Chung]

On 3/17/21 7:25 AM, Tom Rini wrote:
> On Wed, Mar 17, 2021 at 06:53:16AM +0900, Jaehoon Chung wrote:
>> Dear Tom,
>>
>> On 1/28/21 8:42 PM, Jaehoon Chung wrote:
>>> It's only one board which is using max_77696_init().
>>> pmic_max77696.c didn't convert from no-DM to DM.
>>> So it's waste to maintain in driver directory.
>>
>> Is there any opinion? If there is no objection about this, let me know, plz.
>> I hope that remove file not to support DM in power and regulator.
>> This patch is my first step to do it.
> 
> My concern is that I've posted patches to delete the warp platform but I
> think Peter was going to pick it up and do the DM migrations?

Okay, I will check about it. Thanks.

Best Regards,
Jaehoon Chung

> 
>>
>> Best Regards,
>> Jaehoon Chung
>>
>>>
>>> Jaehoon Chung (2):
>>>   board: warp: add power_max77696_init() function
>>>   power: pmic: remove pmic_max77696.c file
>>>
>>>  board/warp/warp.c                  | 68 +++++++++++++++++++++++++++++-
>>>  drivers/power/pmic/Makefile        |  1 -
>>>  drivers/power/pmic/pmic_max77696.c | 31 --------------
>>>  include/configs/warp.h             |  1 -
>>>  include/power/max77696_pmic.h      | 59 --------------------------
>>>  5 files changed, 67 insertions(+), 93 deletions(-)
>>>  delete mode 100644 drivers/power/pmic/pmic_max77696.c
>>>  delete mode 100644 include/power/max77696_pmic.h
>>>
>>
> 

[PATCH 1/2] board: warp: add power_max77696_init() function

[Tom Rini]

On Thu, Jan 28, 2021 at 08:42:33PM +0900, Jaehoon Chung wrote:

> Add power_max77696_init() function.
> Since warp doesn't support DM, the keeping its code in board file is
> better than maintainig the file of driver.
> 
> Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20210413/2f51c035/attachment.sig>

[PATCH 2/2] power: pmic: remove pmic_max77696.c file

[Tom Rini]

On Thu, Jan 28, 2021 at 08:42:34PM +0900, Jaehoon Chung wrote:

> Remove pmic_max77696.c file.
> The maintaining pmic_max77696.c file is useless.
> 
> Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20210413/6c12978a/attachment.sig>