From 392fd544e89859b82252e36839a72684a0c87bf3 Mon Sep 17 00:00:00 2001 From: Joseph Chen Date: Fri, 27 Oct 2017 09:29:24 +0800 Subject: [PATCH] regulator: rk808: fix rk816 regulators register failed fix commit: 45a046e. regulator framework requires continuous regulator id. Change-Id: I2e2b789c3ab9126e793d9e304ef2a44d8f46eacd Signed-off-by: Joseph Chen --- drivers/regulator/rk808-regulator.c | 12 ------------ include/linux/mfd/rk808.h | 2 -- 2 files changed, 14 deletions(-) diff --git a/drivers/regulator/rk808-regulator.c b/drivers/regulator/rk808-regulator.c index 3218c77136f9..0ef5efe226c6 100644 --- a/drivers/regulator/rk808-regulator.c +++ b/drivers/regulator/rk808-regulator.c @@ -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; diff --git a/include/linux/mfd/rk808.h b/include/linux/mfd/rk808.h index 64d61fac51d6..9670c6c37ba4 100644 --- a/include/linux/mfd/rk808.h +++ b/include/linux/mfd/rk808.h @@ -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,