提交 cbbb04a5 编写于 作者: S Stephan Gerhold 提交者: Yang Yingliang

regulator: ab8500: Remove AB8505 USB regulator

commit 99c4f70df3a6446c56ca817c2d0f9c12d85d4e7c upstream.

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: NStephan Gerhold <stephan@gerhold.net>
Reviewed-by: NLinus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20191106173125.14496-1-stephan@gerhold.netSigned-off-by: NMark Brown <broonie@kernel.org>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>
上级 85e5dbdc
...@@ -956,23 +956,6 @@ static struct ab8500_regulator_info ...@@ -956,23 +956,6 @@ static struct ab8500_regulator_info
.update_val_idle = 0x82, .update_val_idle = 0x82,
.update_val_normal = 0x02, .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] = { [AB8505_LDO_AUDIO] = {
.desc = { .desc = {
.name = "LDO-AUDIO", .name = "LDO-AUDIO",
......
...@@ -38,7 +38,6 @@ enum ab8505_regulator_id { ...@@ -38,7 +38,6 @@ enum ab8505_regulator_id {
AB8505_LDO_AUX6, AB8505_LDO_AUX6,
AB8505_LDO_INTCORE, AB8505_LDO_INTCORE,
AB8505_LDO_ADC, AB8505_LDO_ADC,
AB8505_LDO_USB,
AB8505_LDO_AUDIO, AB8505_LDO_AUDIO,
AB8505_LDO_ANAMIC1, AB8505_LDO_ANAMIC1,
AB8505_LDO_ANAMIC2, AB8505_LDO_ANAMIC2,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册