regulator: Troika ：Set BUCK8 output voltage to 1.35V

Merge samsung patch:
[(CR)][Troika	][regulator] Set BUCK8 output voltage to 1.35V.
Signed-off-by: yujing <jing12.yu@samsung.com>
Change-Id: Ic609cdf471fd23ad199eabdaec364826fbea30cd
Signed-off-by: Wen Xie <xiewen3@motorola.com>
Reviewed-on: https://gerrit.mot.com/1327857
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Zhengming Yao <yaozm1@mt.com>
Reviewed-by: Xiangpo Zhao <zhaoxp3@motorola.com>
Submit-Approved: Lu Lu <lulu2@mt.com>

diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index 69ae58eab8efb064361b38e1177f65c12e9fa624..b062a4a8f8877caca1a0bb274e468d113b5f3621 100644 (file)
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -745,6 +745,14 @@ config REGULATOR_S2MPU09
         via I2C bus. S2MPU09 is comprised of high efficient Buck converters
         including Dual-Phase Buck converter, Buck-Boost converter, various LDOs.
 
+config REGULATOR_S2MPU09_BUCK8_1V35
+       tristate "    Set S2MPU09 BUCK8 output 1.35V"
+       depends on REGULATOR_S2MPU09
+       default n
+       help
+        Enable config to set S2MPU09 BUCK8 output voltage to 1.35V from the
+        default vaule (1.3V).
+
 config REGULATOR_S2MPB02
        tristate "Samsung S2MPB02 regulator"
        depends on MFD_S2MPB02

diff --git a/drivers/regulator/s2mpu09-regulator.c b/drivers/regulator/s2mpu09-regulator.c
index 931d0d8bec5a54a0dafd0d64bc135c9fe9863d56..7550c17a58ac62b4b57db2cabafd75f2651f0bd4 100755 (executable)
--- a/drivers/regulator/s2mpu09-regulator.c
+++ b/drivers/regulator/s2mpu09-regulator.c
@@ -736,6 +736,14 @@ static int s2mpu09_pmic_probe(struct platform_device *pdev)
        pr_info("%s s2mpu09 pmic driver Loading end\n", __func__);
        s2mpu09_update_reg(s2mpu09->i2c, S2MPU09_PMIC_REG_RTCBUF, 0x4, 0x4);
 
+#ifdef CONFIG_REGULATOR_S2MPU09_BUCK8_1V35
+       s2mpu09_update_reg(s2mpu09->i2c, S2MPU09_PMIC_REG_B8OUT1, 0xA8, 0xff);
+       s2mpu09_update_reg(s2mpu09->i2c, S2MPU09_PMIC_REG_B8OUT2, 0xA8, 0xff);
+#else
+       /* BUCK8 DVS-L voltage: 1.25V */
+       s2mpu09_update_reg(s2mpu09->i2c, S2MPU09_PMIC_REG_B8OUT2, 0x98, 0xff);
+#endif
+
        return 0;
 err:
        for (i = 0; i < S2MPU09_REGULATOR_MAX; i++)