Unverified Commit 60ab7f41 authored May 08, 2020 by Matti Vaittinen Committed by Mark Brown May 08, 2020

regulator: use linear_ranges helper

Change the regulator helpers to use common linear_ranges code.

Signed-off-by: Matti Vaittinen <matti.vaittinen@fi.rohmeurope.com>
Reviewed-by: Mark Brown <broonie@kernel.org>
Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Acked-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com>
Link: https://lore.kernel.org/r/64f01d5e381b8631a271616b7790f9d5640974fb.1588944082.git.matti.vaittinen@fi.rohmeurope.com

Signed-off-by: Mark Brown <broonie@kernel.org>

parent de824cc9

drivers/regulator/88pg86x.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -11,13 +11,13 @@ static const struct regulator_ops pg86x_ops = {
		.list_voltage = regulator_list_voltage_linear_range,
		};

		static const struct regulator_linear_range pg86x_buck1_ranges[] = {
		static const struct linear_range pg86x_buck1_ranges[] = {
		REGULATOR_LINEAR_RANGE( 0, 0, 10, 0),
		REGULATOR_LINEAR_RANGE(1000000, 11, 34, 25000),
		REGULATOR_LINEAR_RANGE(1600000, 35, 47, 50000),
		};

		static const struct regulator_linear_range pg86x_buck2_ranges[] = {
		static const struct linear_range pg86x_buck2_ranges[] = {
		REGULATOR_LINEAR_RANGE( 0, 0, 15, 0),
		REGULATOR_LINEAR_RANGE(1000000, 16, 39, 25000),
		REGULATOR_LINEAR_RANGE(1600000, 40, 52, 50000),

drivers/regulator/88pm800-regulator.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -134,13 +134,13 @@ struct pm800_regulator_info {
		}

		/* Ranges are sorted in ascending order. */
		static const struct regulator_linear_range buck1_volt_range[] = {
		static const struct linear_range buck1_volt_range[] = {
		REGULATOR_LINEAR_RANGE(600000, 0, 0x4f, 12500),
		REGULATOR_LINEAR_RANGE(1600000, 0x50, 0x54, 50000),
		};

		/* BUCK 2~5 have same ranges. */
		static const struct regulator_linear_range buck2_5_volt_range[] = {
		static const struct linear_range buck2_5_volt_range[] = {
		REGULATOR_LINEAR_RANGE(600000, 0, 0x4f, 12500),
		REGULATOR_LINEAR_RANGE(1600000, 0x50, 0x72, 50000),
		};

drivers/regulator/Kconfig

+1 −0

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0-only
		menuconfig REGULATOR
		bool "Voltage and Current Regulator Support"
		select LINEAR_RANGES
		help
		Generic Voltage and Current Regulator support.

drivers/regulator/act8865-regulator.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -220,13 +220,13 @@ static const struct regmap_config act8865_regmap_config = {
		.val_bits = 8,
		};

		static const struct regulator_linear_range act8865_voltage_ranges[] = {
		static const struct linear_range act8865_voltage_ranges[] = {
		REGULATOR_LINEAR_RANGE(600000, 0, 23, 25000),
		REGULATOR_LINEAR_RANGE(1200000, 24, 47, 50000),
		REGULATOR_LINEAR_RANGE(2400000, 48, 63, 100000),
		};

		static const struct regulator_linear_range act8600_sudcdc_voltage_ranges[] = {
		static const struct linear_range act8600_sudcdc_voltage_ranges[] = {
		REGULATOR_LINEAR_RANGE(3000000, 0, 63, 0),
		REGULATOR_LINEAR_RANGE(3000000, 64, 159, 100000),
		REGULATOR_LINEAR_RANGE(12600000, 160, 191, 200000),

drivers/regulator/act8945a-regulator.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -73,7 +73,7 @@ struct act8945a_pmic {
		u32 op_mode[ACT8945A_ID_MAX];
		};

		static const struct regulator_linear_range act8945a_voltage_ranges[] = {
		static const struct linear_range act8945a_voltage_ranges[] = {
		REGULATOR_LINEAR_RANGE(600000, 0, 23, 25000),
		REGULATOR_LINEAR_RANGE(1200000, 24, 47, 50000),
		REGULATOR_LINEAR_RANGE(2400000, 48, 63, 100000),