[PATCH 0/2] power: remove non-DM max8997/8 files

[PATCH 0/2] power: remove non-DM max8997/8 files

[Jaehoon Chung]

Remove non-DM files about max8997 and max8998.
There are already max8997/8 pmic driver to support driver-model.
But i didn't remove them because there was one place to use them.

Now, it's time to remove non-DM max8997/8 files after converting to DM
in samsung/common/misc.c

Jaehoon Chung (2):
  board: samsung: covert to driver model about power_key_pressed
  power: pmic: remove pmic_max8997/8 files

 board/samsung/common/misc.c       |  27 ++++----
 drivers/power/pmic/Makefile       |   2 -
 drivers/power/pmic/pmic_max8997.c | 107 ------------------------------
 drivers/power/pmic/pmic_max8998.c |  32 ---------
 4 files changed, 14 insertions(+), 154 deletions(-)
 delete mode 100644 drivers/power/pmic/pmic_max8997.c
 delete mode 100644 drivers/power/pmic/pmic_max8998.c

-- 
2.29.0

[PATCH 1/2] board: samsung: covert to driver model about power_key_pressed

[Jaehoon Chung]

Convert to driver model about power_key_pressed.

Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
---
 board/samsung/common/misc.c | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/board/samsung/common/misc.c b/board/samsung/common/misc.c
index 837463ba78f8..c8b9ad71e49e 100644
--- a/board/samsung/common/misc.c
+++ b/board/samsung/common/misc.c
@@ -116,32 +116,33 @@ void set_board_info(void)
 #ifdef CONFIG_LCD_MENU
 static int power_key_pressed(u32 reg)
 {
-#ifndef CONFIG_DM_I2C /* TODO(maintainer): Convert to driver model */
-	struct pmic *pmic;
+	struct udevice *dev;
+	int ret;
 	u32 status;
 	u32 mask;
 
-	pmic = pmic_get(KEY_PWR_PMIC_NAME);
-	if (!pmic) {
-		printf("%s: Not found\n", KEY_PWR_PMIC_NAME);
+	if (IS_ENABLED(CONFIG_TARGET_TRATS))
+		ret = pmic_get("max8997-pmic", &dev);
+	else if (IS_ENABLED(CONFIG_TARGET_TRATS2))
+		ret = pmic_get("max77686-pmic", &dev);
+	else if (IS_ENABLED(CONFIG_TARGET_S5PC210_UNIVERSAL))
+		ret = pmic_get("max8998-pmic", &dev);
+	else
 		return 0;
-	}
 
-	if (pmic_probe(pmic))
-		return 0;
+	if (ret)
+		return ret;
 
 	if (reg == KEY_PWR_STATUS_REG)
 		mask = KEY_PWR_STATUS_MASK;
 	else
 		mask = KEY_PWR_INTERRUPT_MASK;
 
-	if (pmic_reg_read(pmic, reg, &status))
-		return 0;
+	status = pmic_reg_read(dev, reg);
+	if (status < 0)
+		return status;
 
 	return !!(status & mask);
-#else
-	return 0;
-#endif
 }
 
 static int key_pressed(int key)
-- 
2.29.0

[PATCH 2/2] power: pmic: remove pmic_max8997/8 files

[Jaehoon Chung]

Remove pmic_max8997/8 files about no-DM.
There are already existed max8997/8 as driver-model.

Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
---
 drivers/power/pmic/Makefile       |   2 -
 drivers/power/pmic/pmic_max8997.c | 107 ------------------------------
 drivers/power/pmic/pmic_max8998.c |  32 ---------
 3 files changed, 141 deletions(-)
 delete mode 100644 drivers/power/pmic/pmic_max8997.c
 delete mode 100644 drivers/power/pmic/pmic_max8998.c

diff --git a/drivers/power/pmic/Makefile b/drivers/power/pmic/Makefile
index 8395009e08f7..89099fde5738 100644
--- a/drivers/power/pmic/Makefile
+++ b/drivers/power/pmic/Makefile
@@ -30,8 +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_MAX8998) += pmic_max8998.o
-obj-$(CONFIG_POWER_MAX8997) += pmic_max8997.o
 obj-$(CONFIG_POWER_MUIC_MAX8997) += muic_max8997.o
 obj-$(CONFIG_POWER_PCA9450) += pmic_pca9450.o
 obj-$(CONFIG_POWER_PFUZE100) += pmic_pfuze100.o
diff --git a/drivers/power/pmic/pmic_max8997.c b/drivers/power/pmic/pmic_max8997.c
deleted file mode 100644
index 1d834ff71304..000000000000
--- a/drivers/power/pmic/pmic_max8997.c
+++ /dev/null
@@ -1,107 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- *  Copyright (C) 2012 Samsung Electronics
- *  Lukasz Majewski <l.majewski@samsung.com>
- */
-
-#include <common.h>
-#include <log.h>
-#include <power/pmic.h>
-#include <power/max8997_pmic.h>
-#include <i2c.h>
-#include <errno.h>
-
-unsigned char max8997_reg_ldo(int uV)
-{
-	unsigned char ret;
-	if (uV <= 800000)
-		return 0;
-	if (uV >= 3950000)
-		return MAX8997_LDO_MAX_VAL;
-	ret = (uV - 800000) / 50000;
-	if (ret > MAX8997_LDO_MAX_VAL) {
-		printf("MAX8997 LDO SETTING ERROR (%duV) -> %u\n", uV, ret);
-		ret = MAX8997_LDO_MAX_VAL;
-	}
-
-	return ret;
-}
-
-static int pmic_charger_state(struct pmic *p, int state, int current)
-{
-	unsigned char fc;
-	u32 val = 0;
-
-	if (pmic_probe(p))
-		return -ENODEV;
-
-	if (state == PMIC_CHARGER_DISABLE) {
-		puts("Disable the charger.\n");
-		pmic_reg_read(p, MAX8997_REG_MBCCTRL2, &val);
-		val &= ~(MBCHOSTEN | VCHGR_FC);
-		pmic_reg_write(p, MAX8997_REG_MBCCTRL2, val);
-
-		return -ENOTSUPP;
-	}
-
-	if (current < CHARGER_MIN_CURRENT || current > CHARGER_MAX_CURRENT) {
-		printf("%s: Wrong charge current: %d [mA]\n",
-		       __func__, current);
-		return -EINVAL;
-	}
-
-	fc = (current - CHARGER_MIN_CURRENT) / CHARGER_CURRENT_RESOLUTION;
-	fc = fc & 0xf; /* up to 950 mA */
-
-	printf("Enable the charger @ %d [mA]\n", fc * CHARGER_CURRENT_RESOLUTION
-	       + CHARGER_MIN_CURRENT);
-
-	val = fc | MBCICHFCSET;
-	pmic_reg_write(p, MAX8997_REG_MBCCTRL4, val);
-
-	pmic_reg_read(p, MAX8997_REG_MBCCTRL2, &val);
-	val = MBCHOSTEN | VCHGR_FC; /* enable charger & fast charge */
-	pmic_reg_write(p, MAX8997_REG_MBCCTRL2, val);
-
-	return 0;
-}
-
-static int pmic_charger_bat_present(struct pmic *p)
-{
-	u32 val;
-
-	if (pmic_probe(p))
-		return -ENODEV;
-
-	pmic_reg_read(p, MAX8997_REG_STATUS4, &val);
-
-	return !(val & DETBAT);
-}
-
-static struct power_chrg power_chrg_pmic_ops = {
-	.chrg_bat_present = pmic_charger_bat_present,
-	.chrg_state = pmic_charger_state,
-};
-
-int pmic_init(unsigned char bus)
-{
-	static const char name[] = "MAX8997_PMIC";
-	struct pmic *p = pmic_alloc();
-
-	if (!p) {
-		printf("%s: POWER allocation error!\n", __func__);
-		return -ENOMEM;
-	}
-
-	debug("Board PMIC init\n");
-
-	p->name = name;
-	p->interface = PMIC_I2C;
-	p->number_of_regs = PMIC_NUM_OF_REGS;
-	p->hw.i2c.addr = MAX8997_I2C_ADDR;
-	p->hw.i2c.tx_num = 1;
-	p->bus = bus;
-
-	p->chrg = &power_chrg_pmic_ops;
-	return 0;
-}
diff --git a/drivers/power/pmic/pmic_max8998.c b/drivers/power/pmic/pmic_max8998.c
deleted file mode 100644
index f058238c9217..000000000000
--- a/drivers/power/pmic/pmic_max8998.c
+++ /dev/null
@@ -1,32 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- *  Copyright (C) 2011 Samsung Electronics
- *  Lukasz Majewski <l.majewski@samsung.com>
- */
-
-#include <common.h>
-#include <power/pmic.h>
-#include <power/max8998_pmic.h>
-#include <errno.h>
-
-int pmic_init(unsigned char bus)
-{
-	static const char name[] = "MAX8998_PMIC";
-	struct pmic *p = pmic_alloc();
-
-	if (!p) {
-		printf("%s: POWER allocation error!\n", __func__);
-		return -ENOMEM;
-	}
-
-	puts("Board PMIC init\n");
-
-	p->name = name;
-	p->interface = PMIC_I2C;
-	p->number_of_regs = PMIC_NUM_OF_REGS;
-	p->hw.i2c.addr = MAX8998_I2C_ADDR;
-	p->hw.i2c.tx_num = 1;
-	p->bus = bus;
-
-	return 0;
-}
-- 
2.29.0

[PATCH 1/2] board: samsung: covert to driver model about power_key_pressed

[Simon Glass]

On Thu, 28 Jan 2021 at 15:11, Jaehoon Chung <jh80.chung@samsung.com> wrote:
>
> Convert to driver model about power_key_pressed.
>
> Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
> ---
>  board/samsung/common/misc.c | 27 ++++++++++++++-------------
>  1 file changed, 14 insertions(+), 13 deletions(-)
>

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

[PATCH 2/2] power: pmic: remove pmic_max8997/8 files

[Simon Glass]

On Thu, 28 Jan 2021 at 15:11, Jaehoon Chung <jh80.chung@samsung.com> wrote:
>
> Remove pmic_max8997/8 files about no-DM.
> There are already existed max8997/8 as driver-model.
>
> Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
> ---
>  drivers/power/pmic/Makefile       |   2 -
>  drivers/power/pmic/pmic_max8997.c | 107 ------------------------------
>  drivers/power/pmic/pmic_max8998.c |  32 ---------
>  3 files changed, 141 deletions(-)
>  delete mode 100644 drivers/power/pmic/pmic_max8997.c
>  delete mode 100644 drivers/power/pmic/pmic_max8998.c

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