Re: [U-Boot] [PATCH 2/3] power: pmic_max77686: remove the old pmic_max77686 file

[Lukasz Majewski]

On Thu, 25 Jan 2018 16:06:36 +0900
Jaehoon Chung  wrote:

> max77686 pmic is supporting with max77686.c under pmic/ and regulator/
> direnctroy. Remove pmic_max77686.c what didn't use anywhere.
> Instead, enable CONFIG_DM_REGULATOR_MAX77686 and
> CONFIG_DM_PMIC_MAX77686.
> 
> Signed-off-by: Jaehoon Chung 
> ---
>  drivers/power/pmic/Makefile|   1 -
>  drivers/power/pmic/pmic_max77686.c | 304
> - 2 files changed, 305
> deletions(-) delete mode 100644 drivers/power/pmic/pmic_max77686.c
> 
> diff --git a/drivers/power/pmic/Makefile b/drivers/power/pmic/Makefile
> index 7d6c583d34..265b7cb2f6 100644
> --- a/drivers/power/pmic/Makefile
> +++ b/drivers/power/pmic/Makefile
> @@ -29,7 +29,6 @@ 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
> -obj-$(CONFIG_POWER_MAX77686) += pmic_max77686.o
>  obj-$(CONFIG_POWER_PFUZE100) += pmic_pfuze100.o
>  obj-$(CONFIG_POWER_PFUZE3000) += pmic_pfuze3000.o
>  obj-$(CONFIG_POWER_TPS65217) += pmic_tps65217.o
> diff --git a/drivers/power/pmic/pmic_max77686.c
> b/drivers/power/pmic/pmic_max77686.c deleted file mode 100644
> index 8e653316d1..00
> --- a/drivers/power/pmic/pmic_max77686.c
> +++ /dev/null
> @@ -1,304 +0,0 @@
> -/*
> - *  Copyright (C) 2012 Samsung Electronics
> - *  Rajeshwari Shinde 
> - *
> - * SPDX-License-Identifier:  GPL-2.0+
> - */
> -
> -#include 
> -#include 
> -#include 
> -#include 
> -#include 
> -#include 
> -
> -DECLARE_GLOBAL_DATA_PTR;
> -
> -static const char max77686_buck_addr[] = {
> - 0xff, 0x10, 0x12, 0x1c, 0x26, 0x30, 0x32, 0x34, 0x36, 0x38
> -};
> -
> -static unsigned int max77686_ldo_volt2hex(int ldo, ulong uV)
> -{
> - unsigned int hex = 0;
> -
> - switch (ldo) {
> - case 1:
> - case 2:
> - case 6:
> - case 7:
> - case 8:
> - case 15:
> - hex = (uV - 80) / 25000;
> - break;
> - default:
> - hex = (uV - 80) / 5;
> - }
> -
> - if (hex >= 0 && hex <= MAX77686_LDO_VOLT_MAX_HEX)
> - return hex;
> -
> - debug("%s: %ld is wrong voltage value for LDO%d\n",
> __func__, uV, ldo);
> - return 0;
> -}
> -
> -static int max77686_buck_volt2hex(int buck, ulong uV)
> -{
> - int hex = 0;
> -
> - if (buck < 5 || buck > 9) {
> - debug("%s: buck %d is not supported\n", __func__,
> buck);
> - return -EINVAL;
> - }
> -
> - hex = (uV - 75) / 5;
> -
> - if (hex >= 0 && hex <= MAX77686_BUCK_VOLT_MAX_HEX)
> - return hex;
> -
> - debug("%s: %ld is wrong voltage value for BUCK%d\n",
> -   __func__, uV, buck);
> - return -EINVAL;
> -}
> -
> -int max77686_set_ldo_voltage(struct pmic *p, int ldo, ulong uV)
> -{
> - unsigned int val, ret, hex, adr;
> -
> - if (ldo < 1 || ldo > 26) {
> - printf("%s: %d is wrong ldo number\n", __func__,
> ldo);
> - return -EINVAL;
> - }
> -
> - adr = MAX77686_REG_PMIC_LDO1CTRL1 + ldo - 1;
> - hex = max77686_ldo_volt2hex(ldo, uV);
> -
> - if (!hex)
> - return -EINVAL;
> -
> - ret = pmic_reg_read(p, adr, );
> - if (ret)
> - return ret;
> -
> - val &= ~MAX77686_LDO_VOLT_MASK;
> - val |= hex;
> - ret |= pmic_reg_write(p, adr, val);
> -
> - return ret;
> -}
> -
> -int max77686_set_buck_voltage(struct pmic *p, int buck, ulong uV)
> -{
> - unsigned int val, adr;
> - int hex, ret;
> -
> - if (buck < 5 || buck > 9) {
> - printf("%s: %d is an unsupported bucket number\n",
> -__func__, buck);
> - return -EINVAL;
> - }
> -
> - adr = max77686_buck_addr[buck] + 1;
> - hex = max77686_buck_volt2hex(buck, uV);
> -
> - if (hex < 0)
> - return hex;
> -
> - ret = pmic_reg_read(p, adr, );
> - if (ret)
> - return ret;
> -
> - val &= ~MAX77686_BUCK_VOLT_MASK;
> - ret |= pmic_reg_write(p, adr, val | hex);
> -
> - return ret;
> -}
> -
> -int max77686_set_ldo_mode(struct pmic *p, int ldo, char opmode)
> -{
> - unsigned int val, ret, adr, mode;
> -
> - if (ldo < 1 || 26 < ldo) {
> - printf("%s: %d is wrong ldo number\n", __func__,
> ldo);
> - return -EINVAL;
> - }
> -
> - adr = MAX77686_REG_PMIC_LDO1CTRL1 + ldo - 1;
> -
> - /* mode */
> - switch (opmode) {
> - case OPMODE_OFF:
> - mode = MAX77686_LDO_MODE_OFF;
> - break;
> - case OPMODE_STANDBY:
> - switch (ldo) {
> - case 2:
> - case 6:
> - case 7:
> - case 8:
> - case 10:
> - case 11:
> - case 12:
> - case 14:
> - case 15:
> - case 16:
> - 

[U-Boot] [PATCH 2/3] power: pmic_max77686: remove the old pmic_max77686 file

[Jaehoon Chung]

max77686 pmic is supporting with max77686.c under pmic/ and regulator/
direnctroy. Remove pmic_max77686.c what didn't use anywhere.
Instead, enable CONFIG_DM_REGULATOR_MAX77686 and
CONFIG_DM_PMIC_MAX77686.

Signed-off-by: Jaehoon Chung 
---
 drivers/power/pmic/Makefile|   1 -
 drivers/power/pmic/pmic_max77686.c | 304 -
 2 files changed, 305 deletions(-)
 delete mode 100644 drivers/power/pmic/pmic_max77686.c

diff --git a/drivers/power/pmic/Makefile b/drivers/power/pmic/Makefile
index 7d6c583d34..265b7cb2f6 100644
--- a/drivers/power/pmic/Makefile
+++ b/drivers/power/pmic/Makefile
@@ -29,7 +29,6 @@ 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
-obj-$(CONFIG_POWER_MAX77686) += pmic_max77686.o
 obj-$(CONFIG_POWER_PFUZE100) += pmic_pfuze100.o
 obj-$(CONFIG_POWER_PFUZE3000) += pmic_pfuze3000.o
 obj-$(CONFIG_POWER_TPS65217) += pmic_tps65217.o
diff --git a/drivers/power/pmic/pmic_max77686.c 
b/drivers/power/pmic/pmic_max77686.c
deleted file mode 100644
index 8e653316d1..00
--- a/drivers/power/pmic/pmic_max77686.c
+++ /dev/null
@@ -1,304 +0,0 @@
-/*
- *  Copyright (C) 2012 Samsung Electronics
- *  Rajeshwari Shinde 
- *
- * SPDX-License-Identifier:GPL-2.0+
- */
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-DECLARE_GLOBAL_DATA_PTR;
-
-static const char max77686_buck_addr[] = {
-   0xff, 0x10, 0x12, 0x1c, 0x26, 0x30, 0x32, 0x34, 0x36, 0x38
-};
-
-static unsigned int max77686_ldo_volt2hex(int ldo, ulong uV)
-{
-   unsigned int hex = 0;
-
-   switch (ldo) {
-   case 1:
-   case 2:
-   case 6:
-   case 7:
-   case 8:
-   case 15:
-   hex = (uV - 80) / 25000;
-   break;
-   default:
-   hex = (uV - 80) / 5;
-   }
-
-   if (hex >= 0 && hex <= MAX77686_LDO_VOLT_MAX_HEX)
-   return hex;
-
-   debug("%s: %ld is wrong voltage value for LDO%d\n", __func__, uV, ldo);
-   return 0;
-}
-
-static int max77686_buck_volt2hex(int buck, ulong uV)
-{
-   int hex = 0;
-
-   if (buck < 5 || buck > 9) {
-   debug("%s: buck %d is not supported\n", __func__, buck);
-   return -EINVAL;
-   }
-
-   hex = (uV - 75) / 5;
-
-   if (hex >= 0 && hex <= MAX77686_BUCK_VOLT_MAX_HEX)
-   return hex;
-
-   debug("%s: %ld is wrong voltage value for BUCK%d\n",
- __func__, uV, buck);
-   return -EINVAL;
-}
-
-int max77686_set_ldo_voltage(struct pmic *p, int ldo, ulong uV)
-{
-   unsigned int val, ret, hex, adr;
-
-   if (ldo < 1 || ldo > 26) {
-   printf("%s: %d is wrong ldo number\n", __func__, ldo);
-   return -EINVAL;
-   }
-
-   adr = MAX77686_REG_PMIC_LDO1CTRL1 + ldo - 1;
-   hex = max77686_ldo_volt2hex(ldo, uV);
-
-   if (!hex)
-   return -EINVAL;
-
-   ret = pmic_reg_read(p, adr, );
-   if (ret)
-   return ret;
-
-   val &= ~MAX77686_LDO_VOLT_MASK;
-   val |= hex;
-   ret |= pmic_reg_write(p, adr, val);
-
-   return ret;
-}
-
-int max77686_set_buck_voltage(struct pmic *p, int buck, ulong uV)
-{
-   unsigned int val, adr;
-   int hex, ret;
-
-   if (buck < 5 || buck > 9) {
-   printf("%s: %d is an unsupported bucket number\n",
-  __func__, buck);
-   return -EINVAL;
-   }
-
-   adr = max77686_buck_addr[buck] + 1;
-   hex = max77686_buck_volt2hex(buck, uV);
-
-   if (hex < 0)
-   return hex;
-
-   ret = pmic_reg_read(p, adr, );
-   if (ret)
-   return ret;
-
-   val &= ~MAX77686_BUCK_VOLT_MASK;
-   ret |= pmic_reg_write(p, adr, val | hex);
-
-   return ret;
-}
-
-int max77686_set_ldo_mode(struct pmic *p, int ldo, char opmode)
-{
-   unsigned int val, ret, adr, mode;
-
-   if (ldo < 1 || 26 < ldo) {
-   printf("%s: %d is wrong ldo number\n", __func__, ldo);
-   return -EINVAL;
-   }
-
-   adr = MAX77686_REG_PMIC_LDO1CTRL1 + ldo - 1;
-
-   /* mode */
-   switch (opmode) {
-   case OPMODE_OFF:
-   mode = MAX77686_LDO_MODE_OFF;
-   break;
-   case OPMODE_STANDBY:
-   switch (ldo) {
-   case 2:
-   case 6:
-   case 7:
-   case 8:
-   case 10:
-   case 11:
-   case 12:
-   case 14:
-   case 15:
-   case 16:
-   mode = MAX77686_LDO_MODE_STANDBY;
-   break;
-   default:
-   mode = 0xff;
-   }
-   break;
-   case OPMODE_LPM:
-   mode = MAX77686_LDO_MODE_LPM;
-