Merge tag 'linear-ranges-lib' of https://git.kernel.org/pub/scm/linux/kernel/git...
authorMark Brown <broonie@kernel.org>
Fri, 8 May 2020 17:20:51 +0000 (18:20 +0100)
committerMark Brown <broonie@kernel.org>
Fri, 8 May 2020 17:20:51 +0000 (18:20 +0100)
lib: Add linear ranges helper library and start using it

Series extracts a "linear ranges" helper out of the regulator
framework. Linear ranges helper is intended to help converting
real-world values to register values when conversion is linear. I
suspect this is useful also for power subsystem and possibly for clk.

Documentation/devicetree/bindings/regulator/maxim,max77826.yaml [new file with mode: 0644]
drivers/regulator/Kconfig
drivers/regulator/Makefile
drivers/regulator/ab8500.c
drivers/regulator/bd718x7-regulator.c
drivers/regulator/core.c
drivers/regulator/db8500-prcmu.c
drivers/regulator/max77826-regulator.c [new file with mode: 0644]
drivers/regulator/qcom_rpm-regulator.c
drivers/regulator/tps80031-regulator.c

diff --git a/Documentation/devicetree/bindings/regulator/maxim,max77826.yaml b/Documentation/devicetree/bindings/regulator/maxim,max77826.yaml
new file mode 100644 (file)
index 0000000..19cbd5e
--- /dev/null
@@ -0,0 +1,68 @@
+# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/regulator/maxim,max77826.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Maxim Integrated MAX77826 PMIC
+
+maintainers:
+  - Iskren Chernev <iskren.chernev@gmail.com>
+
+properties:
+  $nodename:
+    pattern: "pmic@[0-9a-f]{1,2}"
+  compatible:
+    enum:
+      - maxim,max77826
+
+  reg:
+    maxItems: 1
+
+  regulators:
+    type: object
+    allOf:
+      - $ref: regulator.yaml#
+    description: |
+      list of regulators provided by this controller, must be named
+      after their hardware counterparts LDO[1-15], BUCK and BUCKBOOST
+
+    patternProperties:
+      "^LDO([1-9]|1[0-5])$":
+        type: object
+        allOf:
+          - $ref: regulator.yaml#
+
+      "^BUCK|BUCKBOOST$":
+        type: object
+        allOf:
+          - $ref: regulator.yaml#
+
+    additionalProperties: false
+
+required:
+  - compatible
+  - reg
+  - regulators
+
+additionalProperties: false
+
+examples:
+  - |
+    i2c {
+        #address-cells = <1>;
+        #size-cells = <0>;
+
+        pmic@69 {
+            compatible = "maxim,max77826";
+            reg = <0x69>;
+
+            regulators {
+                LDO2 {
+                    regulator-min-microvolt = <650000>;
+                    regulator-max-microvolt = <3587500>;
+                };
+            };
+       };
+     };
+...
index f4447f5..8f677f5 100644 (file)
@@ -586,6 +586,16 @@ config REGULATOR_MAX77802
          Exynos5420/Exynos5800 SoCs to control various voltages.
          It includes support for control of voltage and ramp speed.
 
+config REGULATOR_MAX77826
+       tristate "Maxim 77826 regulator"
+       depends on I2C
+       select REGMAP_I2C
+       help
+         This driver controls a Maxim 77826 regulator via I2C bus.
+         The regulator include 15 LDOs, BUCK and BUCK BOOST regulator.
+         It includes support for control of output voltage. This
+         regulator is found on the Samsung Galaxy S5 (klte) smartphone.
+
 config REGULATOR_MC13XXX_CORE
        tristate
 
index 6610ee0..e8f1633 100644 (file)
@@ -74,6 +74,7 @@ obj-$(CONFIG_REGULATOR_MAX8998) += max8998.o
 obj-$(CONFIG_REGULATOR_MAX77686) += max77686-regulator.o
 obj-$(CONFIG_REGULATOR_MAX77693) += max77693-regulator.o
 obj-$(CONFIG_REGULATOR_MAX77802) += max77802-regulator.o
+obj-$(CONFIG_REGULATOR_MAX77826) += max77826-regulator.o
 obj-$(CONFIG_REGULATOR_MC13783) += mc13783-regulator.o
 obj-$(CONFIG_REGULATOR_MC13892) += mc13892-regulator.o
 obj-$(CONFIG_REGULATOR_MC13XXX_CORE) +=  mc13xxx-regulator-core.o
index f60e1b2..716ca5b 100644 (file)
@@ -139,17 +139,6 @@ static const unsigned int ldo_vintcore_voltages[] = {
        1350000,
 };
 
-static const unsigned int ldo_sdio_voltages[] = {
-       1160000,
-       1050000,
-       1100000,
-       1500000,
-       1800000,
-       2200000,
-       2910000,
-       3050000,
-};
-
 static const unsigned int fixed_1200000_voltage[] = {
        1200000,
 };
@@ -166,10 +155,6 @@ static const unsigned int fixed_2050000_voltage[] = {
        2050000,
 };
 
-static const unsigned int fixed_3300000_voltage[] = {
-       3300000,
-};
-
 static const unsigned int ldo_vana_voltages[] = {
        1050000,
        1075000,
@@ -192,13 +177,6 @@ static const unsigned int ldo_vaudio_voltages[] = {
        2600000,        /* Duplicated in Vaudio and IsoUicc Control register. */
 };
 
-static const unsigned int ldo_vdmic_voltages[] = {
-       1800000,
-       1900000,
-       2000000,
-       2850000,
-};
-
 static DEFINE_MUTEX(shared_mode_mutex);
 static struct ab8500_shared_mode ldo_anamic1_shared;
 static struct ab8500_shared_mode ldo_anamic2_shared;
index 8195736..1737bc9 100644 (file)
@@ -55,10 +55,15 @@ static int bd718xx_buck1234_set_ramp_delay(struct regulator_dev *rdev,
                                  BUCK_RAMPRATE_MASK, ramp_value << 6);
 }
 
-/* Bucks 1 to 4 support DVS. PWM mode is used when voltage is changed.
+/*
+ * On BD71837 (not on BD71847, BD71850, ...)
+ * Bucks 1 to 4 support DVS. PWM mode is used when voltage is changed.
  * Bucks 5 to 8 and LDOs can use PFM and must be disabled when voltage
  * is changed. Hence we return -EBUSY for these if voltage is changed
  * when BUCK/LDO is enabled.
+ *
+ * The LDO operation for BD71847 and BD71850 is icurrently unknown.
+ * It's safer to still assume they can't be changed when enabled.
  */
 static int bd718xx_set_voltage_sel_restricted(struct regulator_dev *rdev,
                                                    unsigned int sel)
@@ -88,6 +93,16 @@ static const struct regulator_ops bd718xx_pickable_range_ldo_ops = {
 };
 
 static const struct regulator_ops bd718xx_pickable_range_buck_ops = {
+       .enable = regulator_enable_regmap,
+       .disable = regulator_disable_regmap,
+       .is_enabled = regulator_is_enabled_regmap,
+       .list_voltage = regulator_list_voltage_pickable_linear_range,
+       .set_voltage_sel = regulator_set_voltage_sel_pickable_regmap,
+       .get_voltage_sel = regulator_get_voltage_sel_pickable_regmap,
+       .set_voltage_time_sel = regulator_set_voltage_time_sel,
+};
+
+static const struct regulator_ops bd71837_pickable_range_buck_ops = {
        .enable = regulator_enable_regmap,
        .disable = regulator_disable_regmap,
        .is_enabled = regulator_is_enabled_regmap,
@@ -116,6 +131,16 @@ static const struct regulator_ops bd718xx_ldo_regulator_nolinear_ops = {
 };
 
 static const struct regulator_ops bd718xx_buck_regulator_ops = {
+       .enable = regulator_enable_regmap,
+       .disable = regulator_disable_regmap,
+       .is_enabled = regulator_is_enabled_regmap,
+       .list_voltage = regulator_list_voltage_linear_range,
+       .set_voltage_sel = regulator_set_voltage_sel_regmap,
+       .get_voltage_sel = regulator_get_voltage_sel_regmap,
+       .set_voltage_time_sel = regulator_set_voltage_time_sel,
+};
+
+static const struct regulator_ops bd71837_buck_regulator_ops = {
        .enable = regulator_enable_regmap,
        .disable = regulator_disable_regmap,
        .is_enabled = regulator_is_enabled_regmap,
@@ -126,6 +151,17 @@ static const struct regulator_ops bd718xx_buck_regulator_ops = {
 };
 
 static const struct regulator_ops bd718xx_buck_regulator_nolinear_ops = {
+       .enable = regulator_enable_regmap,
+       .disable = regulator_disable_regmap,
+       .is_enabled = regulator_is_enabled_regmap,
+       .list_voltage = regulator_list_voltage_table,
+       .map_voltage = regulator_map_voltage_ascend,
+       .set_voltage_sel = regulator_set_voltage_sel_regmap,
+       .get_voltage_sel = regulator_get_voltage_sel_regmap,
+       .set_voltage_time_sel = regulator_set_voltage_time_sel,
+};
+
+static const struct regulator_ops bd71837_buck_regulator_nolinear_ops = {
        .enable = regulator_enable_regmap,
        .disable = regulator_disable_regmap,
        .is_enabled = regulator_is_enabled_regmap,
@@ -805,7 +841,7 @@ static const struct bd718xx_regulator_data bd71837_regulators[] = {
                        .of_match = of_match_ptr("BUCK5"),
                        .regulators_node = of_match_ptr("regulators"),
                        .id = BD718XX_BUCK5,
-                       .ops = &bd718xx_pickable_range_buck_ops,
+                       .ops = &bd71837_pickable_range_buck_ops,
                        .type = REGULATOR_VOLTAGE,
                        .n_voltages = BD71837_BUCK5_VOLTAGE_NUM,
                        .linear_ranges = bd71837_buck5_volts,
@@ -832,7 +868,7 @@ static const struct bd718xx_regulator_data bd71837_regulators[] = {
                        .of_match = of_match_ptr("BUCK6"),
                        .regulators_node = of_match_ptr("regulators"),
                        .id = BD718XX_BUCK6,
-                       .ops = &bd718xx_buck_regulator_ops,
+                       .ops = &bd71837_buck_regulator_ops,
                        .type = REGULATOR_VOLTAGE,
                        .n_voltages = BD71837_BUCK6_VOLTAGE_NUM,
                        .linear_ranges = bd71837_buck6_volts,
@@ -856,7 +892,7 @@ static const struct bd718xx_regulator_data bd71837_regulators[] = {
                        .of_match = of_match_ptr("BUCK7"),
                        .regulators_node = of_match_ptr("regulators"),
                        .id = BD718XX_BUCK7,
-                       .ops = &bd718xx_buck_regulator_nolinear_ops,
+                       .ops = &bd71837_buck_regulator_nolinear_ops,
                        .type = REGULATOR_VOLTAGE,
                        .volt_table = &bd718xx_3rd_nodvs_buck_volts[0],
                        .n_voltages = ARRAY_SIZE(bd718xx_3rd_nodvs_buck_volts),
@@ -878,7 +914,7 @@ static const struct bd718xx_regulator_data bd71837_regulators[] = {
                        .of_match = of_match_ptr("BUCK8"),
                        .regulators_node = of_match_ptr("regulators"),
                        .id = BD718XX_BUCK8,
-                       .ops = &bd718xx_buck_regulator_ops,
+                       .ops = &bd71837_buck_regulator_ops,
                        .type = REGULATOR_VOLTAGE,
                        .n_voltages = BD718XX_4TH_NODVS_BUCK_VOLTAGE_NUM,
                        .linear_ranges = bd718xx_4th_nodvs_buck_volts,
index c340505..ad14300 100644 (file)
@@ -5496,6 +5496,7 @@ static void regulator_summary_show_subtree(struct seq_file *s,
                seq_printf(s, "%*s%-*s ",
                           (level + 1) * 3 + 1, "",
                           30 - (level + 1) * 3,
+                          consumer->supply_name ? consumer->supply_name :
                           consumer->dev ? dev_name(consumer->dev) : "deviceless");
 
                switch (rdev->desc->type) {
index 88a2dcb..0ce6ec4 100644 (file)
@@ -181,7 +181,7 @@ static int db8500_regulator_switch_disable(struct regulator_dev *rdev)
                goto out;
        }
 
-       info->is_enabled = 0;
+       info->is_enabled = false;
 out:
        return ret;
 }
diff --git a/drivers/regulator/max77826-regulator.c b/drivers/regulator/max77826-regulator.c
new file mode 100644 (file)
index 0000000..502ab6a
--- /dev/null
@@ -0,0 +1,301 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+//
+// max77826-regulator.c  - regulator driver for Maxim MAX77826
+//
+// Author: Iskren Chernev <iskren.chernev@gmail.com>
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/err.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
+#include <linux/platform_device.h>
+#include <linux/regulator/driver.h>
+#include <linux/regulator/of_regulator.h>
+#include <linux/i2c.h>
+#include <linux/regmap.h>
+
+enum max77826_registers {
+       MAX77826_REG_INT_SRC = 0x00,
+       MAX77826_REG_SYS_INT,
+       MAX77826_REG_INT1,
+       MAX77826_REG_INT2,
+       MAX77826_REG_BB_INT,
+       MAX77826_REG_INT_SRC_M,
+       MAX77826_REG_TOPSYS_INT_M,
+       MAX77826_REG_INT1_M,
+       MAX77826_REG_INT2_M,
+       MAX77826_REG_BB_INT_M,
+       MAX77826_REG_TOPSYS_STAT,
+       MAX77826_REG_STAT1,
+       MAX77826_REG_STAT2,
+       MAX77826_REG_BB_STAT,
+       /* 0x0E - 0x0F: Reserved */
+       MAX77826_REG_LDO_OPMD1 = 0x10,
+       MAX77826_REG_LDO_OPMD2,
+       MAX77826_REG_LDO_OPMD3,
+       MAX77826_REG_LDO_OPMD4,
+       MAX77826_REG_B_BB_OPMD,
+       /* 0x15 - 0x1F: Reserved */
+       MAX77826_REG_LDO1_CFG = 0x20,
+       MAX77826_REG_LDO2_CFG,
+       MAX77826_REG_LDO3_CFG,
+       MAX77826_REG_LDO4_CFG,
+       MAX77826_REG_LDO5_CFG,
+       MAX77826_REG_LDO6_CFG,
+       MAX77826_REG_LDO7_CFG,
+       MAX77826_REG_LDO8_CFG,
+       MAX77826_REG_LDO9_CFG,
+       MAX77826_REG_LDO10_CFG,
+       MAX77826_REG_LDO11_CFG,
+       MAX77826_REG_LDO12_CFG,
+       MAX77826_REG_LDO13_CFG,
+       MAX77826_REG_LDO14_CFG,
+       MAX77826_REG_LDO15_CFG,
+       /* 0x2F: Reserved */
+       MAX77826_REG_BUCK_CFG = 0x30,
+       MAX77826_REG_BUCK_VOUT,
+       MAX77826_REG_BB_CFG,
+       MAX77826_REG_BB_VOUT,
+       /* 0x34 - 0x3F: Reserved */
+       MAX77826_REG_BUCK_SS_FREQ = 0x40,
+       MAX77826_REG_UVLO_FALL,
+       /* 0x42 - 0xCE: Reserved */
+       MAX77826_REG_DEVICE_ID = 0xCF,
+};
+
+enum max77826_regulators {
+       MAX77826_LDO1 = 0,
+       MAX77826_LDO2,
+       MAX77826_LDO3,
+       MAX77826_LDO4,
+       MAX77826_LDO5,
+       MAX77826_LDO6,
+       MAX77826_LDO7,
+       MAX77826_LDO8,
+       MAX77826_LDO9,
+       MAX77826_LDO10,
+       MAX77826_LDO11,
+       MAX77826_LDO12,
+       MAX77826_LDO13,
+       MAX77826_LDO14,
+       MAX77826_LDO15,
+       MAX77826_BUCK,
+       MAX77826_BUCKBOOST,
+       MAX77826_MAX_REGULATORS,
+};
+
+#define MAX77826_MASK_LDO              0x7f
+#define MAX77826_MASK_BUCK             0xff
+#define MAX77826_MASK_BUCKBOOST                0x7f
+#define MAX77826_BUCK_RAMP_DELAY       12500
+
+/* values in mV */
+/* for LDO1-3 */
+#define MAX77826_NMOS_LDO_VOLT_MIN     600000
+#define MAX77826_NMOS_LDO_VOLT_MAX     2187500
+#define MAX77826_NMOS_LDO_VOLT_STEP    12500
+
+/* for LDO4-15 */
+#define MAX77826_PMOS_LDO_VOLT_MIN     800000
+#define MAX77826_PMOS_LDO_VOLT_MAX     3975000
+#define MAX77826_PMOS_LDO_VOLT_STEP    25000
+
+/* for BUCK */
+#define MAX77826_BUCK_VOLT_MIN         500000
+#define MAX77826_BUCK_VOLT_MAX         1800000
+#define MAX77826_BUCK_VOLT_STEP                6250
+
+/* for BUCKBOOST */
+#define MAX77826_BUCKBOOST_VOLT_MIN    2600000
+#define MAX77826_BUCKBOOST_VOLT_MAX    4187500
+#define MAX77826_BUCKBOOST_VOLT_STEP   12500
+#define MAX77826_VOLT_RANGE(_type)                                     \
+       ((MAX77826_ ## _type ## _VOLT_MAX -                             \
+         MAX77826_ ## _type ## _VOLT_MIN) /                            \
+        MAX77826_ ## _type ## _VOLT_STEP + 1)
+
+#define MAX77826_LDO(_id, _type)                                       \
+       [MAX77826_LDO ## _id] = {                                       \
+               .id = MAX77826_LDO ## _id,                              \
+               .name = "LDO"#_id,                                      \
+               .of_match = of_match_ptr("LDO"#_id),                    \
+               .regulators_node = "regulators",                        \
+               .ops = &max77826_most_ops,                              \
+               .min_uV = MAX77826_ ## _type ## _LDO_VOLT_MIN,          \
+               .uV_step = MAX77826_ ## _type ## _LDO_VOLT_STEP,        \
+               .n_voltages = MAX77826_VOLT_RANGE(_type ## _LDO),       \
+               .enable_reg = MAX77826_REG_LDO_OPMD1 + (_id - 1) / 4,   \
+               .enable_mask = BIT(((_id - 1) % 4) * 2 + 1),            \
+               .vsel_reg = MAX77826_REG_LDO1_CFG + (_id - 1),          \
+               .vsel_mask = MAX77826_MASK_LDO,                         \
+               .owner = THIS_MODULE,                                   \
+       }
+
+#define MAX77826_BUCK(_idx, _id, _ops)                                 \
+       [MAX77826_ ## _id] = {                                          \
+               .id = MAX77826_ ## _id,                                 \
+               .name = #_id,                                           \
+               .of_match = of_match_ptr(#_id),                         \
+               .regulators_node = "regulators",                        \
+               .ops = &_ops,                                           \
+               .min_uV =  MAX77826_ ## _id ## _VOLT_MIN,               \
+               .uV_step = MAX77826_ ## _id ## _VOLT_STEP,              \
+               .n_voltages = MAX77826_VOLT_RANGE(_id),                 \
+               .enable_reg = MAX77826_REG_B_BB_OPMD,                   \
+               .enable_mask = BIT(_idx * 2 + 1),                       \
+               .vsel_reg = MAX77826_REG_BUCK_VOUT + _idx * 2,          \
+               .vsel_mask = MAX77826_MASK_ ## _id,                     \
+               .owner = THIS_MODULE,                                   \
+       }
+
+
+
+struct max77826_regulator_info {
+       struct regmap *regmap;
+       struct regulator_desc *rdesc;
+};
+
+static const struct regmap_config max77826_regmap_config = {
+       .reg_bits = 8,
+       .val_bits = 8,
+       .max_register = MAX77826_REG_DEVICE_ID,
+};
+
+static int max77826_set_voltage_time_sel(struct regulator_dev *,
+                               unsigned int old_selector,
+                               unsigned int new_selector);
+
+static const struct regulator_ops max77826_most_ops = {
+       .enable                 = regulator_enable_regmap,
+       .disable                = regulator_disable_regmap,
+       .is_enabled             = regulator_is_enabled_regmap,
+       .list_voltage           = regulator_list_voltage_linear,
+       .map_voltage            = regulator_map_voltage_linear,
+       .get_voltage_sel        = regulator_get_voltage_sel_regmap,
+       .set_voltage_sel        = regulator_set_voltage_sel_regmap,
+};
+
+static const struct regulator_ops max77826_buck_ops = {
+       .enable                 = regulator_enable_regmap,
+       .disable                = regulator_disable_regmap,
+       .is_enabled             = regulator_is_enabled_regmap,
+       .list_voltage           = regulator_list_voltage_linear,
+       .map_voltage            = regulator_map_voltage_linear,
+       .get_voltage_sel        = regulator_get_voltage_sel_regmap,
+       .set_voltage_sel        = regulator_set_voltage_sel_regmap,
+       .set_voltage_time_sel   = max77826_set_voltage_time_sel,
+};
+
+static struct regulator_desc max77826_regulators_desc[] = {
+       MAX77826_LDO(1, NMOS),
+       MAX77826_LDO(2, NMOS),
+       MAX77826_LDO(3, NMOS),
+       MAX77826_LDO(4, PMOS),
+       MAX77826_LDO(5, PMOS),
+       MAX77826_LDO(6, PMOS),
+       MAX77826_LDO(7, PMOS),
+       MAX77826_LDO(8, PMOS),
+       MAX77826_LDO(9, PMOS),
+       MAX77826_LDO(10, PMOS),
+       MAX77826_LDO(11, PMOS),
+       MAX77826_LDO(12, PMOS),
+       MAX77826_LDO(13, PMOS),
+       MAX77826_LDO(14, PMOS),
+       MAX77826_LDO(15, PMOS),
+       MAX77826_BUCK(0, BUCK, max77826_buck_ops),
+       MAX77826_BUCK(1, BUCKBOOST, max77826_most_ops),
+};
+
+static int max77826_set_voltage_time_sel(struct regulator_dev *rdev,
+                               unsigned int old_selector,
+                               unsigned int new_selector)
+{
+       if (new_selector > old_selector) {
+               return DIV_ROUND_UP(MAX77826_BUCK_VOLT_STEP *
+                               (new_selector - old_selector),
+                               MAX77826_BUCK_RAMP_DELAY);
+       }
+
+       return 0;
+}
+
+static int max77826_read_device_id(struct regmap *regmap, struct device *dev)
+{
+       unsigned int device_id;
+       int res;
+
+       res = regmap_read(regmap, MAX77826_REG_DEVICE_ID, &device_id);
+       if (!res)
+               dev_dbg(dev, "DEVICE_ID: 0x%x\n", device_id);
+
+       return res;
+}
+
+static int max77826_i2c_probe(struct i2c_client *client)
+{
+       struct device *dev = &client->dev;
+       struct max77826_regulator_info *info;
+       struct regulator_config config = {};
+       struct regulator_dev *rdev;
+       struct regmap *regmap;
+       int i;
+
+       info = devm_kzalloc(dev, sizeof(struct max77826_regulator_info),
+                               GFP_KERNEL);
+       if (!info)
+               return -ENOMEM;
+
+       info->rdesc = max77826_regulators_desc;
+       regmap = devm_regmap_init_i2c(client, &max77826_regmap_config);
+       if (IS_ERR(regmap)) {
+               dev_err(dev, "Failed to allocate regmap!\n");
+               return PTR_ERR(regmap);
+       }
+
+       info->regmap = regmap;
+       i2c_set_clientdata(client, info);
+
+       config.dev = dev;
+       config.regmap = regmap;
+       config.driver_data = info;
+
+       for (i = 0; i < MAX77826_MAX_REGULATORS; i++) {
+               rdev = devm_regulator_register(dev,
+                                              &max77826_regulators_desc[i],
+                                              &config);
+               if (IS_ERR(rdev)) {
+                       dev_err(dev, "Failed to register regulator!\n");
+                       return PTR_ERR(rdev);
+               }
+       }
+
+       return max77826_read_device_id(regmap, dev);
+}
+
+static const struct of_device_id max77826_of_match[] = {
+       { .compatible = "maxim,max77826" },
+       { /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(of, max77826_of_match);
+
+static const struct i2c_device_id max77826_id[] = {
+       { "max77826-regulator" },
+       { /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(i2c, max77826_id);
+
+static struct i2c_driver max77826_regulator_driver = {
+       .driver = {
+               .name = "max77826",
+               .of_match_table = of_match_ptr(max77826_of_match),
+       },
+       .probe_new = max77826_i2c_probe,
+       .id_table = max77826_id,
+};
+module_i2c_driver(max77826_regulator_driver);
+
+MODULE_AUTHOR("Iskren Chernev <iskren.chernev@gmail.com>");
+MODULE_DESCRIPTION("MAX77826 PMIC regulator driver");
+MODULE_LICENSE("GPL");
index a4562a2..0066f85 100644 (file)
@@ -604,16 +604,6 @@ static const struct qcom_rpm_reg pm8921_smps = {
        .supports_force_mode_bypass = false,
 };
 
-static const struct qcom_rpm_reg pm8921_ftsmps = {
-       .desc.linear_ranges = ftsmps_ranges,
-       .desc.n_linear_ranges = ARRAY_SIZE(ftsmps_ranges),
-       .desc.n_voltages = 101,
-       .desc.ops = &uV_ops,
-       .parts = &rpm8960_smps_parts,
-       .supports_force_mode_auto = true,
-       .supports_force_mode_bypass = false,
-};
-
 static const struct qcom_rpm_reg pm8921_ncp = {
        .desc.linear_ranges = ncp_ranges,
        .desc.n_linear_ranges = ARRAY_SIZE(ncp_ranges),
index 85a6a8c..a29e652 100644 (file)
@@ -271,7 +271,7 @@ static int tps80031_vbus_is_enabled(struct regulator_dev *rdev)
 {
        struct tps80031_regulator *ri = rdev_get_drvdata(rdev);
        struct device *parent = to_tps80031_dev(rdev);
-       int ret = -EIO;
+       int ret;
        uint8_t ctrl1 = 0;
        uint8_t ctrl3 = 0;
 
@@ -322,7 +322,7 @@ static int tps80031_vbus_disable(struct regulator_dev *rdev)
 {
        struct tps80031_regulator *ri = rdev_get_drvdata(rdev);
        struct device *parent = to_tps80031_dev(rdev);
-       int ret = 0;
+       int ret;
 
        if (ri->config_flags & TPS80031_VBUS_DISCHRG_EN_PDN) {
                ret = tps80031_write(parent, TPS80031_SLAVE_ID2,
@@ -530,7 +530,8 @@ static int tps80031_regulator_config(struct device *parent,
        case TPS80031_REGULATOR_LDOUSB:
                if (ri->config_flags & (TPS80031_USBLDO_INPUT_VSYS |
                        TPS80031_USBLDO_INPUT_PMID)) {
-                       unsigned val = 0;
+                       unsigned val;
+
                        if (ri->config_flags & TPS80031_USBLDO_INPUT_VSYS)
                                val = MISC2_LDOUSB_IN_VSYS;
                        else