regulator: twl: voltage lists for vdd1/2 on twl4030 (3829100a) · Commits · 戴 / test

_opp_supported_by_regulators() wrongly ignored errors from regulator_is_supported_voltage(), so it considered errors as success. Since commit ("regulator: core: simplify return value on suported_voltage") regulator_is_supported_voltage() returns a real boolean, so errors make _opp_supported_by_regulators() return false. That reveals a problem with the declaration of the VDD1/2 regulators on twl4030. The VDD1/VDD2 regulators on twl4030 are neither defined with voltage lists nor with the continuous flag set, so regulator_is_supported_voltage() returns false and an error before above mentioned commit (which was considered success) The result is that after the above mentioned commit cpufreq does not work properly e.g. dm3730. [ 2.490997] core: _opp_supported_by_regulators: OPP minuV: 1012500 maxuV: 1012500, not supported by regulator [ 2.501617] cpu cpu0: _opp_add: OPP not supported by regulators (300000000) [ 2.509246] core: _opp_supported_by_regulators: OPP minuV: 1200000 maxuV: 1200000, not supported by regulator [ 2.519775] cpu cpu0: _opp_add: OPP not supported by regulators (600000000) [ 2.527313] core: _opp_supported_by_regulators: OPP minuV: 1325000 maxuV: 1325000, not supported by regulator [ 2.537750] cpu cpu0: _opp_add: OPP not supported by regulators (800000000) The patch fixes declaration of VDD1/2 regulators by adding proper voltage lists. Fixes: ("regulator: core: simplify return value on suported_voltage") Cc: stable@vger.kernel.org Signed-off-by:

Andreas Kemnade <andreas@kemnade.info> Tested-by: Adam Ford <aford173@gmail.com> #logicpd-torpedo-37xx-devkit Link: https://lore.kernel.org/r/20190814214319.24087-1-andreas@kemnade.info Signed-off-by:

Mark Brown <broonie@kernel.org>

drivers/regulator/twl-regulator.c

+20 −3

Original line number	Diff line number	Diff line
		@@ -359,6 +359,17 @@ static const u16 VINTANA2_VSEL_table[] = {
		2500, 2750,
		};

		/* 600mV to 1450mV in 12.5 mV steps */
		static const struct regulator_linear_range VDD1_ranges[] = {
		REGULATOR_LINEAR_RANGE(600000, 0, 68, 12500)
		};

		/* 600mV to 1450mV in 12.5 mV steps, everything above = 1500mV */
		static const struct regulator_linear_range VDD2_ranges[] = {
		REGULATOR_LINEAR_RANGE(600000, 0, 68, 12500),
		REGULATOR_LINEAR_RANGE(1500000, 69, 69, 12500)
		};

		static int twl4030ldo_list_voltage(struct regulator_dev *rdev, unsigned index)
		{
		struct twlreg_info *info = rdev_get_drvdata(rdev);
		@@ -427,6 +438,8 @@ static int twl4030smps_get_voltage(struct regulator_dev *rdev)
		}

		static const struct regulator_ops twl4030smps_ops = {
		.list_voltage = regulator_list_voltage_linear_range,

		.set_voltage = twl4030smps_set_voltage,
		.get_voltage = twl4030smps_get_voltage,
		};
		@@ -466,7 +479,8 @@ static const struct twlreg_info TWL4030_INFO_##label = { \
		}, \
		}

		#define TWL4030_ADJUSTABLE_SMPS(label, offset, num, turnon_delay, remap_conf) \
		#define TWL4030_ADJUSTABLE_SMPS(label, offset, num, turnon_delay, remap_conf, \
		n_volt) \
		static const struct twlreg_info TWL4030_INFO_##label = { \
		.base = offset, \
		.id = num, \
		@@ -479,6 +493,9 @@ static const struct twlreg_info TWL4030_INFO_##label = { \
		.owner = THIS_MODULE, \
		.enable_time = turnon_delay, \
		.of_map_mode = twl4030reg_map_mode, \
		.n_voltages = n_volt, \
		.n_linear_ranges = ARRAY_SIZE(label ## _ranges), \
		.linear_ranges = label ## _ranges, \
		}, \
		}

		@@ -518,8 +535,8 @@ TWL4030_ADJUSTABLE_LDO(VSIM, 0x37, 9, 100, 0x00);
		TWL4030_ADJUSTABLE_LDO(VDAC, 0x3b, 10, 100, 0x08);
		TWL4030_ADJUSTABLE_LDO(VINTANA2, 0x43, 12, 100, 0x08);
		TWL4030_ADJUSTABLE_LDO(VIO, 0x4b, 14, 1000, 0x08);
		TWL4030_ADJUSTABLE_SMPS(VDD1, 0x55, 15, 1000, 0x08);
		TWL4030_ADJUSTABLE_SMPS(VDD2, 0x63, 16, 1000, 0x08);
		TWL4030_ADJUSTABLE_SMPS(VDD1, 0x55, 15, 1000, 0x08, 68);
		TWL4030_ADJUSTABLE_SMPS(VDD2, 0x63, 16, 1000, 0x08, 69);
		/* VUSBCP is managed only by the USB subchip */
		TWL4030_FIXED_LDO(VINTANA1, 0x3f, 1500, 11, 100, 0x08);
		TWL4030_FIXED_LDO(VINTDIG, 0x47, 1500, 13, 100, 0x08);

Admin message