github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-08 06:25:52 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

regulator: rk808: fix rk816 regulators register failed

Browse Source 
fix commit: 45a046e.
regulator framework requires continuous regulator id.

Change-Id: I2e2b789c3ab9126e793d9e304ef2a44d8f46eacd
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
This commit is contained in:
Joseph Chen 2017-10-27 09:29:24 +08:00 committed by Huang, Tao
parent 80e52d1b8a
commit 392fd544e8
2 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/regulator/rk808-regulator.c
View File

@ -348,13 +348,6 @@ static int rk816_set_suspend_enable(struct regulator_dev *rdev)
}
if ((rdev->desc->id > RK816_ID_DCDC4) &&
(rdev->desc->id <= RK816_ID_OTG_SWITCH)) {
reg = rdev->desc->enable_reg +
RK816_SWITCH_SLP_EN_REG_OFFSET;
val = 1 << (rdev->desc->id + 1);
}
if ((rdev->desc->id > RK816_ID_OTG_SWITCH) &&
(rdev->desc->id <= RK816_ID_LDO4)) {
reg = rdev->desc->enable_reg -
RK816_LDO1_4_SLP_EN_REG_OFFSET;
@ -382,11 +375,6 @@ static int rk816_set_suspend_disable(struct regulator_dev *rdev)
RK816_DCDC_SLP_EN_REG_OFFSET;
if ((rdev->desc->id > RK816_ID_DCDC4) &&
(rdev->desc->id <= RK816_ID_OTG_SWITCH))
reg = rdev->desc->enable_reg +
RK816_SWITCH_SLP_EN_REG_OFFSET;
if ((rdev->desc->id > RK816_ID_OTG_SWITCH) &&
(rdev->desc->id <= RK816_ID_LDO4))
reg = rdev->desc->enable_reg -
RK816_LDO1_4_SLP_EN_REG_OFFSET;

2
include/linux/mfd/rk808.h
View File

@ -52,8 +52,6 @@ enum rk816_reg {
RK816_ID_DCDC2,
RK816_ID_DCDC3,
RK816_ID_DCDC4,
RK816_ID_BOOST,
RK816_ID_OTG_SWITCH,
RK816_ID_LDO1,
RK816_ID_LDO2,
RK816_ID_LDO3,