Unverified Commit 99c4f70d authored Nov 06, 2019 by Stephan Gerhold Committed by Mark Brown Nov 07, 2019

regulator: ab8500: Remove AB8505 USB regulator



The USB regulator was removed for AB8500 in
commit 41a06aa7 ("regulator: ab8500: Remove USB regulator").
It was then added for AB8505 in
commit 547f384f ("regulator: ab8500: add support for ab8505").

However, there was never an entry added for it in
ab8505_regulator_match. This causes all regulators after it
to be initialized with the wrong device tree data, eventually
leading to an out-of-bounds array read.

Given that it is not used anywhere in the kernel, it seems
likely that similar arguments against supporting it exist for
AB8505 (it is controlled by hardware).

Therefore, simply remove it like for AB8500 instead of adding
an entry in ab8505_regulator_match.

Fixes: 547f384f ("regulator: ab8500: add support for ab8505")
Cc: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Stephan Gerhold <stephan@gerhold.net>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20191106173125.14496-1-stephan@gerhold.net


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

parent 5365e3df

drivers/regulator/ab8500.c

+0 −17

Original line number	Diff line number	Diff line
		@@ -953,23 +953,6 @@ static struct ab8500_regulator_info
		.update_val_idle = 0x82,
		.update_val_normal = 0x02,
		},
		[AB8505_LDO_USB] = {
		.desc = {
		.name = "LDO-USB",
		.ops = &ab8500_regulator_mode_ops,
		.type = REGULATOR_VOLTAGE,
		.id = AB8505_LDO_USB,
		.owner = THIS_MODULE,
		.n_voltages = 1,
		.volt_table = fixed_3300000_voltage,
		},
		.update_bank = 0x03,
		.update_reg = 0x82,
		.update_mask = 0x03,
		.update_val = 0x01,
		.update_val_idle = 0x03,
		.update_val_normal = 0x01,
		},
		[AB8505_LDO_AUDIO] = {
		.desc = {
		.name = "LDO-AUDIO",

include/linux/regulator/ab8500.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -37,7 +37,6 @@ enum ab8505_regulator_id {
		AB8505_LDO_AUX6,
		AB8505_LDO_INTCORE,
		AB8505_LDO_ADC,
		AB8505_LDO_USB,
		AB8505_LDO_AUDIO,
		AB8505_LDO_ANAMIC1,
		AB8505_LDO_ANAMIC2,

Admin message