diff options
| author |   Jisheng Zhang <Jisheng.Zhang@synaptics.com> | 2019-08-29 06:50:46 +0000 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2019-08-30 12:39:47 +0100 |
| commit | e02e23d5f01937cec2c76a8e61aea0b4e5f53626 (patch) | |
| tree | 5798ee329d7f807e45f9c41799c7c5e6051003b3 /drivers/regulator | |
| parent | regulator: sy8824x: use c++style for the comment block near SPDX (diff) | |
| download | linux-dev-e02e23d5f01937cec2c76a8e61aea0b4e5f53626.tar.xz linux-dev-e02e23d5f01937cec2c76a8e61aea0b4e5f53626.zip | |
regulator: sy8824x: add prefixes to BUCK_EN and MODE macros
Add prefixes to BUCK_EN and MODE macros to namespace them.
Signed-off-by: Jisheng Zhang <Jisheng.Zhang@synaptics.com>
Link: https://lore.kernel.org/r/20190829143927.395d0385@xhacker.debian
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/sy8824x.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/regulator/sy8824x.c b/drivers/regulator/sy8824x.c index d806fa7020d4..92adb4f3ee19 100644 --- a/drivers/regulator/sy8824x.c +++ b/drivers/regulator/sy8824x.c @@ -13,8 +13,8 @@ #include <linux/regulator/driver.h> #include <linux/regulator/of_regulator.h> -#define BUCK_EN (1 << 7) -#define MODE (1 << 6) +#define SY8824C_BUCK_EN (1 << 7) +#define SY8824C_MODE (1 << 6) struct sy8824_config { /* registers */ @@ -41,10 +41,12 @@ static int sy8824_set_mode(struct regulator_dev *rdev, unsigned int mode) switch (mode) { case REGULATOR_MODE_FAST: - regmap_update_bits(rdev->regmap, cfg->mode_reg, MODE, MODE); + regmap_update_bits(rdev->regmap, cfg->mode_reg, + SY8824C_MODE, SY8824C_MODE); break; case REGULATOR_MODE_NORMAL: - regmap_update_bits(rdev->regmap, cfg->mode_reg, MODE, 0); + regmap_update_bits(rdev->regmap, cfg->mode_reg, + SY8824C_MODE, 0); break; default: return -EINVAL; @@ -62,7 +64,7 @@ static unsigned int sy8824_get_mode(struct regulator_dev *rdev) ret = regmap_read(rdev->regmap, cfg->mode_reg, &val); if (ret < 0) return ret; - if (val & MODE) + if (val & SY8824C_MODE) return REGULATOR_MODE_FAST; else return REGULATOR_MODE_NORMAL; @@ -94,7 +96,7 @@ static int sy8824_regulator_register(struct sy8824_device_info *di, rdesc->type = REGULATOR_VOLTAGE; rdesc->n_voltages = cfg->vsel_count; rdesc->enable_reg = cfg->enable_reg; - rdesc->enable_mask = BUCK_EN; + rdesc->enable_mask = SY8824C_BUCK_EN; rdesc->min_uV = cfg->vsel_min; rdesc->uV_step = cfg->vsel_step; rdesc->vsel_reg = cfg->vol_reg; |