| commit | a584ca48ed4633a4224a067258af4acf1385a0fa | [log] [tgz] |
|---|---|---|
| author | Linux Build Service Account <lnxbuild@localhost> | Fri May 04 01:15:42 2012 -0700 |
| committer | QuIC Gerrit Code Review <code-review@localhost> | Fri May 04 01:15:42 2012 -0700 |
| tree | e025cdca82107c27bf8b3ff5465a35d57b65b340 | |
| parent | 1c2e693878c19b792d9d5918ba8be284d1931728 [diff] | |
| parent | 42564831cf11adfafe8fadf3e48c318f69c24e3b [diff] |
Merge "mfd: pm8xxx: misc: add reset api for PM8038 and PM8917" into msm-3.0
diff --git a/drivers/mfd/pm8xxx-misc.c b/drivers/mfd/pm8xxx-misc.c index 64c0bd1..a311029 100644 --- a/drivers/mfd/pm8xxx-misc.c +++ b/drivers/mfd/pm8xxx-misc.c
@@ -502,6 +502,8 @@ case PM8XXX_VERSION_8901: rc = __pm8901_reset_pwr_off(chip, reset); break; + case PM8XXX_VERSION_8038: + case PM8XXX_VERSION_8917: case PM8XXX_VERSION_8921: rc = __pm8921_reset_pwr_off(chip, reset); break;