power: stpmu1: rename files to stpmic1
authorPatrick Delaunay <patrick.delaunay@st.com>
Mon, 4 Feb 2019 10:26:16 +0000 (11:26 +0100)
committerPatrick Delaunay <patrick.delaunay@st.com>
Fri, 12 Apr 2019 14:09:13 +0000 (16:09 +0200)
Prepare file modification for kernel alignment and
rename driver to stpmic1.

Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
Reviewed-by: Lukasz Majewski <lukma@denx.de>
13 files changed:
arch/arm/dts/stm32mp157c-ed1.dts
board/st/stm32mp1/board.c
board/st/stm32mp1/spl.c
drivers/power/pmic/Makefile
drivers/power/pmic/stpmic1.c [new file with mode: 0644]
drivers/power/pmic/stpmu1.c [deleted file]
drivers/power/regulator/Makefile
drivers/power/regulator/stpmic1.c [new file with mode: 0644]
drivers/power/regulator/stpmu1.c [deleted file]
include/dt-bindings/mfd/st,stpmic1.h [new file with mode: 0644]
include/dt-bindings/mfd/st,stpmu1.h [deleted file]
include/power/stpmic1.h [new file with mode: 0644]
include/power/stpmu1.h [deleted file]

index 7a9b742d364ff0b7bc146efd5f18f74ede97f1d5..ddee286ab17d4b3fb96cdf3d316710be91fa01ab 100644 (file)
@@ -8,7 +8,7 @@
 #include "stm32mp157c.dtsi"
 #include "stm32mp157-pinctrl.dtsi"
 #include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/mfd/st,stpmu1.h>
+#include <dt-bindings/mfd/st,stpmic1.h>
 
 / {
        model = "STMicroelectronics STM32MP157C eval daughter";
index 5f31ea99f597d0ac0b02ce665250aafd066295ed..1bb97792c91686c66d6184b8997331504658a68f 100644 (file)
@@ -8,7 +8,7 @@
 #include <asm/io.h>
 #include <asm/arch/ddr.h>
 #include <power/pmic.h>
-#include <power/stpmu1.h>
+#include <power/stpmic1.h>
 
 #ifdef CONFIG_DEBUG_UART_BOARD_INIT
 void board_debug_uart_init(void)
index f3db0d638539c8316037784fd6f765c8a356cbcb..1202297d2ed56be417711979834f6a5937d7ab81 100644 (file)
@@ -11,7 +11,7 @@
 #include <asm/io.h>
 #include <post.h>
 #include <power/pmic.h>
-#include <power/stpmu1.h>
+#include <power/stpmic1.h>
 #include <asm/arch/ddr.h>
 
 void spl_board_init(void)
index 637352ab2b7297dab91c9137d8ecfecdff031125..147ac76366df58cbab3a8d1baacb545be79a278b 100644 (file)
@@ -23,7 +23,7 @@ obj-$(CONFIG_DM_PMIC_TPS65910) += pmic_tps65910_dm.o
 obj-$(CONFIG_$(SPL_)PMIC_PALMAS) += palmas.o
 obj-$(CONFIG_$(SPL_)PMIC_LP873X) += lp873x.o
 obj-$(CONFIG_$(SPL_)PMIC_LP87565) += lp87565.o
-obj-$(CONFIG_PMIC_STPMU1) += stpmu1.o
+obj-$(CONFIG_PMIC_STPMU1) += stpmic1.o
 
 obj-$(CONFIG_POWER_LTC3676) += pmic_ltc3676.o
 obj-$(CONFIG_POWER_MAX77696) += pmic_max77696.o
diff --git a/drivers/power/pmic/stpmic1.c b/drivers/power/pmic/stpmic1.c
new file mode 100644 (file)
index 0000000..157ce8b
--- /dev/null
@@ -0,0 +1,95 @@
+// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause
+/*
+ * Copyright (C) 2018, STMicroelectronics - All Rights Reserved
+ */
+
+#include <common.h>
+#include <dm.h>
+#include <errno.h>
+#include <i2c.h>
+#include <power/pmic.h>
+#include <power/stpmic1.h>
+
+#define STMPU1_NUM_OF_REGS 0x100
+
+#ifndef CONFIG_SPL_BUILD
+static const struct pmic_child_info stpmu1_children_info[] = {
+       { .prefix = "ldo", .driver = "stpmu1_ldo" },
+       { .prefix = "buck", .driver = "stpmu1_buck" },
+       { .prefix = "vref_ddr", .driver = "stpmu1_vref_ddr" },
+       { .prefix = "pwr_sw", .driver = "stpmu1_pwr_sw" },
+       { .prefix = "boost", .driver = "stpmu1_boost" },
+       { },
+};
+#endif /* CONFIG_SPL_BUILD */
+
+static int stpmu1_reg_count(struct udevice *dev)
+{
+       return STMPU1_NUM_OF_REGS;
+}
+
+static int stpmu1_write(struct udevice *dev, uint reg, const uint8_t *buff,
+                       int len)
+{
+       int ret;
+
+       ret = dm_i2c_write(dev, reg, buff, len);
+       if (ret)
+               dev_err(dev, "%s: failed to write register %#x :%d",
+                       __func__, reg, ret);
+
+       return ret;
+}
+
+static int stpmu1_read(struct udevice *dev, uint reg, uint8_t *buff, int len)
+{
+       int ret;
+
+       ret = dm_i2c_read(dev, reg, buff, len);
+       if (ret)
+               dev_err(dev, "%s: failed to read register %#x : %d",
+                       __func__, reg, ret);
+
+       return ret;
+}
+
+static int stpmu1_bind(struct udevice *dev)
+{
+#ifndef CONFIG_SPL_BUILD
+       ofnode regulators_node;
+       int children;
+
+       regulators_node = dev_read_subnode(dev, "regulators");
+       if (!ofnode_valid(regulators_node)) {
+               dev_dbg(dev, "regulators subnode not found!\n");
+               return -ENXIO;
+       }
+       dev_dbg(dev, "found regulators subnode\n");
+
+       children = pmic_bind_children(dev, regulators_node,
+                                     stpmu1_children_info);
+       if (!children)
+               dev_dbg(dev, "no child found\n");
+#endif /* CONFIG_SPL_BUILD */
+
+       return 0;
+}
+
+static struct dm_pmic_ops stpmu1_ops = {
+       .reg_count = stpmu1_reg_count,
+       .read = stpmu1_read,
+       .write = stpmu1_write,
+};
+
+static const struct udevice_id stpmu1_ids[] = {
+       { .compatible = "st,stpmu1" },
+       { }
+};
+
+U_BOOT_DRIVER(pmic_stpmu1) = {
+       .name = "stpmu1_pmic",
+       .id = UCLASS_PMIC,
+       .of_match = stpmu1_ids,
+       .bind = stpmu1_bind,
+       .ops = &stpmu1_ops,
+};
diff --git a/drivers/power/pmic/stpmu1.c b/drivers/power/pmic/stpmu1.c
deleted file mode 100644 (file)
index 47af012..0000000
+++ /dev/null
@@ -1,95 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause
-/*
- * Copyright (C) 2018, STMicroelectronics - All Rights Reserved
- */
-
-#include <common.h>
-#include <dm.h>
-#include <errno.h>
-#include <i2c.h>
-#include <power/pmic.h>
-#include <power/stpmu1.h>
-
-#define STMPU1_NUM_OF_REGS 0x100
-
-#ifndef CONFIG_SPL_BUILD
-static const struct pmic_child_info stpmu1_children_info[] = {
-       { .prefix = "ldo", .driver = "stpmu1_ldo" },
-       { .prefix = "buck", .driver = "stpmu1_buck" },
-       { .prefix = "vref_ddr", .driver = "stpmu1_vref_ddr" },
-       { .prefix = "pwr_sw", .driver = "stpmu1_pwr_sw" },
-       { .prefix = "boost", .driver = "stpmu1_boost" },
-       { },
-};
-#endif /* CONFIG_SPL_BUILD */
-
-static int stpmu1_reg_count(struct udevice *dev)
-{
-       return STMPU1_NUM_OF_REGS;
-}
-
-static int stpmu1_write(struct udevice *dev, uint reg, const uint8_t *buff,
-                       int len)
-{
-       int ret;
-
-       ret = dm_i2c_write(dev, reg, buff, len);
-       if (ret)
-               dev_err(dev, "%s: failed to write register %#x :%d",
-                       __func__, reg, ret);
-
-       return ret;
-}
-
-static int stpmu1_read(struct udevice *dev, uint reg, uint8_t *buff, int len)
-{
-       int ret;
-
-       ret = dm_i2c_read(dev, reg, buff, len);
-       if (ret)
-               dev_err(dev, "%s: failed to read register %#x : %d",
-                       __func__, reg, ret);
-
-       return ret;
-}
-
-static int stpmu1_bind(struct udevice *dev)
-{
-#ifndef CONFIG_SPL_BUILD
-       ofnode regulators_node;
-       int children;
-
-       regulators_node = dev_read_subnode(dev, "regulators");
-       if (!ofnode_valid(regulators_node)) {
-               dev_dbg(dev, "regulators subnode not found!\n");
-               return -ENXIO;
-       }
-       dev_dbg(dev, "found regulators subnode\n");
-
-       children = pmic_bind_children(dev, regulators_node,
-                                     stpmu1_children_info);
-       if (!children)
-               dev_dbg(dev, "no child found\n");
-#endif /* CONFIG_SPL_BUILD */
-
-       return 0;
-}
-
-static struct dm_pmic_ops stpmu1_ops = {
-       .reg_count = stpmu1_reg_count,
-       .read = stpmu1_read,
-       .write = stpmu1_write,
-};
-
-static const struct udevice_id stpmu1_ids[] = {
-       { .compatible = "st,stpmu1" },
-       { }
-};
-
-U_BOOT_DRIVER(pmic_stpmu1) = {
-       .name = "stpmu1_pmic",
-       .id = UCLASS_PMIC,
-       .of_match = stpmu1_ids,
-       .bind = stpmu1_bind,
-       .ops = &stpmu1_ops,
-};
index f617ce723a96a16a40db35cb88185981ce57b206..cfc91e83a12e14f8d74e766ef040e46cca212b2a 100644 (file)
@@ -24,4 +24,4 @@ obj-$(CONFIG_$(SPL_)DM_REGULATOR_LP873X) += lp873x_regulator.o
 obj-$(CONFIG_$(SPL_)DM_REGULATOR_LP87565) += lp87565_regulator.o
 obj-$(CONFIG_$(SPL_)DM_REGULATOR_STM32_VREFBUF) += stm32-vrefbuf.o
 obj-$(CONFIG_DM_REGULATOR_TPS65910) += tps65910_regulator.o
-obj-$(CONFIG_$(SPL_)DM_REGULATOR_STPMU1) += stpmu1.o
+obj-$(CONFIG_$(SPL_)DM_REGULATOR_STPMU1) += stpmic1.o
diff --git a/drivers/power/regulator/stpmic1.c b/drivers/power/regulator/stpmic1.c
new file mode 100644 (file)
index 0000000..c62a19a
--- /dev/null
@@ -0,0 +1,672 @@
+// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause
+/*
+ * Copyright (C) 2018, STMicroelectronics - All Rights Reserved
+ * Author: Christophe Kerello <christophe.kerello@st.com>
+ */
+
+#include <common.h>
+#include <dm.h>
+#include <errno.h>
+#include <power/pmic.h>
+#include <power/regulator.h>
+#include <power/stpmic1.h>
+
+struct stpmu1_range {
+       int min_uv;
+       int min_sel;
+       int max_sel;
+       int step;
+};
+
+struct stpmu1_output_range {
+       const struct stpmu1_range *ranges;
+       int nbranges;
+};
+
+#define STPMU1_MODE(_id, _val, _name) { \
+       .id = _id,                      \
+       .register_value = _val,         \
+       .name = _name,                  \
+}
+
+#define STPMU1_RANGE(_min_uv, _min_sel, _max_sel, _step) { \
+       .min_uv = _min_uv,              \
+       .min_sel = _min_sel,            \
+       .max_sel = _max_sel,            \
+       .step = _step,                  \
+}
+
+#define STPMU1_OUTPUT_RANGE(_ranges, _nbranges) { \
+       .ranges = _ranges,              \
+       .nbranges = _nbranges,          \
+}
+
+static int stpmu1_output_find_uv(int sel,
+                                const struct stpmu1_output_range *output_range)
+{
+       const struct stpmu1_range *range;
+       int i;
+
+       for (i = 0, range = output_range->ranges;
+            i < output_range->nbranges; i++, range++) {
+               if (sel >= range->min_sel && sel <= range->max_sel)
+                       return range->min_uv +
+                              (sel - range->min_sel) * range->step;
+       }
+
+       return -EINVAL;
+}
+
+static int stpmu1_output_find_sel(int uv,
+                                 const struct stpmu1_output_range *output_range)
+{
+       const struct stpmu1_range *range;
+       int i;
+
+       for (i = 0, range = output_range->ranges;
+            i < output_range->nbranges; i++, range++) {
+               if (uv == range->min_uv && !range->step)
+                       return range->min_sel;
+
+               if (uv >= range->min_uv &&
+                   uv <= range->min_uv +
+                         (range->max_sel - range->min_sel) * range->step)
+                       return range->min_sel +
+                              (uv - range->min_uv) / range->step;
+       }
+
+       return -EINVAL;
+}
+
+/*
+ * BUCK regulators
+ */
+
+static const struct stpmu1_range buck1_ranges[] = {
+       STPMU1_RANGE(725000, 0, 4, 0),
+       STPMU1_RANGE(725000, 5, 36, 25000),
+       STPMU1_RANGE(1500000, 37, 63, 0),
+};
+
+static const struct stpmu1_range buck2_ranges[] = {
+       STPMU1_RANGE(1000000, 0, 17, 0),
+       STPMU1_RANGE(1050000, 18, 19, 0),
+       STPMU1_RANGE(1100000, 20, 21, 0),
+       STPMU1_RANGE(1150000, 22, 23, 0),
+       STPMU1_RANGE(1200000, 24, 25, 0),
+       STPMU1_RANGE(1250000, 26, 27, 0),
+       STPMU1_RANGE(1300000, 28, 29, 0),
+       STPMU1_RANGE(1350000, 30, 31, 0),
+       STPMU1_RANGE(1400000, 32, 33, 0),
+       STPMU1_RANGE(1450000, 34, 35, 0),
+       STPMU1_RANGE(1500000, 36, 63, 0),
+};
+
+static const struct stpmu1_range buck3_ranges[] = {
+       STPMU1_RANGE(1000000, 0, 19, 0),
+       STPMU1_RANGE(1100000, 20, 23, 0),
+       STPMU1_RANGE(1200000, 24, 27, 0),
+       STPMU1_RANGE(1300000, 28, 31, 0),
+       STPMU1_RANGE(1400000, 32, 35, 0),
+       STPMU1_RANGE(1500000, 36, 55, 100000),
+       STPMU1_RANGE(3400000, 56, 63, 0),
+};
+
+static const struct stpmu1_range buck4_ranges[] = {
+       STPMU1_RANGE(600000, 0, 27, 25000),
+       STPMU1_RANGE(1300000, 28, 29, 0),
+       STPMU1_RANGE(1350000, 30, 31, 0),
+       STPMU1_RANGE(1400000, 32, 33, 0),
+       STPMU1_RANGE(1450000, 34, 35, 0),
+       STPMU1_RANGE(1500000, 36, 60, 100000),
+       STPMU1_RANGE(3900000, 61, 63, 0),
+};
+
+/* BUCK: 1,2,3,4 - voltage ranges */
+static const struct stpmu1_output_range buck_voltage_range[] = {
+       STPMU1_OUTPUT_RANGE(buck1_ranges, ARRAY_SIZE(buck1_ranges)),
+       STPMU1_OUTPUT_RANGE(buck2_ranges, ARRAY_SIZE(buck2_ranges)),
+       STPMU1_OUTPUT_RANGE(buck3_ranges, ARRAY_SIZE(buck3_ranges)),
+       STPMU1_OUTPUT_RANGE(buck4_ranges, ARRAY_SIZE(buck4_ranges)),
+};
+
+/* BUCK modes */
+static const struct dm_regulator_mode buck_modes[] = {
+       STPMU1_MODE(STPMU1_BUCK_MODE_HP, STPMU1_BUCK_MODE_HP, "HP"),
+       STPMU1_MODE(STPMU1_BUCK_MODE_LP, STPMU1_BUCK_MODE_LP, "LP"),
+};
+
+static int stpmu1_buck_get_uv(struct udevice *dev, int buck)
+{
+       int sel;
+
+       sel = pmic_reg_read(dev, STPMU1_BUCKX_CTRL_REG(buck));
+       if (sel < 0)
+               return sel;
+
+       sel &= STPMU1_BUCK_OUTPUT_MASK;
+       sel >>= STPMU1_BUCK_OUTPUT_SHIFT;
+
+       return stpmu1_output_find_uv(sel, &buck_voltage_range[buck]);
+}
+
+static int stpmu1_buck_get_value(struct udevice *dev)
+{
+       return stpmu1_buck_get_uv(dev->parent, dev->driver_data - 1);
+}
+
+static int stpmu1_buck_set_value(struct udevice *dev, int uv)
+{
+       int sel, buck = dev->driver_data - 1;
+
+       sel = stpmu1_output_find_sel(uv, &buck_voltage_range[buck]);
+       if (sel < 0)
+               return sel;
+
+       return pmic_clrsetbits(dev->parent,
+                              STPMU1_BUCKX_CTRL_REG(buck),
+                              STPMU1_BUCK_OUTPUT_MASK,
+                              sel << STPMU1_BUCK_OUTPUT_SHIFT);
+}
+
+static int stpmu1_buck_get_enable(struct udevice *dev)
+{
+       int ret;
+
+       ret = pmic_reg_read(dev->parent,
+                           STPMU1_BUCKX_CTRL_REG(dev->driver_data - 1));
+       if (ret < 0)
+               return false;
+
+       return ret & STPMU1_BUCK_EN ? true : false;
+}
+
+static int stpmu1_buck_set_enable(struct udevice *dev, bool enable)
+{
+       struct dm_regulator_uclass_platdata *uc_pdata;
+       int delay = enable ? STPMU1_DEFAULT_START_UP_DELAY_MS :
+                            STPMU1_DEFAULT_STOP_DELAY_MS;
+       int ret, uv;
+
+       /* if regulator is already in the wanted state, nothing to do */
+       if (stpmu1_buck_get_enable(dev) == enable)
+               return 0;
+
+       if (enable) {
+               uc_pdata = dev_get_uclass_platdata(dev);
+               uv = stpmu1_buck_get_value(dev);
+               if ((uv < uc_pdata->min_uV) || (uv > uc_pdata->max_uV))
+                       stpmu1_buck_set_value(dev, uc_pdata->min_uV);
+       }
+
+       ret = pmic_clrsetbits(dev->parent,
+                             STPMU1_BUCKX_CTRL_REG(dev->driver_data - 1),
+                             STPMU1_BUCK_EN, enable ? STPMU1_BUCK_EN : 0);
+       mdelay(delay);
+
+       return ret;
+}
+
+static int stpmu1_buck_get_mode(struct udevice *dev)
+{
+       int ret;
+
+       ret = pmic_reg_read(dev->parent,
+                           STPMU1_BUCKX_CTRL_REG(dev->driver_data - 1));
+       if (ret < 0)
+               return ret;
+
+       return ret & STPMU1_BUCK_MODE ? STPMU1_BUCK_MODE_LP :
+                                        STPMU1_BUCK_MODE_HP;
+}
+
+static int stpmu1_buck_set_mode(struct udevice *dev, int mode)
+{
+       return pmic_clrsetbits(dev->parent,
+                              STPMU1_BUCKX_CTRL_REG(dev->driver_data - 1),
+                              STPMU1_BUCK_MODE,
+                              mode ? STPMU1_BUCK_MODE : 0);
+}
+
+static int stpmu1_buck_probe(struct udevice *dev)
+{
+       struct dm_regulator_uclass_platdata *uc_pdata;
+
+       if (!dev->driver_data || dev->driver_data > STPMU1_MAX_BUCK)
+               return -EINVAL;
+
+       uc_pdata = dev_get_uclass_platdata(dev);
+
+       uc_pdata->type = REGULATOR_TYPE_BUCK;
+       uc_pdata->mode = (struct dm_regulator_mode *)buck_modes;
+       uc_pdata->mode_count = ARRAY_SIZE(buck_modes);
+
+       return 0;
+}
+
+static const struct dm_regulator_ops stpmu1_buck_ops = {
+       .get_value  = stpmu1_buck_get_value,
+       .set_value  = stpmu1_buck_set_value,
+       .get_enable = stpmu1_buck_get_enable,
+       .set_enable = stpmu1_buck_set_enable,
+       .get_mode   = stpmu1_buck_get_mode,
+       .set_mode   = stpmu1_buck_set_mode,
+};
+
+U_BOOT_DRIVER(stpmu1_buck) = {
+       .name = "stpmu1_buck",
+       .id = UCLASS_REGULATOR,
+       .ops = &stpmu1_buck_ops,
+       .probe = stpmu1_buck_probe,
+};
+
+/*
+ * LDO regulators
+ */
+
+static const struct stpmu1_range ldo12_ranges[] = {
+       STPMU1_RANGE(1700000, 0, 7, 0),
+       STPMU1_RANGE(1700000, 8, 24, 100000),
+       STPMU1_RANGE(3300000, 25, 31, 0),
+};
+
+static const struct stpmu1_range ldo3_ranges[] = {
+       STPMU1_RANGE(1700000, 0, 7, 0),
+       STPMU1_RANGE(1700000, 8, 24, 100000),
+       STPMU1_RANGE(3300000, 25, 30, 0),
+       /* Sel 31 is special case when LDO3 is in mode sync_source (BUCK2/2) */
+};
+
+static const struct stpmu1_range ldo5_ranges[] = {
+       STPMU1_RANGE(1700000, 0, 7, 0),
+       STPMU1_RANGE(1700000, 8, 30, 100000),
+       STPMU1_RANGE(3900000, 31, 31, 0),
+};
+
+static const struct stpmu1_range ldo6_ranges[] = {
+       STPMU1_RANGE(900000, 0, 24, 100000),
+       STPMU1_RANGE(3300000, 25, 31, 0),
+};
+
+/* LDO: 1,2,3,4,5,6 - voltage ranges */
+static const struct stpmu1_output_range ldo_voltage_range[] = {
+       STPMU1_OUTPUT_RANGE(ldo12_ranges, ARRAY_SIZE(ldo12_ranges)),
+       STPMU1_OUTPUT_RANGE(ldo12_ranges, ARRAY_SIZE(ldo12_ranges)),
+       STPMU1_OUTPUT_RANGE(ldo3_ranges, ARRAY_SIZE(ldo3_ranges)),
+       STPMU1_OUTPUT_RANGE(NULL, 0),
+       STPMU1_OUTPUT_RANGE(ldo5_ranges, ARRAY_SIZE(ldo5_ranges)),
+       STPMU1_OUTPUT_RANGE(ldo6_ranges, ARRAY_SIZE(ldo6_ranges)),
+};
+
+/* LDO modes */
+static const struct dm_regulator_mode ldo_modes[] = {
+       STPMU1_MODE(STPMU1_LDO_MODE_NORMAL,
+                   STPMU1_LDO_MODE_NORMAL, "NORMAL"),
+       STPMU1_MODE(STPMU1_LDO_MODE_BYPASS,
+                   STPMU1_LDO_MODE_BYPASS, "BYPASS"),
+       STPMU1_MODE(STPMU1_LDO_MODE_SINK_SOURCE,
+                   STPMU1_LDO_MODE_SINK_SOURCE, "SINK SOURCE"),
+};
+
+static int stpmu1_ldo_get_value(struct udevice *dev)
+{
+       int sel, ldo = dev->driver_data - 1;
+
+       sel = pmic_reg_read(dev->parent, STPMU1_LDOX_CTRL_REG(ldo));
+       if (sel < 0)
+               return sel;
+
+       /* ldo4 => 3,3V */
+       if (ldo == STPMU1_LDO4)
+               return STPMU1_LDO4_UV;
+
+       sel &= STPMU1_LDO12356_OUTPUT_MASK;
+       sel >>= STPMU1_LDO12356_OUTPUT_SHIFT;
+
+       /* ldo3, sel = 31 => BUCK2/2 */
+       if (ldo == STPMU1_LDO3 && sel == STPMU1_LDO3_DDR_SEL)
+               return stpmu1_buck_get_uv(dev->parent, STPMU1_BUCK2) / 2;
+
+       return stpmu1_output_find_uv(sel, &ldo_voltage_range[ldo]);
+}
+
+static int stpmu1_ldo_set_value(struct udevice *dev, int uv)
+{
+       int sel, ldo = dev->driver_data - 1;
+
+       /* ldo4 => not possible */
+       if (ldo == STPMU1_LDO4)
+               return -EINVAL;
+
+       sel = stpmu1_output_find_sel(uv, &ldo_voltage_range[ldo]);
+       if (sel < 0)
+               return sel;
+
+       return pmic_clrsetbits(dev->parent,
+                              STPMU1_LDOX_CTRL_REG(ldo),
+                              STPMU1_LDO12356_OUTPUT_MASK,
+                              sel << STPMU1_LDO12356_OUTPUT_SHIFT);
+}
+
+static int stpmu1_ldo_get_enable(struct udevice *dev)
+{
+       int ret;
+
+       ret = pmic_reg_read(dev->parent,
+                           STPMU1_LDOX_CTRL_REG(dev->driver_data - 1));
+       if (ret < 0)
+               return false;
+
+       return ret & STPMU1_LDO_EN ? true : false;
+}
+
+static int stpmu1_ldo_set_enable(struct udevice *dev, bool enable)
+{
+       struct dm_regulator_uclass_platdata *uc_pdata;
+       int delay = enable ? STPMU1_DEFAULT_START_UP_DELAY_MS :
+                            STPMU1_DEFAULT_STOP_DELAY_MS;
+       int ret, uv;
+
+       /* if regulator is already in the wanted state, nothing to do */
+       if (stpmu1_ldo_get_enable(dev) == enable)
+               return 0;
+
+       if (enable) {
+               uc_pdata = dev_get_uclass_platdata(dev);
+               uv = stpmu1_ldo_get_value(dev);
+               if ((uv < uc_pdata->min_uV) || (uv > uc_pdata->max_uV))
+                       stpmu1_ldo_set_value(dev, uc_pdata->min_uV);
+       }
+
+       ret = pmic_clrsetbits(dev->parent,
+                             STPMU1_LDOX_CTRL_REG(dev->driver_data - 1),
+                             STPMU1_LDO_EN, enable ? STPMU1_LDO_EN : 0);
+       mdelay(delay);
+
+       return ret;
+}
+
+static int stpmu1_ldo_get_mode(struct udevice *dev)
+{
+       int ret, ldo = dev->driver_data - 1;
+
+       if (ldo != STPMU1_LDO3)
+               return -EINVAL;
+
+       ret = pmic_reg_read(dev->parent, STPMU1_LDOX_CTRL_REG(ldo));
+       if (ret < 0)
+               return ret;
+
+       if (ret & STPMU1_LDO3_MODE)
+               return STPMU1_LDO_MODE_BYPASS;
+
+       ret &= STPMU1_LDO12356_OUTPUT_MASK;
+       ret >>= STPMU1_LDO12356_OUTPUT_SHIFT;
+
+       return ret == STPMU1_LDO3_DDR_SEL ? STPMU1_LDO_MODE_SINK_SOURCE :
+                                            STPMU1_LDO_MODE_NORMAL;
+}
+
+static int stpmu1_ldo_set_mode(struct udevice *dev, int mode)
+{
+       int ret, ldo = dev->driver_data - 1;
+
+       if (ldo != STPMU1_LDO3)
+               return -EINVAL;
+
+       ret = pmic_reg_read(dev->parent, STPMU1_LDOX_CTRL_REG(ldo));
+       if (ret < 0)
+               return ret;
+
+       switch (mode) {
+       case STPMU1_LDO_MODE_SINK_SOURCE:
+               ret &= ~STPMU1_LDO12356_OUTPUT_MASK;
+               ret |= STPMU1_LDO3_DDR_SEL << STPMU1_LDO12356_OUTPUT_SHIFT;
+       case STPMU1_LDO_MODE_NORMAL:
+               ret &= ~STPMU1_LDO3_MODE;
+               break;
+       case STPMU1_LDO_MODE_BYPASS:
+               ret |= STPMU1_LDO3_MODE;
+               break;
+       }
+
+       return pmic_reg_write(dev->parent, STPMU1_LDOX_CTRL_REG(ldo), ret);
+}
+
+static int stpmu1_ldo_probe(struct udevice *dev)
+{
+       struct dm_regulator_uclass_platdata *uc_pdata;
+
+       if (!dev->driver_data || dev->driver_data > STPMU1_MAX_LDO)
+               return -EINVAL;
+
+       uc_pdata = dev_get_uclass_platdata(dev);
+
+       uc_pdata->type = REGULATOR_TYPE_LDO;
+       if (dev->driver_data - 1 == STPMU1_LDO3) {
+               uc_pdata->mode = (struct dm_regulator_mode *)ldo_modes;
+               uc_pdata->mode_count = ARRAY_SIZE(ldo_modes);
+       } else {
+               uc_pdata->mode_count = 0;
+       }
+
+       return 0;
+}
+
+static const struct dm_regulator_ops stpmu1_ldo_ops = {
+       .get_value  = stpmu1_ldo_get_value,
+       .set_value  = stpmu1_ldo_set_value,
+       .get_enable = stpmu1_ldo_get_enable,
+       .set_enable = stpmu1_ldo_set_enable,
+       .get_mode   = stpmu1_ldo_get_mode,
+       .set_mode   = stpmu1_ldo_set_mode,
+};
+
+U_BOOT_DRIVER(stpmu1_ldo) = {
+       .name = "stpmu1_ldo",
+       .id = UCLASS_REGULATOR,
+       .ops = &stpmu1_ldo_ops,
+       .probe = stpmu1_ldo_probe,
+};
+
+/*
+ * VREF DDR regulator
+ */
+
+static int stpmu1_vref_ddr_get_value(struct udevice *dev)
+{
+       /* BUCK2/2 */
+       return stpmu1_buck_get_uv(dev->parent, STPMU1_BUCK2) / 2;
+}
+
+static int stpmu1_vref_ddr_get_enable(struct udevice *dev)
+{
+       int ret;
+
+       ret = pmic_reg_read(dev->parent, STPMU1_VREF_CTRL_REG);
+       if (ret < 0)
+               return false;
+
+       return ret & STPMU1_VREF_EN ? true : false;
+}
+
+static int stpmu1_vref_ddr_set_enable(struct udevice *dev, bool enable)
+{
+       int delay = enable ? STPMU1_DEFAULT_START_UP_DELAY_MS :
+                            STPMU1_DEFAULT_STOP_DELAY_MS;
+       int ret;
+
+       /* if regulator is already in the wanted state, nothing to do */
+       if (stpmu1_vref_ddr_get_enable(dev) == enable)
+               return 0;
+
+       ret = pmic_clrsetbits(dev->parent, STPMU1_VREF_CTRL_REG,
+                             STPMU1_VREF_EN, enable ? STPMU1_VREF_EN : 0);
+       mdelay(delay);
+
+       return ret;
+}
+
+static int stpmu1_vref_ddr_probe(struct udevice *dev)
+{
+       struct dm_regulator_uclass_platdata *uc_pdata;
+
+       uc_pdata = dev_get_uclass_platdata(dev);
+
+       uc_pdata->type = REGULATOR_TYPE_FIXED;
+       uc_pdata->mode_count = 0;
+
+       return 0;
+}
+
+static const struct dm_regulator_ops stpmu1_vref_ddr_ops = {
+       .get_value  = stpmu1_vref_ddr_get_value,
+       .get_enable = stpmu1_vref_ddr_get_enable,
+       .set_enable = stpmu1_vref_ddr_set_enable,
+};
+
+U_BOOT_DRIVER(stpmu1_vref_ddr) = {
+       .name = "stpmu1_vref_ddr",
+       .id = UCLASS_REGULATOR,
+       .ops = &stpmu1_vref_ddr_ops,
+       .probe = stpmu1_vref_ddr_probe,
+};
+
+/*
+ * BOOST regulator
+ */
+
+static int stpmu1_boost_get_enable(struct udevice *dev)
+{
+       int ret;
+
+       ret = pmic_reg_read(dev->parent, STPMU1_USB_CTRL_REG);
+       if (ret < 0)
+               return false;
+
+       return ret & STPMU1_USB_BOOST_EN ? true : false;
+}
+
+static int stpmu1_boost_set_enable(struct udevice *dev, bool enable)
+{
+       int ret;
+
+       ret = pmic_reg_read(dev->parent, STPMU1_USB_CTRL_REG);
+       if (ret < 0)
+               return ret;
+
+       if (!enable && ret & STPMU1_USB_PWR_SW_EN)
+               return -EINVAL;
+
+       /* if regulator is already in the wanted state, nothing to do */
+       if (!!(ret & STPMU1_USB_BOOST_EN) == enable)
+               return 0;
+
+       ret = pmic_clrsetbits(dev->parent, STPMU1_USB_CTRL_REG,
+                             STPMU1_USB_BOOST_EN,
+                             enable ? STPMU1_USB_BOOST_EN : 0);
+       if (enable)
+               mdelay(STPMU1_USB_BOOST_START_UP_DELAY_MS);
+
+       return ret;
+}
+
+static int stpmu1_boost_probe(struct udevice *dev)
+{
+       struct dm_regulator_uclass_platdata *uc_pdata;
+
+       uc_pdata = dev_get_uclass_platdata(dev);
+
+       uc_pdata->type = REGULATOR_TYPE_FIXED;
+       uc_pdata->mode_count = 0;
+
+       return 0;
+}
+
+static const struct dm_regulator_ops stpmu1_boost_ops = {
+       .get_enable = stpmu1_boost_get_enable,
+       .set_enable = stpmu1_boost_set_enable,
+};
+
+U_BOOT_DRIVER(stpmu1_boost) = {
+       .name = "stpmu1_boost",
+       .id = UCLASS_REGULATOR,
+       .ops = &stpmu1_boost_ops,
+       .probe = stpmu1_boost_probe,
+};
+
+/*
+ * USB power switch
+ */
+
+static int stpmu1_pwr_sw_get_enable(struct udevice *dev)
+{
+       uint mask = 1 << dev->driver_data;
+       int ret;
+
+       ret = pmic_reg_read(dev->parent, STPMU1_USB_CTRL_REG);
+       if (ret < 0)
+               return false;
+
+       return ret & mask ? true : false;
+}
+
+static int stpmu1_pwr_sw_set_enable(struct udevice *dev, bool enable)
+{
+       uint mask = 1 << dev->driver_data;
+       int delay = enable ? STPMU1_DEFAULT_START_UP_DELAY_MS :
+                            STPMU1_DEFAULT_STOP_DELAY_MS;
+       int ret;
+
+       ret = pmic_reg_read(dev->parent, STPMU1_USB_CTRL_REG);
+       if (ret < 0)
+               return ret;
+
+       /* if regulator is already in the wanted state, nothing to do */
+       if (!!(ret & mask) == enable)
+               return 0;
+
+       /* Boost management */
+       if (enable && !(ret & STPMU1_USB_BOOST_EN)) {
+               pmic_clrsetbits(dev->parent, STPMU1_USB_CTRL_REG,
+                               STPMU1_USB_BOOST_EN, STPMU1_USB_BOOST_EN);
+               mdelay(STPMU1_USB_BOOST_START_UP_DELAY_MS);
+       } else if (!enable && ret & STPMU1_USB_BOOST_EN &&
+                  (ret & STPMU1_USB_PWR_SW_EN) != STPMU1_USB_PWR_SW_EN) {
+               pmic_clrsetbits(dev->parent, STPMU1_USB_CTRL_REG,
+                               STPMU1_USB_BOOST_EN, 0);
+       }
+
+       ret = pmic_clrsetbits(dev->parent, STPMU1_USB_CTRL_REG,
+                             mask, enable ? mask : 0);
+       mdelay(delay);
+
+       return ret;
+}
+
+static int stpmu1_pwr_sw_probe(struct udevice *dev)
+{
+       struct dm_regulator_uclass_platdata *uc_pdata;
+
+       if (!dev->driver_data || dev->driver_data > STPMU1_MAX_PWR_SW)
+               return -EINVAL;
+
+       uc_pdata = dev_get_uclass_platdata(dev);
+
+       uc_pdata->type = REGULATOR_TYPE_FIXED;
+       uc_pdata->mode_count = 0;
+
+       return 0;
+}
+
+static const struct dm_regulator_ops stpmu1_pwr_sw_ops = {
+       .get_enable = stpmu1_pwr_sw_get_enable,
+       .set_enable = stpmu1_pwr_sw_set_enable,
+};
+
+U_BOOT_DRIVER(stpmu1_pwr_sw) = {
+       .name = "stpmu1_pwr_sw",
+       .id = UCLASS_REGULATOR,
+       .ops = &stpmu1_pwr_sw_ops,
+       .probe = stpmu1_pwr_sw_probe,
+};
diff --git a/drivers/power/regulator/stpmu1.c b/drivers/power/regulator/stpmu1.c
deleted file mode 100644 (file)
index 2e64051..0000000
+++ /dev/null
@@ -1,672 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause
-/*
- * Copyright (C) 2018, STMicroelectronics - All Rights Reserved
- * Author: Christophe Kerello <christophe.kerello@st.com>
- */
-
-#include <common.h>
-#include <dm.h>
-#include <errno.h>
-#include <power/pmic.h>
-#include <power/regulator.h>
-#include <power/stpmu1.h>
-
-struct stpmu1_range {
-       int min_uv;
-       int min_sel;
-       int max_sel;
-       int step;
-};
-
-struct stpmu1_output_range {
-       const struct stpmu1_range *ranges;
-       int nbranges;
-};
-
-#define STPMU1_MODE(_id, _val, _name) { \
-       .id = _id,                      \
-       .register_value = _val,         \
-       .name = _name,                  \
-}
-
-#define STPMU1_RANGE(_min_uv, _min_sel, _max_sel, _step) { \
-       .min_uv = _min_uv,              \
-       .min_sel = _min_sel,            \
-       .max_sel = _max_sel,            \
-       .step = _step,                  \
-}
-
-#define STPMU1_OUTPUT_RANGE(_ranges, _nbranges) { \
-       .ranges = _ranges,              \
-       .nbranges = _nbranges,          \
-}
-
-static int stpmu1_output_find_uv(int sel,
-                                const struct stpmu1_output_range *output_range)
-{
-       const struct stpmu1_range *range;
-       int i;
-
-       for (i = 0, range = output_range->ranges;
-            i < output_range->nbranges; i++, range++) {
-               if (sel >= range->min_sel && sel <= range->max_sel)
-                       return range->min_uv +
-                              (sel - range->min_sel) * range->step;
-       }
-
-       return -EINVAL;
-}
-
-static int stpmu1_output_find_sel(int uv,
-                                 const struct stpmu1_output_range *output_range)
-{
-       const struct stpmu1_range *range;
-       int i;
-
-       for (i = 0, range = output_range->ranges;
-            i < output_range->nbranges; i++, range++) {
-               if (uv == range->min_uv && !range->step)
-                       return range->min_sel;
-
-               if (uv >= range->min_uv &&
-                   uv <= range->min_uv +
-                         (range->max_sel - range->min_sel) * range->step)
-                       return range->min_sel +
-                              (uv - range->min_uv) / range->step;
-       }
-
-       return -EINVAL;
-}
-
-/*
- * BUCK regulators
- */
-
-static const struct stpmu1_range buck1_ranges[] = {
-       STPMU1_RANGE(725000, 0, 4, 0),
-       STPMU1_RANGE(725000, 5, 36, 25000),
-       STPMU1_RANGE(1500000, 37, 63, 0),
-};
-
-static const struct stpmu1_range buck2_ranges[] = {
-       STPMU1_RANGE(1000000, 0, 17, 0),
-       STPMU1_RANGE(1050000, 18, 19, 0),
-       STPMU1_RANGE(1100000, 20, 21, 0),
-       STPMU1_RANGE(1150000, 22, 23, 0),
-       STPMU1_RANGE(1200000, 24, 25, 0),
-       STPMU1_RANGE(1250000, 26, 27, 0),
-       STPMU1_RANGE(1300000, 28, 29, 0),
-       STPMU1_RANGE(1350000, 30, 31, 0),
-       STPMU1_RANGE(1400000, 32, 33, 0),
-       STPMU1_RANGE(1450000, 34, 35, 0),
-       STPMU1_RANGE(1500000, 36, 63, 0),
-};
-
-static const struct stpmu1_range buck3_ranges[] = {
-       STPMU1_RANGE(1000000, 0, 19, 0),
-       STPMU1_RANGE(1100000, 20, 23, 0),
-       STPMU1_RANGE(1200000, 24, 27, 0),
-       STPMU1_RANGE(1300000, 28, 31, 0),
-       STPMU1_RANGE(1400000, 32, 35, 0),
-       STPMU1_RANGE(1500000, 36, 55, 100000),
-       STPMU1_RANGE(3400000, 56, 63, 0),
-};
-
-static const struct stpmu1_range buck4_ranges[] = {
-       STPMU1_RANGE(600000, 0, 27, 25000),
-       STPMU1_RANGE(1300000, 28, 29, 0),
-       STPMU1_RANGE(1350000, 30, 31, 0),
-       STPMU1_RANGE(1400000, 32, 33, 0),
-       STPMU1_RANGE(1450000, 34, 35, 0),
-       STPMU1_RANGE(1500000, 36, 60, 100000),
-       STPMU1_RANGE(3900000, 61, 63, 0),
-};
-
-/* BUCK: 1,2,3,4 - voltage ranges */
-static const struct stpmu1_output_range buck_voltage_range[] = {
-       STPMU1_OUTPUT_RANGE(buck1_ranges, ARRAY_SIZE(buck1_ranges)),
-       STPMU1_OUTPUT_RANGE(buck2_ranges, ARRAY_SIZE(buck2_ranges)),
-       STPMU1_OUTPUT_RANGE(buck3_ranges, ARRAY_SIZE(buck3_ranges)),
-       STPMU1_OUTPUT_RANGE(buck4_ranges, ARRAY_SIZE(buck4_ranges)),
-};
-
-/* BUCK modes */
-static const struct dm_regulator_mode buck_modes[] = {
-       STPMU1_MODE(STPMU1_BUCK_MODE_HP, STPMU1_BUCK_MODE_HP, "HP"),
-       STPMU1_MODE(STPMU1_BUCK_MODE_LP, STPMU1_BUCK_MODE_LP, "LP"),
-};
-
-static int stpmu1_buck_get_uv(struct udevice *dev, int buck)
-{
-       int sel;
-
-       sel = pmic_reg_read(dev, STPMU1_BUCKX_CTRL_REG(buck));
-       if (sel < 0)
-               return sel;
-
-       sel &= STPMU1_BUCK_OUTPUT_MASK;
-       sel >>= STPMU1_BUCK_OUTPUT_SHIFT;
-
-       return stpmu1_output_find_uv(sel, &buck_voltage_range[buck]);
-}
-
-static int stpmu1_buck_get_value(struct udevice *dev)
-{
-       return stpmu1_buck_get_uv(dev->parent, dev->driver_data - 1);
-}
-
-static int stpmu1_buck_set_value(struct udevice *dev, int uv)
-{
-       int sel, buck = dev->driver_data - 1;
-
-       sel = stpmu1_output_find_sel(uv, &buck_voltage_range[buck]);
-       if (sel < 0)
-               return sel;
-
-       return pmic_clrsetbits(dev->parent,
-                              STPMU1_BUCKX_CTRL_REG(buck),
-                              STPMU1_BUCK_OUTPUT_MASK,
-                              sel << STPMU1_BUCK_OUTPUT_SHIFT);
-}
-
-static int stpmu1_buck_get_enable(struct udevice *dev)
-{
-       int ret;
-
-       ret = pmic_reg_read(dev->parent,
-                           STPMU1_BUCKX_CTRL_REG(dev->driver_data - 1));
-       if (ret < 0)
-               return false;
-
-       return ret & STPMU1_BUCK_EN ? true : false;
-}
-
-static int stpmu1_buck_set_enable(struct udevice *dev, bool enable)
-{
-       struct dm_regulator_uclass_platdata *uc_pdata;
-       int delay = enable ? STPMU1_DEFAULT_START_UP_DELAY_MS :
-                            STPMU1_DEFAULT_STOP_DELAY_MS;
-       int ret, uv;
-
-       /* if regulator is already in the wanted state, nothing to do */
-       if (stpmu1_buck_get_enable(dev) == enable)
-               return 0;
-
-       if (enable) {
-               uc_pdata = dev_get_uclass_platdata(dev);
-               uv = stpmu1_buck_get_value(dev);
-               if ((uv < uc_pdata->min_uV) || (uv > uc_pdata->max_uV))
-                       stpmu1_buck_set_value(dev, uc_pdata->min_uV);
-       }
-
-       ret = pmic_clrsetbits(dev->parent,
-                             STPMU1_BUCKX_CTRL_REG(dev->driver_data - 1),
-                             STPMU1_BUCK_EN, enable ? STPMU1_BUCK_EN : 0);
-       mdelay(delay);
-
-       return ret;
-}
-
-static int stpmu1_buck_get_mode(struct udevice *dev)
-{
-       int ret;
-
-       ret = pmic_reg_read(dev->parent,
-                           STPMU1_BUCKX_CTRL_REG(dev->driver_data - 1));
-       if (ret < 0)
-               return ret;
-
-       return ret & STPMU1_BUCK_MODE ? STPMU1_BUCK_MODE_LP :
-                                        STPMU1_BUCK_MODE_HP;
-}
-
-static int stpmu1_buck_set_mode(struct udevice *dev, int mode)
-{
-       return pmic_clrsetbits(dev->parent,
-                              STPMU1_BUCKX_CTRL_REG(dev->driver_data - 1),
-                              STPMU1_BUCK_MODE,
-                              mode ? STPMU1_BUCK_MODE : 0);
-}
-
-static int stpmu1_buck_probe(struct udevice *dev)
-{
-       struct dm_regulator_uclass_platdata *uc_pdata;
-
-       if (!dev->driver_data || dev->driver_data > STPMU1_MAX_BUCK)
-               return -EINVAL;
-
-       uc_pdata = dev_get_uclass_platdata(dev);
-
-       uc_pdata->type = REGULATOR_TYPE_BUCK;
-       uc_pdata->mode = (struct dm_regulator_mode *)buck_modes;
-       uc_pdata->mode_count = ARRAY_SIZE(buck_modes);
-
-       return 0;
-}
-
-static const struct dm_regulator_ops stpmu1_buck_ops = {
-       .get_value  = stpmu1_buck_get_value,
-       .set_value  = stpmu1_buck_set_value,
-       .get_enable = stpmu1_buck_get_enable,
-       .set_enable = stpmu1_buck_set_enable,
-       .get_mode   = stpmu1_buck_get_mode,
-       .set_mode   = stpmu1_buck_set_mode,
-};
-
-U_BOOT_DRIVER(stpmu1_buck) = {
-       .name = "stpmu1_buck",
-       .id = UCLASS_REGULATOR,
-       .ops = &stpmu1_buck_ops,
-       .probe = stpmu1_buck_probe,
-};
-
-/*
- * LDO regulators
- */
-
-static const struct stpmu1_range ldo12_ranges[] = {
-       STPMU1_RANGE(1700000, 0, 7, 0),
-       STPMU1_RANGE(1700000, 8, 24, 100000),
-       STPMU1_RANGE(3300000, 25, 31, 0),
-};
-
-static const struct stpmu1_range ldo3_ranges[] = {
-       STPMU1_RANGE(1700000, 0, 7, 0),
-       STPMU1_RANGE(1700000, 8, 24, 100000),
-       STPMU1_RANGE(3300000, 25, 30, 0),
-       /* Sel 31 is special case when LDO3 is in mode sync_source (BUCK2/2) */
-};
-
-static const struct stpmu1_range ldo5_ranges[] = {
-       STPMU1_RANGE(1700000, 0, 7, 0),
-       STPMU1_RANGE(1700000, 8, 30, 100000),
-       STPMU1_RANGE(3900000, 31, 31, 0),
-};
-
-static const struct stpmu1_range ldo6_ranges[] = {
-       STPMU1_RANGE(900000, 0, 24, 100000),
-       STPMU1_RANGE(3300000, 25, 31, 0),
-};
-
-/* LDO: 1,2,3,4,5,6 - voltage ranges */
-static const struct stpmu1_output_range ldo_voltage_range[] = {
-       STPMU1_OUTPUT_RANGE(ldo12_ranges, ARRAY_SIZE(ldo12_ranges)),
-       STPMU1_OUTPUT_RANGE(ldo12_ranges, ARRAY_SIZE(ldo12_ranges)),
-       STPMU1_OUTPUT_RANGE(ldo3_ranges, ARRAY_SIZE(ldo3_ranges)),
-       STPMU1_OUTPUT_RANGE(NULL, 0),
-       STPMU1_OUTPUT_RANGE(ldo5_ranges, ARRAY_SIZE(ldo5_ranges)),
-       STPMU1_OUTPUT_RANGE(ldo6_ranges, ARRAY_SIZE(ldo6_ranges)),
-};
-
-/* LDO modes */
-static const struct dm_regulator_mode ldo_modes[] = {
-       STPMU1_MODE(STPMU1_LDO_MODE_NORMAL,
-                   STPMU1_LDO_MODE_NORMAL, "NORMAL"),
-       STPMU1_MODE(STPMU1_LDO_MODE_BYPASS,
-                   STPMU1_LDO_MODE_BYPASS, "BYPASS"),
-       STPMU1_MODE(STPMU1_LDO_MODE_SINK_SOURCE,
-                   STPMU1_LDO_MODE_SINK_SOURCE, "SINK SOURCE"),
-};
-
-static int stpmu1_ldo_get_value(struct udevice *dev)
-{
-       int sel, ldo = dev->driver_data - 1;
-
-       sel = pmic_reg_read(dev->parent, STPMU1_LDOX_CTRL_REG(ldo));
-       if (sel < 0)
-               return sel;
-
-       /* ldo4 => 3,3V */
-       if (ldo == STPMU1_LDO4)
-               return STPMU1_LDO4_UV;
-
-       sel &= STPMU1_LDO12356_OUTPUT_MASK;
-       sel >>= STPMU1_LDO12356_OUTPUT_SHIFT;
-
-       /* ldo3, sel = 31 => BUCK2/2 */
-       if (ldo == STPMU1_LDO3 && sel == STPMU1_LDO3_DDR_SEL)
-               return stpmu1_buck_get_uv(dev->parent, STPMU1_BUCK2) / 2;
-
-       return stpmu1_output_find_uv(sel, &ldo_voltage_range[ldo]);
-}
-
-static int stpmu1_ldo_set_value(struct udevice *dev, int uv)
-{
-       int sel, ldo = dev->driver_data - 1;
-
-       /* ldo4 => not possible */
-       if (ldo == STPMU1_LDO4)
-               return -EINVAL;
-
-       sel = stpmu1_output_find_sel(uv, &ldo_voltage_range[ldo]);
-       if (sel < 0)
-               return sel;
-
-       return pmic_clrsetbits(dev->parent,
-                              STPMU1_LDOX_CTRL_REG(ldo),
-                              STPMU1_LDO12356_OUTPUT_MASK,
-                              sel << STPMU1_LDO12356_OUTPUT_SHIFT);
-}
-
-static int stpmu1_ldo_get_enable(struct udevice *dev)
-{
-       int ret;
-
-       ret = pmic_reg_read(dev->parent,
-                           STPMU1_LDOX_CTRL_REG(dev->driver_data - 1));
-       if (ret < 0)
-               return false;
-
-       return ret & STPMU1_LDO_EN ? true : false;
-}
-
-static int stpmu1_ldo_set_enable(struct udevice *dev, bool enable)
-{
-       struct dm_regulator_uclass_platdata *uc_pdata;
-       int delay = enable ? STPMU1_DEFAULT_START_UP_DELAY_MS :
-                            STPMU1_DEFAULT_STOP_DELAY_MS;
-       int ret, uv;
-
-       /* if regulator is already in the wanted state, nothing to do */
-       if (stpmu1_ldo_get_enable(dev) == enable)
-               return 0;
-
-       if (enable) {
-               uc_pdata = dev_get_uclass_platdata(dev);
-               uv = stpmu1_ldo_get_value(dev);
-               if ((uv < uc_pdata->min_uV) || (uv > uc_pdata->max_uV))
-                       stpmu1_ldo_set_value(dev, uc_pdata->min_uV);
-       }
-
-       ret = pmic_clrsetbits(dev->parent,
-                             STPMU1_LDOX_CTRL_REG(dev->driver_data - 1),
-                             STPMU1_LDO_EN, enable ? STPMU1_LDO_EN : 0);
-       mdelay(delay);
-
-       return ret;
-}
-
-static int stpmu1_ldo_get_mode(struct udevice *dev)
-{
-       int ret, ldo = dev->driver_data - 1;
-
-       if (ldo != STPMU1_LDO3)
-               return -EINVAL;
-
-       ret = pmic_reg_read(dev->parent, STPMU1_LDOX_CTRL_REG(ldo));
-       if (ret < 0)
-               return ret;
-
-       if (ret & STPMU1_LDO3_MODE)
-               return STPMU1_LDO_MODE_BYPASS;
-
-       ret &= STPMU1_LDO12356_OUTPUT_MASK;
-       ret >>= STPMU1_LDO12356_OUTPUT_SHIFT;
-
-       return ret == STPMU1_LDO3_DDR_SEL ? STPMU1_LDO_MODE_SINK_SOURCE :
-                                            STPMU1_LDO_MODE_NORMAL;
-}
-
-static int stpmu1_ldo_set_mode(struct udevice *dev, int mode)
-{
-       int ret, ldo = dev->driver_data - 1;
-
-       if (ldo != STPMU1_LDO3)
-               return -EINVAL;
-
-       ret = pmic_reg_read(dev->parent, STPMU1_LDOX_CTRL_REG(ldo));
-       if (ret < 0)
-               return ret;
-
-       switch (mode) {
-       case STPMU1_LDO_MODE_SINK_SOURCE:
-               ret &= ~STPMU1_LDO12356_OUTPUT_MASK;
-               ret |= STPMU1_LDO3_DDR_SEL << STPMU1_LDO12356_OUTPUT_SHIFT;
-       case STPMU1_LDO_MODE_NORMAL:
-               ret &= ~STPMU1_LDO3_MODE;
-               break;
-       case STPMU1_LDO_MODE_BYPASS:
-               ret |= STPMU1_LDO3_MODE;
-               break;
-       }
-
-       return pmic_reg_write(dev->parent, STPMU1_LDOX_CTRL_REG(ldo), ret);
-}
-
-static int stpmu1_ldo_probe(struct udevice *dev)
-{
-       struct dm_regulator_uclass_platdata *uc_pdata;
-
-       if (!dev->driver_data || dev->driver_data > STPMU1_MAX_LDO)
-               return -EINVAL;
-
-       uc_pdata = dev_get_uclass_platdata(dev);
-
-       uc_pdata->type = REGULATOR_TYPE_LDO;
-       if (dev->driver_data - 1 == STPMU1_LDO3) {
-               uc_pdata->mode = (struct dm_regulator_mode *)ldo_modes;
-               uc_pdata->mode_count = ARRAY_SIZE(ldo_modes);
-       } else {
-               uc_pdata->mode_count = 0;
-       }
-
-       return 0;
-}
-
-static const struct dm_regulator_ops stpmu1_ldo_ops = {
-       .get_value  = stpmu1_ldo_get_value,
-       .set_value  = stpmu1_ldo_set_value,
-       .get_enable = stpmu1_ldo_get_enable,
-       .set_enable = stpmu1_ldo_set_enable,
-       .get_mode   = stpmu1_ldo_get_mode,
-       .set_mode   = stpmu1_ldo_set_mode,
-};
-
-U_BOOT_DRIVER(stpmu1_ldo) = {
-       .name = "stpmu1_ldo",
-       .id = UCLASS_REGULATOR,
-       .ops = &stpmu1_ldo_ops,
-       .probe = stpmu1_ldo_probe,
-};
-
-/*
- * VREF DDR regulator
- */
-
-static int stpmu1_vref_ddr_get_value(struct udevice *dev)
-{
-       /* BUCK2/2 */
-       return stpmu1_buck_get_uv(dev->parent, STPMU1_BUCK2) / 2;
-}
-
-static int stpmu1_vref_ddr_get_enable(struct udevice *dev)
-{
-       int ret;
-
-       ret = pmic_reg_read(dev->parent, STPMU1_VREF_CTRL_REG);
-       if (ret < 0)
-               return false;
-
-       return ret & STPMU1_VREF_EN ? true : false;
-}
-
-static int stpmu1_vref_ddr_set_enable(struct udevice *dev, bool enable)
-{
-       int delay = enable ? STPMU1_DEFAULT_START_UP_DELAY_MS :
-                            STPMU1_DEFAULT_STOP_DELAY_MS;
-       int ret;
-
-       /* if regulator is already in the wanted state, nothing to do */
-       if (stpmu1_vref_ddr_get_enable(dev) == enable)
-               return 0;
-
-       ret = pmic_clrsetbits(dev->parent, STPMU1_VREF_CTRL_REG,
-                             STPMU1_VREF_EN, enable ? STPMU1_VREF_EN : 0);
-       mdelay(delay);
-
-       return ret;
-}
-
-static int stpmu1_vref_ddr_probe(struct udevice *dev)
-{
-       struct dm_regulator_uclass_platdata *uc_pdata;
-
-       uc_pdata = dev_get_uclass_platdata(dev);
-
-       uc_pdata->type = REGULATOR_TYPE_FIXED;
-       uc_pdata->mode_count = 0;
-
-       return 0;
-}
-
-static const struct dm_regulator_ops stpmu1_vref_ddr_ops = {
-       .get_value  = stpmu1_vref_ddr_get_value,
-       .get_enable = stpmu1_vref_ddr_get_enable,
-       .set_enable = stpmu1_vref_ddr_set_enable,
-};
-
-U_BOOT_DRIVER(stpmu1_vref_ddr) = {
-       .name = "stpmu1_vref_ddr",
-       .id = UCLASS_REGULATOR,
-       .ops = &stpmu1_vref_ddr_ops,
-       .probe = stpmu1_vref_ddr_probe,
-};
-
-/*
- * BOOST regulator
- */
-
-static int stpmu1_boost_get_enable(struct udevice *dev)
-{
-       int ret;
-
-       ret = pmic_reg_read(dev->parent, STPMU1_USB_CTRL_REG);
-       if (ret < 0)
-               return false;
-
-       return ret & STPMU1_USB_BOOST_EN ? true : false;
-}
-
-static int stpmu1_boost_set_enable(struct udevice *dev, bool enable)
-{
-       int ret;
-
-       ret = pmic_reg_read(dev->parent, STPMU1_USB_CTRL_REG);
-       if (ret < 0)
-               return ret;
-
-       if (!enable && ret & STPMU1_USB_PWR_SW_EN)
-               return -EINVAL;
-
-       /* if regulator is already in the wanted state, nothing to do */
-       if (!!(ret & STPMU1_USB_BOOST_EN) == enable)
-               return 0;
-
-       ret = pmic_clrsetbits(dev->parent, STPMU1_USB_CTRL_REG,
-                             STPMU1_USB_BOOST_EN,
-                             enable ? STPMU1_USB_BOOST_EN : 0);
-       if (enable)
-               mdelay(STPMU1_USB_BOOST_START_UP_DELAY_MS);
-
-       return ret;
-}
-
-static int stpmu1_boost_probe(struct udevice *dev)
-{
-       struct dm_regulator_uclass_platdata *uc_pdata;
-
-       uc_pdata = dev_get_uclass_platdata(dev);
-
-       uc_pdata->type = REGULATOR_TYPE_FIXED;
-       uc_pdata->mode_count = 0;
-
-       return 0;
-}
-
-static const struct dm_regulator_ops stpmu1_boost_ops = {
-       .get_enable = stpmu1_boost_get_enable,
-       .set_enable = stpmu1_boost_set_enable,
-};
-
-U_BOOT_DRIVER(stpmu1_boost) = {
-       .name = "stpmu1_boost",
-       .id = UCLASS_REGULATOR,
-       .ops = &stpmu1_boost_ops,
-       .probe = stpmu1_boost_probe,
-};
-
-/*
- * USB power switch
- */
-
-static int stpmu1_pwr_sw_get_enable(struct udevice *dev)
-{
-       uint mask = 1 << dev->driver_data;
-       int ret;
-
-       ret = pmic_reg_read(dev->parent, STPMU1_USB_CTRL_REG);
-       if (ret < 0)
-               return false;
-
-       return ret & mask ? true : false;
-}
-
-static int stpmu1_pwr_sw_set_enable(struct udevice *dev, bool enable)
-{
-       uint mask = 1 << dev->driver_data;
-       int delay = enable ? STPMU1_DEFAULT_START_UP_DELAY_MS :
-                            STPMU1_DEFAULT_STOP_DELAY_MS;
-       int ret;
-
-       ret = pmic_reg_read(dev->parent, STPMU1_USB_CTRL_REG);
-       if (ret < 0)
-               return ret;
-
-       /* if regulator is already in the wanted state, nothing to do */
-       if (!!(ret & mask) == enable)
-               return 0;
-
-       /* Boost management */
-       if (enable && !(ret & STPMU1_USB_BOOST_EN)) {
-               pmic_clrsetbits(dev->parent, STPMU1_USB_CTRL_REG,
-                               STPMU1_USB_BOOST_EN, STPMU1_USB_BOOST_EN);
-               mdelay(STPMU1_USB_BOOST_START_UP_DELAY_MS);
-       } else if (!enable && ret & STPMU1_USB_BOOST_EN &&
-                  (ret & STPMU1_USB_PWR_SW_EN) != STPMU1_USB_PWR_SW_EN) {
-               pmic_clrsetbits(dev->parent, STPMU1_USB_CTRL_REG,
-                               STPMU1_USB_BOOST_EN, 0);
-       }
-
-       ret = pmic_clrsetbits(dev->parent, STPMU1_USB_CTRL_REG,
-                             mask, enable ? mask : 0);
-       mdelay(delay);
-
-       return ret;
-}
-
-static int stpmu1_pwr_sw_probe(struct udevice *dev)
-{
-       struct dm_regulator_uclass_platdata *uc_pdata;
-
-       if (!dev->driver_data || dev->driver_data > STPMU1_MAX_PWR_SW)
-               return -EINVAL;
-
-       uc_pdata = dev_get_uclass_platdata(dev);
-
-       uc_pdata->type = REGULATOR_TYPE_FIXED;
-       uc_pdata->mode_count = 0;
-
-       return 0;
-}
-
-static const struct dm_regulator_ops stpmu1_pwr_sw_ops = {
-       .get_enable = stpmu1_pwr_sw_get_enable,
-       .set_enable = stpmu1_pwr_sw_set_enable,
-};
-
-U_BOOT_DRIVER(stpmu1_pwr_sw) = {
-       .name = "stpmu1_pwr_sw",
-       .id = UCLASS_REGULATOR,
-       .ops = &stpmu1_pwr_sw_ops,
-       .probe = stpmu1_pwr_sw_probe,
-};
diff --git a/include/dt-bindings/mfd/st,stpmic1.h b/include/dt-bindings/mfd/st,stpmic1.h
new file mode 100644 (file)
index 0000000..81982eb
--- /dev/null
@@ -0,0 +1,60 @@
+/*
+ * This file is part of stpmu1 pmic driver
+ *
+ * Copyright (C) 2017, STMicroelectronics - All Rights Reserved
+ * Author: Pascal Paillet <p.paillet@st.com> for STMicroelectronics.
+ *
+ * License type: GPLv2
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __DT_BINDINGS_STPMU1_H__
+#define __DT_BINDINGS_STPMU1_H__
+
+/* IRQ definitions */
+#define IT_PONKEY_F 0
+#define IT_PONKEY_R 1
+#define IT_WAKEUP_F 2
+#define IT_WAKEUP_R 3
+#define IT_VBUS_OTG_F 4
+#define IT_VBUS_OTG_R 5
+#define IT_SWOUT_F 6
+#define IT_SWOUT_R 7
+
+#define IT_CURLIM_BUCK1 8
+#define IT_CURLIM_BUCK2 9
+#define IT_CURLIM_BUCK3 10
+#define IT_CURLIM_BUCK4 11
+#define IT_OCP_OTG 12
+#define IT_OCP_SWOUT 13
+#define IT_OCP_BOOST 14
+#define IT_OVP_BOOST 15
+
+#define IT_CURLIM_LDO1 16
+#define IT_CURLIM_LDO2 17
+#define IT_CURLIM_LDO3 18
+#define IT_CURLIM_LDO4 19
+#define IT_CURLIM_LDO5 20
+#define IT_CURLIM_LDO6 21
+#define IT_SHORT_SWOTG 22
+#define IT_SHORT_SWOUT 23
+
+#define IT_TWARN_F 24
+#define IT_TWARN_R 25
+#define IT_VINLOW_F 26
+#define IT_VINLOW_R 27
+#define IT_SWIN_F 30
+#define IT_SWIN_R 31
+
+#endif /* __DT_BINDINGS_STPMU1_H__ */
diff --git a/include/dt-bindings/mfd/st,stpmu1.h b/include/dt-bindings/mfd/st,stpmu1.h
deleted file mode 100644 (file)
index 81982eb..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * This file is part of stpmu1 pmic driver
- *
- * Copyright (C) 2017, STMicroelectronics - All Rights Reserved
- * Author: Pascal Paillet <p.paillet@st.com> for STMicroelectronics.
- *
- * License type: GPLv2
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published by
- * the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __DT_BINDINGS_STPMU1_H__
-#define __DT_BINDINGS_STPMU1_H__
-
-/* IRQ definitions */
-#define IT_PONKEY_F 0
-#define IT_PONKEY_R 1
-#define IT_WAKEUP_F 2
-#define IT_WAKEUP_R 3
-#define IT_VBUS_OTG_F 4
-#define IT_VBUS_OTG_R 5
-#define IT_SWOUT_F 6
-#define IT_SWOUT_R 7
-
-#define IT_CURLIM_BUCK1 8
-#define IT_CURLIM_BUCK2 9
-#define IT_CURLIM_BUCK3 10
-#define IT_CURLIM_BUCK4 11
-#define IT_OCP_OTG 12
-#define IT_OCP_SWOUT 13
-#define IT_OCP_BOOST 14
-#define IT_OVP_BOOST 15
-
-#define IT_CURLIM_LDO1 16
-#define IT_CURLIM_LDO2 17
-#define IT_CURLIM_LDO3 18
-#define IT_CURLIM_LDO4 19
-#define IT_CURLIM_LDO5 20
-#define IT_CURLIM_LDO6 21
-#define IT_SHORT_SWOTG 22
-#define IT_SHORT_SWOUT 23
-
-#define IT_TWARN_F 24
-#define IT_TWARN_R 25
-#define IT_VINLOW_F 26
-#define IT_VINLOW_R 27
-#define IT_SWIN_F 30
-#define IT_SWIN_R 31
-
-#endif /* __DT_BINDINGS_STPMU1_H__ */
diff --git a/include/power/stpmic1.h b/include/power/stpmic1.h
new file mode 100644 (file)
index 0000000..5906fbf
--- /dev/null
@@ -0,0 +1,85 @@
+/* SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause */
+/*
+ * Copyright (C) 2018, STMicroelectronics - All Rights Reserved
+ */
+
+#ifndef __PMIC_STPMU1_H_
+#define __PMIC_STPMU1_H_
+
+#define STPMU1_MASK_RESET_BUCK         0x18
+#define STPMU1_BUCKX_CTRL_REG(buck)    (0x20 + (buck))
+#define STPMU1_VREF_CTRL_REG           0x24
+#define STPMU1_LDOX_CTRL_REG(ldo)      (0x25 + (ldo))
+#define STPMU1_USB_CTRL_REG            0x40
+#define STPMU1_NVM_USER_STATUS_REG     0xb8
+#define STPMU1_NVM_USER_CONTROL_REG    0xb9
+
+#define STPMU1_MASK_RESET_BUCK3                BIT(2)
+
+#define STPMU1_BUCK_EN                 BIT(0)
+#define STPMU1_BUCK_MODE               BIT(1)
+#define STPMU1_BUCK_OUTPUT_MASK                GENMASK(7, 2)
+#define STPMU1_BUCK_OUTPUT_SHIFT       2
+#define STPMU1_BUCK2_1200000V          (24 << STPMU1_BUCK_OUTPUT_SHIFT)
+#define STPMU1_BUCK2_1350000V          (30 << STPMU1_BUCK_OUTPUT_SHIFT)
+#define STPMU1_BUCK3_1800000V          (39 << STPMU1_BUCK_OUTPUT_SHIFT)
+
+#define STPMU1_VREF_EN                 BIT(0)
+
+#define STPMU1_LDO_EN                  BIT(0)
+#define STPMU1_LDO12356_OUTPUT_MASK    GENMASK(6, 2)
+#define STPMU1_LDO12356_OUTPUT_SHIFT   2
+#define STPMU1_LDO3_MODE               BIT(7)
+#define STPMU1_LDO3_DDR_SEL            31
+#define STPMU1_LDO3_1800000            (9 << STPMU1_LDO12356_OUTPUT_SHIFT)
+#define STPMU1_LDO4_UV                 3300000
+
+#define STPMU1_USB_BOOST_EN            BIT(0)
+#define STPMU1_USB_PWR_SW_EN           GENMASK(2, 1)
+
+#define STPMU1_NVM_USER_CONTROL_PROGRAM        BIT(0)
+#define STPMU1_NVM_USER_CONTROL_READ   BIT(1)
+
+#define STPMU1_NVM_USER_STATUS_BUSY    BIT(0)
+#define STPMU1_NVM_USER_STATUS_ERROR   BIT(1)
+
+#define STPMU1_DEFAULT_START_UP_DELAY_MS       1
+#define STPMU1_DEFAULT_STOP_DELAY_MS           5
+#define STPMU1_USB_BOOST_START_UP_DELAY_MS     10
+
+enum {
+       STPMU1_BUCK1,
+       STPMU1_BUCK2,
+       STPMU1_BUCK3,
+       STPMU1_BUCK4,
+       STPMU1_MAX_BUCK,
+};
+
+enum {
+       STPMU1_BUCK_MODE_HP,
+       STPMU1_BUCK_MODE_LP,
+};
+
+enum {
+       STPMU1_LDO1,
+       STPMU1_LDO2,
+       STPMU1_LDO3,
+       STPMU1_LDO4,
+       STPMU1_LDO5,
+       STPMU1_LDO6,
+       STPMU1_MAX_LDO,
+};
+
+enum {
+       STPMU1_LDO_MODE_NORMAL,
+       STPMU1_LDO_MODE_BYPASS,
+       STPMU1_LDO_MODE_SINK_SOURCE,
+};
+
+enum {
+       STPMU1_PWR_SW1,
+       STPMU1_PWR_SW2,
+       STPMU1_MAX_PWR_SW,
+};
+
+#endif
diff --git a/include/power/stpmu1.h b/include/power/stpmu1.h
deleted file mode 100644 (file)
index 5906fbf..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause */
-/*
- * Copyright (C) 2018, STMicroelectronics - All Rights Reserved
- */
-
-#ifndef __PMIC_STPMU1_H_
-#define __PMIC_STPMU1_H_
-
-#define STPMU1_MASK_RESET_BUCK         0x18
-#define STPMU1_BUCKX_CTRL_REG(buck)    (0x20 + (buck))
-#define STPMU1_VREF_CTRL_REG           0x24
-#define STPMU1_LDOX_CTRL_REG(ldo)      (0x25 + (ldo))
-#define STPMU1_USB_CTRL_REG            0x40
-#define STPMU1_NVM_USER_STATUS_REG     0xb8
-#define STPMU1_NVM_USER_CONTROL_REG    0xb9
-
-#define STPMU1_MASK_RESET_BUCK3                BIT(2)
-
-#define STPMU1_BUCK_EN                 BIT(0)
-#define STPMU1_BUCK_MODE               BIT(1)
-#define STPMU1_BUCK_OUTPUT_MASK                GENMASK(7, 2)
-#define STPMU1_BUCK_OUTPUT_SHIFT       2
-#define STPMU1_BUCK2_1200000V          (24 << STPMU1_BUCK_OUTPUT_SHIFT)
-#define STPMU1_BUCK2_1350000V          (30 << STPMU1_BUCK_OUTPUT_SHIFT)
-#define STPMU1_BUCK3_1800000V          (39 << STPMU1_BUCK_OUTPUT_SHIFT)
-
-#define STPMU1_VREF_EN                 BIT(0)
-
-#define STPMU1_LDO_EN                  BIT(0)
-#define STPMU1_LDO12356_OUTPUT_MASK    GENMASK(6, 2)
-#define STPMU1_LDO12356_OUTPUT_SHIFT   2
-#define STPMU1_LDO3_MODE               BIT(7)
-#define STPMU1_LDO3_DDR_SEL            31
-#define STPMU1_LDO3_1800000            (9 << STPMU1_LDO12356_OUTPUT_SHIFT)
-#define STPMU1_LDO4_UV                 3300000
-
-#define STPMU1_USB_BOOST_EN            BIT(0)
-#define STPMU1_USB_PWR_SW_EN           GENMASK(2, 1)
-
-#define STPMU1_NVM_USER_CONTROL_PROGRAM        BIT(0)
-#define STPMU1_NVM_USER_CONTROL_READ   BIT(1)
-
-#define STPMU1_NVM_USER_STATUS_BUSY    BIT(0)
-#define STPMU1_NVM_USER_STATUS_ERROR   BIT(1)
-
-#define STPMU1_DEFAULT_START_UP_DELAY_MS       1
-#define STPMU1_DEFAULT_STOP_DELAY_MS           5
-#define STPMU1_USB_BOOST_START_UP_DELAY_MS     10
-
-enum {
-       STPMU1_BUCK1,
-       STPMU1_BUCK2,
-       STPMU1_BUCK3,
-       STPMU1_BUCK4,
-       STPMU1_MAX_BUCK,
-};
-
-enum {
-       STPMU1_BUCK_MODE_HP,
-       STPMU1_BUCK_MODE_LP,
-};
-
-enum {
-       STPMU1_LDO1,
-       STPMU1_LDO2,
-       STPMU1_LDO3,
-       STPMU1_LDO4,
-       STPMU1_LDO5,
-       STPMU1_LDO6,
-       STPMU1_MAX_LDO,
-};
-
-enum {
-       STPMU1_LDO_MODE_NORMAL,
-       STPMU1_LDO_MODE_BYPASS,
-       STPMU1_LDO_MODE_SINK_SOURCE,
-};
-
-enum {
-       STPMU1_PWR_SW1,
-       STPMU1_PWR_SW2,
-       STPMU1_MAX_PWR_SW,
-};
-
-#endif