[PORT FROM R2] LM3554: limit lm3554 flash's current.

BZ: 17272

to prevent battery over-current, we set peak current limit
to be 1000mA.

Change-Id: I67032019b1f6ae8de030faba8ef4c351cb2cc8d8
Orig-Change-Id: I6292cd6d20558fd5589b8c11d2448c46d3e18b0e
Signed-off-by: ziyux.jiang <ziyux.jiang@intel.com>
Reviewed-on: http://android.intel.com:8080/25677
Reviewed-by: Jong-a-lock, Robert <robert.jong-a-lock@intel.com>
Reviewed-by: Hu, Gang A <gang.a.hu@intel.com>
Reviewed-by: Cohen, David A <david.a.cohen@intel.com>
Tested-by: Koski, Anttu <anttu.koski@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>
Reviewed-on: http://android.intel.com:8080/28050
Reviewed-by: Tuominen, TeemuX <teemux.tuominen@intel.com>
Reviewed-by: Koski, Anttu <anttu.koski@intel.com>

diff --git a/drivers/media/video/lm3554.c b/drivers/media/video/lm3554.c
index 28b3df5..ec3a25e 100644 (file)
--- a/drivers/media/video/lm3554.c
+++ b/drivers/media/video/lm3554.c
@@ -506,6 +506,11 @@ static int lm3554_detect(struct i2c_client *client)
        if (ret < 0)
                goto fail;
 
+       /* set peak current limit to be 1000mA */
+       ret = set_reg_field(sd, &current_limit, 0);
+       if (ret < 0)
+               goto fail;
+
        /* clear the flags register */
        ret = lm3554_g_flash_status(sd, &status);
        if (ret < 0)