commit 2a23838947022a9914ca81a7b90affdd959e36ca
author Willie Ruan <wruan@codeaurora.org> Thu May 31 10:21:33 2012 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Nov 20 12:38:26 2012 -0800
tree 61268bc500bb68425c58894d4f6b3b4ad9610f17
parent b28275f314160376a7f5141632020473aa1a111c

mfd: pm8xxx-misc: add PM8917 in PM8921 cases

PM8917 is in the same family as PM8921. Add it in all cases of
PM8921 where it applies.

Change-Id: I2bf3937ed7e80355a8d5b330f18298bf040d585b
Signed-off-by: Willie Ruan <wruan@codeaurora.org>
Signed-off-by: David Collins <collinsd@codeaurora.org>
(cherry picked from commit a813d5f4d82a2eedf7b8813fa03cf9e8af236a68)

drivers/mfd/pm8xxx-misc.c

diff --git a/drivers/mfd/pm8xxx-misc.c b/drivers/mfd/pm8xxx-misc.c
index 0af013e..6bb1441 100644
--- a/drivers/mfd/pm8xxx-misc.c
+++ b/drivers/mfd/pm8xxx-misc.c
@@ -564,6 +564,7 @@
 					   : SLEEP_CTRL_SMPL_EN_PWR_OFF));
 			break;
 		case PM8XXX_VERSION_8921:
+		case PM8XXX_VERSION_8917:
 			rc = pm8xxx_misc_masked_write(chip,
 				REG_PM8921_SLEEP_CTRL, SLEEP_CTRL_SMPL_EN_MASK,
 				(enable ? SLEEP_CTRL_SMPL_EN_RESET
@@ -624,6 +625,7 @@
 				delay);
 			break;
 		case PM8XXX_VERSION_8921:
+		case PM8XXX_VERSION_8917:
 			rc = pm8xxx_misc_masked_write(chip,
 				REG_PM8921_SLEEP_CTRL, SLEEP_CTRL_SMPL_SEL_MASK,
 				delay);
@@ -703,6 +705,7 @@
 					REG_PM8058_COIN_CHG, reg);
 			break;
 		case PM8XXX_VERSION_8921:
+		case PM8XXX_VERSION_8917:
 			rc = pm8xxx_writeb(chip->dev->parent,
 					REG_PM8921_COIN_CHG, reg);
 			break;
@@ -747,6 +750,7 @@
 		case PM8XXX_VERSION_8018:
 		case PM8XXX_VERSION_8058:
 		case PM8XXX_VERSION_8921:
+		case PM8XXX_VERSION_8917:
 			rc = pm8xxx_misc_masked_write(chip,
 				REG_PM8XXX_PON_CTRL_1, PON_CTRL_1_WD_EN_MASK,
 				(enable ? PON_CTRL_1_WD_EN_RESET
@@ -793,6 +797,7 @@
 		case PM8XXX_VERSION_8018:
 		case PM8XXX_VERSION_8058:
 		case PM8XXX_VERSION_8921:
+		case PM8XXX_VERSION_8917:
 			rc = pm8xxx_writeb(chip->dev->parent,
 				REG_PM8XXX_GP_TEST_1, PM8XXX_STAY_ON_CFG);
 			break;
@@ -884,6 +889,7 @@
 				REG_PM8901_PON_CNTL_4, REG_PM8901_PON_CNTL_5);
 			break;
 		case PM8XXX_VERSION_8921:
+		case PM8XXX_VERSION_8917:
 			__pm8xxx_hard_reset_config(chip, config,
 				REG_PM8921_PON_CNTL_4, REG_PM8921_PON_CNTL_5);
 			break;
@@ -941,6 +947,7 @@
 		case PM8XXX_VERSION_8018:
 		case PM8XXX_VERSION_8058:
 		case PM8XXX_VERSION_8921:
+		case PM8XXX_VERSION_8917:
 			rc = pm8xxx_misc_masked_write(chip,
 				REG_PM8XXX_GPIO_MUX_CTRL, UART_PATH_SEL_MASK,
 				uart_path_sel << UART_PATH_SEL_SHIFT);
@@ -1091,6 +1098,7 @@
 		switch (chip->version) {
 		case PM8XXX_VERSION_8038:
 		case PM8XXX_VERSION_8921:
+		case PM8XXX_VERSION_8917:
 			pm8xxx_misc_masked_write(chip,
 					REG_PM8XXX_XO_CNTRL_2, clk_mask, value);
 			break;