From 7ed173e8fc40e9daec7add35553a137e0dca8644 Mon Sep 17 00:00:00 2001 From: Phani Kumar Uppalapati Date: Wed, 2 Nov 2016 12:57:01 -0700 Subject: [PATCH] ASoC: wcd934x: Update OCP connection attempts Update headphone OCP (Over Current Protection) connection attempts to 2 to avoid hardware state machine getting stuck in OCP state even after reset. CRs-Fixed: 1083736 Change-Id: I69e37a93418b99a187c7b46cf62524c5fc4901f2 Signed-off-by: Phani Kumar Uppalapati --- sound/soc/codecs/wcd934x/wcd934x.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/codecs/wcd934x/wcd934x.c b/sound/soc/codecs/wcd934x/wcd934x.c index 5d6119c6d86a..2a87eb2ad33b 100644 --- a/sound/soc/codecs/wcd934x/wcd934x.c +++ b/sound/soc/codecs/wcd934x/wcd934x.c @@ -4394,14 +4394,14 @@ static const struct tavil_reg_mask_val tavil_pa_disable[] = { }; static const struct tavil_reg_mask_val tavil_ocp_en_seq[] = { - { WCD934X_RX_OCP_CTL, 0x0F, 0x01 }, /* OCP number of attempts is 1 */ + { WCD934X_RX_OCP_CTL, 0x0F, 0x02 }, /* OCP number of attempts is 2 */ { WCD934X_HPH_OCP_CTL, 0xFA, 0x3A }, /* OCP current limit */ { WCD934X_HPH_L_TEST, 0x01, 0x01 }, /* Enable HPHL OCP */ { WCD934X_HPH_R_TEST, 0x01, 0x01 }, /* Enable HPHR OCP */ }; static const struct tavil_reg_mask_val tavil_ocp_en_seq_1[] = { - { WCD934X_RX_OCP_CTL, 0x0F, 0x01 }, /* OCP number of attempts is 1 */ + { WCD934X_RX_OCP_CTL, 0x0F, 0x02 }, /* OCP number of attempts is 2 */ { WCD934X_HPH_OCP_CTL, 0xFA, 0x3A }, /* OCP current limit */ }; @@ -8035,7 +8035,7 @@ static const struct tavil_reg_mask_val tavil_codec_reg_defaults[] = { {WCD934X_CDC_TX6_TX_PATH_CFG1, 0x01, 0x00}, {WCD934X_CDC_TX7_TX_PATH_CFG1, 0x01, 0x00}, {WCD934X_CDC_TX8_TX_PATH_CFG1, 0x01, 0x00}, - {WCD934X_RX_OCP_CTL, 0x0F, 0x01}, /* OCP number of attempts is 1 */ + {WCD934X_RX_OCP_CTL, 0x0F, 0x02}, /* OCP number of attempts is 2 */ {WCD934X_HPH_OCP_CTL, 0xFF, 0x3A}, /* OCP current limit */ {WCD934X_HPH_L_TEST, 0x01, 0x01}, {WCD934X_HPH_R_TEST, 0x01, 0x01},