]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
Merge remote-tracking branches 'regulator/topic/mt6380', 'regulator/topic/mtk', ...
authorMark Brown <broonie@kernel.org>
Mon, 4 Sep 2017 16:45:46 +0000 (17:45 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 4 Sep 2017 16:45:46 +0000 (17:45 +0100)
14 files changed:
Documentation/devicetree/bindings/regulator/mt6311-regulator.txt
Documentation/devicetree/bindings/regulator/mt6323-regulator.txt
Documentation/devicetree/bindings/regulator/mt6380-regulator.txt [new file with mode: 0644]
Documentation/devicetree/bindings/regulator/mt6397-regulator.txt
Documentation/devicetree/bindings/regulator/pwm-regulator.txt
drivers/regulator/Kconfig
drivers/regulator/Makefile
drivers/regulator/mt6380-regulator.c [new file with mode: 0644]
drivers/regulator/pv88090-regulator.c
drivers/regulator/pv88090-regulator.h
drivers/regulator/pwm-regulator.c
drivers/regulator/qcom_rpm-regulator.c
drivers/regulator/qcom_smd-regulator.c
include/linux/regulator/mt6380-regulator.h [new file with mode: 0644]

index 02649d8b3f5a372500fedfff7db12ae496a9dfba..84d544d8c1b1424546485a9619d45aa27e8de017 100644 (file)
@@ -1,4 +1,4 @@
-Mediatek MT6311 Regulator Driver
+Mediatek MT6311 Regulator
 
 Required properties:
 - compatible: "mediatek,mt6311-regulator"
index c35d878b0960415afe5680320fad177f9764edf3..a48749db4df36810961dbe1d74246487b7e3c26b 100644 (file)
@@ -1,4 +1,4 @@
-Mediatek MT6323 Regulator Driver
+Mediatek MT6323 Regulator
 
 All voltage regulators are defined as subnodes of the regulators node. A list
 of regulators provided by this controller are defined as subnodes of the
diff --git a/Documentation/devicetree/bindings/regulator/mt6380-regulator.txt b/Documentation/devicetree/bindings/regulator/mt6380-regulator.txt
new file mode 100644 (file)
index 0000000..0058441
--- /dev/null
@@ -0,0 +1,89 @@
+MediaTek MT6380 Regulator
+
+All voltage regulators provided by the MT6380 PMIC are described as the
+subnodes of the MT6380 regulators node. Each regulator is named according
+to its regulator type, buck-<name> and ldo-<name>. The definition for each
+of these nodes is defined using the standard binding for regulators at
+Documentation/devicetree/bindings/regulator/regulator.txt.
+
+The valid names for regulators are:
+BUCK:
+  buck-core1, buck-vcore, buck-vrf
+LDO:
+  ldo-vm ,ldo-va , ldo-vphy, ldo-vddr, ldo-vt
+
+Example:
+
+       regulators {
+               compatible = "mediatek,mt6380-regulator";
+
+               mt6380_vcpu_reg: buck-vcore1 {
+                       regulator-name = "vcore1";
+                       regulator-min-microvolt = < 600000>;
+                       regulator-max-microvolt = <1393750>;
+                       regulator-ramp-delay = <6250>;
+                       regulator-always-on;
+                       regulator-boot-on;
+               };
+
+               mt6380_vcore_reg: buck-vcore {
+                       regulator-name = "vcore";
+                       regulator-min-microvolt = <600000>;
+                       regulator-max-microvolt = <1393750>;
+                       regulator-ramp-delay = <6250>;
+               };
+
+               mt6380_vrf_reg: buck-vrf {
+                       regulator-name = "vrf";
+                       regulator-min-microvolt = <1200000>;
+                       regulator-max-microvolt = <1575000>;
+                       regulator-ramp-delay = <0>;
+                       regulator-always-on;
+                       regulator-boot-on;
+               };
+
+               mt6380_vm_reg: ldo-vm {
+                       regulator-name = "vm";
+                       regulator-min-microvolt = <1050000>;
+                       regulator-max-microvolt = <1400000>;
+                       regulator-ramp-delay = <0>;
+                       regulator-always-on;
+                       regulator-boot-on;
+               };
+
+               mt6380_va_reg: ldo-va {
+                       regulator-name = "va";
+                       regulator-min-microvolt = <2200000>;
+                       regulator-max-microvolt = <3300000>;
+                       regulator-ramp-delay = <0>;
+                       regulator-always-on;
+                       regulator-boot-on;
+               };
+
+               mt6380_vphy_reg: ldo-vphy {
+                       regulator-name = "vphy";
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <1800000>;
+                       regulator-ramp-delay = <0>;
+                       regulator-always-on;
+                       regulator-boot-on;
+               };
+
+               mt6380_vddr_reg: ldo-vddr {
+                       regulator-name = "vddr";
+                       regulator-min-microvolt = <1240000>;
+                       regulator-max-microvolt = <1840000>;
+                       regulator-ramp-delay = <0>;
+                       regulator-always-on;
+                       regulator-boot-on;
+               };
+
+               mt6380_vt_reg: ldo-vt {
+                       regulator-name = "vt";
+                       regulator-min-microvolt = <2200000>;
+                       regulator-max-microvolt = <3300000>;
+                       regulator-ramp-delay = <0>;
+                       regulator-always-on;
+                       regulator-boot-on;
+               };
+       };
index a42b1d6e98638730773f49f0e46501925d90bf04..01141fb0087569a265832266ba8b23675d94359f 100644 (file)
@@ -1,4 +1,4 @@
-Mediatek MT6397 Regulator Driver
+Mediatek MT6397 Regulator
 
 Required properties:
 - compatible: "mediatek,mt6397-regulator"
index bf85aa9ad6a7e43a8334fe042f8d39e042bf59db..3d78d507e29fee9390cdb9525549deff250db8a7 100644 (file)
@@ -71,7 +71,7 @@ Continuous Voltage With Enable GPIO Example:
                 * Inverted PWM logic, and the duty cycle range is limited
                 * to 30%-70%.
                 */
-               pwm-dutycycle-range <700 300>; /* */
+               pwm-dutycycle-range <700 300>; /* */
        };
 
 Voltage Table Example:
index 99b9362331b56ad5f7b6aae08c7c290e80c269e9..1205e82971d0d0c8b612407b593d2bbfeb1d4d1d 100644 (file)
@@ -559,6 +559,15 @@ config REGULATOR_MT6323
          This driver supports the control of different power rails of device
          through regulator interface.
 
+config REGULATOR_MT6380
+       tristate "MediaTek MT6380 PMIC"
+       depends on MTK_PMIC_WRAP
+       help
+         Say y here to select this option to enable the power regulator of
+         MediaTek MT6380 PMIC.
+         This driver supports the control of different power rails of device
+         through regulator interface.
+
 config REGULATOR_MT6397
        tristate "MediaTek MT6397 PMIC"
        depends on MFD_MT6397
index 95b1e86ae692ba897b3b80f2d2e6d99b70006e88..81514b8c3932f6676c79cc64077c924573195e25 100644 (file)
@@ -72,6 +72,7 @@ obj-$(CONFIG_REGULATOR_MC13892) += mc13892-regulator.o
 obj-$(CONFIG_REGULATOR_MC13XXX_CORE) +=  mc13xxx-regulator-core.o
 obj-$(CONFIG_REGULATOR_MT6311) += mt6311-regulator.o
 obj-$(CONFIG_REGULATOR_MT6323) += mt6323-regulator.o
+obj-$(CONFIG_REGULATOR_MT6380) += mt6380-regulator.o
 obj-$(CONFIG_REGULATOR_MT6397) += mt6397-regulator.o
 obj-$(CONFIG_REGULATOR_QCOM_RPM) += qcom_rpm-regulator.o
 obj-$(CONFIG_REGULATOR_QCOM_SMD_RPM) += qcom_smd-regulator.o
diff --git a/drivers/regulator/mt6380-regulator.c b/drivers/regulator/mt6380-regulator.c
new file mode 100644 (file)
index 0000000..127dd72
--- /dev/null
@@ -0,0 +1,352 @@
+/*
+ * Copyright (c) 2017 MediaTek Inc.
+ * Author: Chenglin Xu <chenglin.xu@mediatek.com>
+ *
+ * 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.
+ */
+
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/platform_device.h>
+#include <linux/regmap.h>
+#include <linux/regulator/driver.h>
+#include <linux/regulator/machine.h>
+#include <linux/regulator/mt6380-regulator.h>
+#include <linux/regulator/of_regulator.h>
+
+/* PMIC Registers */
+#define MT6380_ALDO_CON_0                         0x0000
+#define MT6380_BTLDO_CON_0                        0x0004
+#define MT6380_COMP_CON_0                         0x0008
+#define MT6380_CPUBUCK_CON_0                      0x000C
+#define MT6380_CPUBUCK_CON_1                      0x0010
+#define MT6380_CPUBUCK_CON_2                      0x0014
+#define MT6380_DDRLDO_CON_0                       0x0018
+#define MT6380_MLDO_CON_0                         0x001C
+#define MT6380_PALDO_CON_0                        0x0020
+#define MT6380_PHYLDO_CON_0                       0x0024
+#define MT6380_SIDO_CON_0                         0x0028
+#define MT6380_SIDO_CON_1                         0x002C
+#define MT6380_SIDO_CON_2                         0x0030
+#define MT6380_SLDO_CON_0                         0x0034
+#define MT6380_TLDO_CON_0                         0x0038
+#define MT6380_STARTUP_CON_0                      0x003C
+#define MT6380_STARTUP_CON_1                      0x0040
+#define MT6380_SMPS_TOP_CON_0                     0x0044
+#define MT6380_SMPS_TOP_CON_1                     0x0048
+#define MT6380_ANA_CTRL_0                         0x0050
+#define MT6380_ANA_CTRL_1                         0x0054
+#define MT6380_ANA_CTRL_2                         0x0058
+#define MT6380_ANA_CTRL_3                         0x005C
+#define MT6380_ANA_CTRL_4                         0x0060
+#define MT6380_SPK_CON9                           0x0064
+#define MT6380_SPK_CON11                          0x0068
+#define MT6380_SPK_CON12                          0x006A
+#define MT6380_CLK_CTRL                           0x0070
+#define MT6380_PINMUX_CTRL                        0x0074
+#define MT6380_IO_CTRL                            0x0078
+#define MT6380_SLP_MODE_CTRL_0                    0x007C
+#define MT6380_SLP_MODE_CTRL_1                    0x0080
+#define MT6380_SLP_MODE_CTRL_2                    0x0084
+#define MT6380_SLP_MODE_CTRL_3                    0x0088
+#define MT6380_SLP_MODE_CTRL_4                    0x008C
+#define MT6380_SLP_MODE_CTRL_5                    0x0090
+#define MT6380_SLP_MODE_CTRL_6                    0x0094
+#define MT6380_SLP_MODE_CTRL_7                    0x0098
+#define MT6380_SLP_MODE_CTRL_8                    0x009C
+#define MT6380_FCAL_CTRL_0                        0x00A0
+#define MT6380_FCAL_CTRL_1                        0x00A4
+#define MT6380_LDO_CTRL_0                         0x00A8
+#define MT6380_LDO_CTRL_1                         0x00AC
+#define MT6380_LDO_CTRL_2                         0x00B0
+#define MT6380_LDO_CTRL_3                         0x00B4
+#define MT6380_LDO_CTRL_4                         0x00B8
+#define MT6380_DEBUG_CTRL_0                       0x00BC
+#define MT6380_EFU_CTRL_0                         0x0200
+#define MT6380_EFU_CTRL_1                         0x0201
+#define MT6380_EFU_CTRL_2                         0x0202
+#define MT6380_EFU_CTRL_3                         0x0203
+#define MT6380_EFU_CTRL_4                         0x0204
+#define MT6380_EFU_CTRL_5                         0x0205
+#define MT6380_EFU_CTRL_6                         0x0206
+#define MT6380_EFU_CTRL_7                         0x0207
+#define MT6380_EFU_CTRL_8                         0x0208
+
+#define MT6380_REGULATOR_MODE_AUTO     0
+#define MT6380_REGULATOR_MODE_FORCE_PWM        1
+
+/*
+ * mt6380 regulators' information
+ *
+ * @desc: standard fields of regulator description
+ * @vselon_reg: Register sections for hardware control mode of bucks
+ * @modeset_reg: Register for controlling the buck/LDO control mode
+ * @modeset_mask: Mask for controlling the buck/LDO control mode
+ */
+struct mt6380_regulator_info {
+       struct regulator_desc desc;
+       u32 vselon_reg;
+       u32 modeset_reg;
+       u32 modeset_mask;
+};
+
+#define MT6380_BUCK(match, vreg, min, max, step, volt_ranges, enreg,   \
+                   vosel, vosel_mask, enbit, voselon, _modeset_reg,    \
+                   _modeset_mask)                                      \
+[MT6380_ID_##vreg] = {                                                 \
+       .desc = {                                                       \
+               .name = #vreg,                                          \
+               .of_match = of_match_ptr(match),                        \
+               .ops = &mt6380_volt_range_ops,                          \
+               .type = REGULATOR_VOLTAGE,                              \
+               .id = MT6380_ID_##vreg,                                 \
+               .owner = THIS_MODULE,                                   \
+               .n_voltages = ((max) - (min)) / (step) + 1,             \
+               .linear_ranges = volt_ranges,                           \
+               .n_linear_ranges = ARRAY_SIZE(volt_ranges),             \
+               .vsel_reg = vosel,                                      \
+               .vsel_mask = vosel_mask,                                \
+               .enable_reg = enreg,                                    \
+               .enable_mask = BIT(enbit),                              \
+       },                                                              \
+       .vselon_reg = voselon,                                          \
+       .modeset_reg = _modeset_reg,                                    \
+       .modeset_mask = _modeset_mask,                                  \
+}
+
+#define MT6380_LDO(match, vreg, ldo_volt_table, enreg, enbit, vosel,   \
+                  vosel_mask, _modeset_reg, _modeset_mask)             \
+[MT6380_ID_##vreg] = {                                                 \
+       .desc = {                                                       \
+               .name = #vreg,                                          \
+               .of_match = of_match_ptr(match),                        \
+               .ops = &mt6380_volt_table_ops,                          \
+               .type = REGULATOR_VOLTAGE,                              \
+               .id = MT6380_ID_##vreg,                                 \
+               .owner = THIS_MODULE,                                   \
+               .n_voltages = ARRAY_SIZE(ldo_volt_table),               \
+               .volt_table = ldo_volt_table,                           \
+               .vsel_reg = vosel,                                      \
+               .vsel_mask = vosel_mask,                                \
+               .enable_reg = enreg,                                    \
+               .enable_mask = BIT(enbit),                              \
+       },                                                              \
+       .modeset_reg = _modeset_reg,                                    \
+       .modeset_mask = _modeset_mask,                                  \
+}
+
+#define MT6380_REG_FIXED(match, vreg, enreg, enbit, volt,              \
+                        _modeset_reg, _modeset_mask)                   \
+[MT6380_ID_##vreg] = {                                                 \
+       .desc = {                                                       \
+               .name = #vreg,                                          \
+               .of_match = of_match_ptr(match),                        \
+               .ops = &mt6380_volt_fixed_ops,                          \
+               .type = REGULATOR_VOLTAGE,                              \
+               .id = MT6380_ID_##vreg,                                 \
+               .owner = THIS_MODULE,                                   \
+               .n_voltages = 1,                                        \
+               .enable_reg = enreg,                                    \
+               .enable_mask = BIT(enbit),                              \
+               .min_uV = volt,                                         \
+       },                                                              \
+       .modeset_reg = _modeset_reg,                                    \
+       .modeset_mask = _modeset_mask,                                  \
+}
+
+static const struct regulator_linear_range buck_volt_range1[] = {
+       REGULATOR_LINEAR_RANGE(600000, 0, 0xfe, 6250),
+};
+
+static const struct regulator_linear_range buck_volt_range2[] = {
+       REGULATOR_LINEAR_RANGE(600000, 0, 0xfe, 6250),
+};
+
+static const struct regulator_linear_range buck_volt_range3[] = {
+       REGULATOR_LINEAR_RANGE(1200000, 0, 0x3c, 25000),
+};
+
+static const u32 ldo_volt_table1[] = {
+       1400000, 1350000, 1300000, 1250000, 1200000, 1150000, 1100000, 1050000,
+};
+
+static const u32 ldo_volt_table2[] = {
+       2200000, 3300000,
+};
+
+static const u32 ldo_volt_table3[] = {
+       1240000, 1390000, 1540000, 1840000,
+};
+
+static const u32 ldo_volt_table4[] = {
+       2200000, 3300000,
+};
+
+static int mt6380_regulator_set_mode(struct regulator_dev *rdev,
+                                    unsigned int mode)
+{
+       int ret, val = 0;
+       struct mt6380_regulator_info *info = rdev_get_drvdata(rdev);
+
+       switch (mode) {
+       case REGULATOR_MODE_NORMAL:
+               val = MT6380_REGULATOR_MODE_AUTO;
+               break;
+       case REGULATOR_MODE_FAST:
+               val = MT6380_REGULATOR_MODE_FORCE_PWM;
+               break;
+       default:
+               return -EINVAL;
+       }
+
+       val <<= ffs(info->modeset_mask) - 1;
+
+       ret = regmap_update_bits(rdev->regmap, info->modeset_reg,
+                                info->modeset_mask, val);
+
+       return ret;
+}
+
+static unsigned int mt6380_regulator_get_mode(struct regulator_dev *rdev)
+{
+       unsigned int val;
+       unsigned int mode;
+       int ret;
+       struct mt6380_regulator_info *info = rdev_get_drvdata(rdev);
+
+       ret = regmap_read(rdev->regmap, info->modeset_reg, &val);
+       if (ret < 0)
+               return ret;
+
+       val &= info->modeset_mask;
+       val >>= ffs(info->modeset_mask) - 1;
+
+       switch (val) {
+       case MT6380_REGULATOR_MODE_AUTO:
+               mode = REGULATOR_MODE_NORMAL;
+               break;
+       case MT6380_REGULATOR_MODE_FORCE_PWM:
+               mode = REGULATOR_MODE_FAST;
+               break;
+       default:
+               return -EINVAL;
+       }
+
+       return mode;
+}
+
+static const struct regulator_ops mt6380_volt_range_ops = {
+       .list_voltage = regulator_list_voltage_linear_range,
+       .map_voltage = regulator_map_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,
+       .enable = regulator_enable_regmap,
+       .disable = regulator_disable_regmap,
+       .is_enabled = regulator_is_enabled_regmap,
+       .set_mode = mt6380_regulator_set_mode,
+       .get_mode = mt6380_regulator_get_mode,
+};
+
+static const struct regulator_ops mt6380_volt_table_ops = {
+       .list_voltage = regulator_list_voltage_table,
+       .map_voltage = regulator_map_voltage_iterate,
+       .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,
+       .enable = regulator_enable_regmap,
+       .disable = regulator_disable_regmap,
+       .is_enabled = regulator_is_enabled_regmap,
+       .set_mode = mt6380_regulator_set_mode,
+       .get_mode = mt6380_regulator_get_mode,
+};
+
+static const struct regulator_ops mt6380_volt_fixed_ops = {
+       .list_voltage = regulator_list_voltage_linear,
+       .enable = regulator_enable_regmap,
+       .disable = regulator_disable_regmap,
+       .is_enabled = regulator_is_enabled_regmap,
+       .set_mode = mt6380_regulator_set_mode,
+       .get_mode = mt6380_regulator_get_mode,
+};
+
+/* The array is indexed by id(MT6380_ID_XXX) */
+static struct mt6380_regulator_info mt6380_regulators[] = {
+       MT6380_BUCK("buck-vcore1", VCPU, 600000, 1393750, 6250,
+                   buck_volt_range1, MT6380_ANA_CTRL_3, MT6380_ANA_CTRL_1,
+                   0xfe, 3, MT6380_ANA_CTRL_1,
+                   MT6380_CPUBUCK_CON_0, 0x8000000),
+       MT6380_BUCK("buck-vcore", VCORE, 600000, 1393750, 6250,
+                   buck_volt_range2, MT6380_ANA_CTRL_3, MT6380_ANA_CTRL_2,
+                   0xfe, 2, MT6380_ANA_CTRL_2, MT6380_SIDO_CON_0, 0x1000000),
+       MT6380_BUCK("buck-vrf", VRF, 1200000, 1575000, 25000,
+                   buck_volt_range3, MT6380_ANA_CTRL_3, MT6380_SIDO_CON_0,
+                   0x78, 1, MT6380_SIDO_CON_0, MT6380_SIDO_CON_0, 0x8000),
+       MT6380_LDO("ldo-vm", VMLDO, ldo_volt_table1, MT6380_LDO_CTRL_0,
+                  1, MT6380_MLDO_CON_0, 0xE000, MT6380_ANA_CTRL_1, 0x4000000),
+       MT6380_LDO("ldo-va", VALDO, ldo_volt_table2, MT6380_LDO_CTRL_0,
+                  2, MT6380_ALDO_CON_0, 0x400, MT6380_ALDO_CON_0, 0x20),
+       MT6380_REG_FIXED("ldo-vphy", VPHYLDO, MT6380_LDO_CTRL_0, 7, 1800000,
+                        MT6380_PHYLDO_CON_0, 0x80),
+       MT6380_LDO("ldo-vddr", VDDRLDO, ldo_volt_table3, MT6380_LDO_CTRL_0,
+                  8, MT6380_DDRLDO_CON_0, 0x3000, MT6380_DDRLDO_CON_0, 0x80),
+       MT6380_LDO("ldo-vt", VTLDO, ldo_volt_table4, MT6380_LDO_CTRL_0, 3,
+                  MT6380_TLDO_CON_0, 0x400, MT6380_TLDO_CON_0, 0x20),
+};
+
+static int mt6380_regulator_probe(struct platform_device *pdev)
+{
+       struct regmap *regmap = dev_get_regmap(pdev->dev.parent, NULL);
+       struct regulator_config config = {};
+       struct regulator_dev *rdev;
+       int i;
+
+       for (i = 0; i < MT6380_MAX_REGULATOR; i++) {
+               config.dev = &pdev->dev;
+               config.driver_data = &mt6380_regulators[i];
+               config.regmap = regmap;
+               rdev = devm_regulator_register(&pdev->dev,
+                                              &mt6380_regulators[i].desc,
+                               &config);
+               if (IS_ERR(rdev)) {
+                       dev_err(&pdev->dev, "failed to register %s\n",
+                               mt6380_regulators[i].desc.name);
+                       return PTR_ERR(rdev);
+               }
+       }
+       return 0;
+}
+
+static const struct platform_device_id mt6380_platform_ids[] = {
+       {"mt6380-regulator", 0},
+       { /* sentinel */ },
+};
+MODULE_DEVICE_TABLE(platform, mt6380_platform_ids);
+
+static const struct of_device_id mt6380_of_match[] = {
+       { .compatible = "mediatek,mt6380-regulator", },
+       { /* sentinel */ },
+};
+MODULE_DEVICE_TABLE(of, mt6380_of_match);
+
+static struct platform_driver mt6380_regulator_driver = {
+       .driver = {
+               .name = "mt6380-regulator",
+               .of_match_table = of_match_ptr(mt6380_of_match),
+       },
+       .probe = mt6380_regulator_probe,
+       .id_table = mt6380_platform_ids,
+};
+
+module_platform_driver(mt6380_regulator_driver);
+
+MODULE_AUTHOR("Chenglin Xu <chenglin.xu@mediatek.com>");
+MODULE_DESCRIPTION("Regulator Driver for MediaTek MT6380 PMIC");
+MODULE_LICENSE("GPL v2");
index ab51e254d13a0dacd78a6f4b910fd34b7164d353..7a0c15957bd0b710ec25b65454fe0474ca5f87d7 100644 (file)
@@ -43,7 +43,7 @@ enum {
 struct pv88090_regulator {
        struct regulator_desc desc;
        /* Current limiting */
-       unsigned        n_current_limits;
+       unsigned int n_current_limits;
        const int       *current_limits;
        unsigned int limit_mask;
        unsigned int conf;
@@ -398,9 +398,14 @@ static int pv88090_i2c_probe(struct i2c_client *i2c,
                                return ret;
 
                        range = (range >>
-                                (PV88080_BUCK_VRANGE_GAIN_SHIFT + i - 1)) &
-                               PV88080_BUCK_VRANGE_GAIN_MASK;
+                                (PV88090_BUCK_VRANGE_GAIN_SHIFT + i - 1)) &
+                               PV88090_BUCK_VRANGE_GAIN_MASK;
                        index = ((range << 1) | conf2);
+                       if (index > PV88090_ID_BUCK3) {
+                               dev_err(chip->dev,
+                                       "Invalid index(%d)\n", index);
+                               return -EINVAL;
+                       }
 
                        pv88090_regulator_info[i].desc.min_uV
                                = pv88090_buck_vol[index].min_uV;
index d7aca8d8266d07abcb0ce01e1dc02e9955ff8af2..62d9029277f471ad1b6d990953815cdd22aa6900 100644 (file)
 #define PV88090_BUCK_VDAC_RANGE_2                      0x01
 
 /* PV88090_REG_BUCK_FOLD_RANGE (addr=0x61) */
-#define PV88080_BUCK_VRANGE_GAIN_SHIFT                 3
-#define PV88080_BUCK_VRANGE_GAIN_MASK                  0x01
+#define PV88090_BUCK_VRANGE_GAIN_SHIFT                 3
+#define PV88090_BUCK_VRANGE_GAIN_MASK                  0x01
 
-#define PV88080_BUCK_VRANGE_GAIN_1                     0x00
-#define PV88080_BUCK_VRANGE_GAIN_2                     0x01
+#define PV88090_BUCK_VRANGE_GAIN_1                     0x00
+#define PV88090_BUCK_VRANGE_GAIN_2                     0x01
 
 #endif /* __PV88090_REGISTERS_H__ */
index 1b88e0e15a70ce2fed55456c11c57d1ee9a64c69..a2fd140eff81a16272ac7844a8e31fc03fb0a7f0 100644 (file)
@@ -122,8 +122,7 @@ static int pwm_regulator_enable(struct regulator_dev *dev)
 {
        struct pwm_regulator_data *drvdata = rdev_get_drvdata(dev);
 
-       if (drvdata->enb_gpio)
-               gpiod_set_value_cansleep(drvdata->enb_gpio, 1);
+       gpiod_set_value_cansleep(drvdata->enb_gpio, 1);
 
        return pwm_enable(drvdata->pwm);
 }
@@ -134,8 +133,7 @@ static int pwm_regulator_disable(struct regulator_dev *dev)
 
        pwm_disable(drvdata->pwm);
 
-       if (drvdata->enb_gpio)
-               gpiod_set_value_cansleep(drvdata->enb_gpio, 0);
+       gpiod_set_value_cansleep(drvdata->enb_gpio, 0);
 
        return 0;
 }
index 1b2acc43fea16c9474eea08ed7068aae859a42f5..88dc0b0f003c88d79aa3ba7778b616ec6cc13cf8 100644 (file)
@@ -959,6 +959,11 @@ static int rpm_reg_probe(struct platform_device *pdev)
        }
 
        match = of_match_device(rpm_of_match, &pdev->dev);
+       if (!match) {
+               dev_err(&pdev->dev, "failed to match device\n");
+               return -ENODEV;
+       }
+
        for (reg = match->data; reg->name; reg++) {
                vreg = devm_kmalloc(&pdev->dev, sizeof(*vreg), GFP_KERNEL);
                if (!vreg)
index f35994a2a5be043a88aae22b5a2875cd96de7180..940fe1b784116056039c35cf704fcfdcee5788ea 100644 (file)
@@ -570,6 +570,11 @@ static int rpm_reg_probe(struct platform_device *pdev)
        }
 
        match = of_match_device(rpm_of_match, &pdev->dev);
+       if (!match) {
+               dev_err(&pdev->dev, "failed to match device\n");
+               return -ENODEV;
+       }
+
        for (reg = match->data; reg->name; reg++) {
                vreg = devm_kzalloc(&pdev->dev, sizeof(*vreg), GFP_KERNEL);
                if (!vreg)
diff --git a/include/linux/regulator/mt6380-regulator.h b/include/linux/regulator/mt6380-regulator.h
new file mode 100644 (file)
index 0000000..465182d
--- /dev/null
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2017 MediaTek Inc.
+ * Author: Chenglin Xu <chenglin.xu@mediatek.com>
+ *
+ * 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.
+ */
+
+#ifndef __LINUX_REGULATOR_mt6380_H
+#define __LINUX_REGULATOR_mt6380_H
+
+enum {
+       MT6380_ID_VCPU = 0,
+       MT6380_ID_VCORE,
+       MT6380_ID_VRF,
+       MT6380_ID_VMLDO,
+       MT6380_ID_VALDO,
+       MT6380_ID_VPHYLDO,
+       MT6380_ID_VDDRLDO,
+       MT6380_ID_VTLDO,
+       MT6380_ID_RG_MAX,
+};
+
+#define MT6380_MAX_REGULATOR   MT6380_ID_RG_MAX
+
+#endif /* __LINUX_REGULATOR_mt6380_H */