Merge "asoc: wcd939x: Disable legacy surge protection"

asoc/codecs/wcd939x/wcd939x.c

@@ -474,10 +474,23 @@ static int wcd939x_init_reg(struct snd_soc_component *component)
 	snd_soc_component_update_bits(component,
 					REG_FIELD_VALUE(TEST_BLK_EN2, TXFE2_MBHC_CLKRST_EN, 0x00));
 
-	snd_soc_component_update_bits(component,
+	if (of_find_property(component->card->dev->of_node, "qcom,wcd-disable-legacy-surge", NULL)) {
+		snd_soc_component_update_bits(component,
+			REG_FIELD_VALUE(HPHLR_SURGE_EN, EN_SURGE_PROTECTION_HPHL, 0x00));
+		snd_soc_component_update_bits(component,
+			REG_FIELD_VALUE(HPHLR_SURGE_EN, EN_SURGE_PROTECTION_HPHR, 0x00));
+	}
+	else {
+		snd_soc_component_update_bits(component,
 			REG_FIELD_VALUE(HPHLR_SURGE_EN, EN_SURGE_PROTECTION_HPHL, 0x01));
-	snd_soc_component_update_bits(component,
+		snd_soc_component_update_bits(component,
 			REG_FIELD_VALUE(HPHLR_SURGE_EN, EN_SURGE_PROTECTION_HPHR, 0x01));
+	}
+
+	snd_soc_component_update_bits(component,
+		REG_FIELD_VALUE(HPH_OCP_CTL, OCP_FSM_EN, 0x01));
+	snd_soc_component_update_bits(component,
+		REG_FIELD_VALUE(HPH_OCP_CTL, SCD_OP_EN, 0x01));
 
 	snd_soc_component_write(component, WCD939X_CFG0, 0x05);