Merge "asoc: kona: update sound wire port frame config routing" (336c99b1) · Commits · e / devices / android_kernel_fairphone_FP4

asoc/kona.c

+18 −21

Original line number	Original line	Diff line number	Diff line
	@@ -5425,6 +5425,7 @@ static int msm_int_audrx_init(struct snd_soc_pcm_runtime *rtd)
	struct snd_soc_component *aux_comp;		struct snd_soc_component *aux_comp;
	struct platform_device *pdev = NULL;		struct platform_device *pdev = NULL;
	int i = 0;		int i = 0;
			bool is_wcd937x_used = false;
	char *data = NULL;		char *data = NULL;
	struct msm_asoc_mach_data *pdata =		struct msm_asoc_mach_data *pdata =
	snd_soc_card_get_drvdata(rtd->card);		snd_soc_card_get_drvdata(rtd->card);
	@@ -5521,32 +5522,28 @@ static int msm_int_audrx_init(struct snd_soc_pcm_runtime *rtd)
	if (data != NULL) {		if (data != NULL) {
	if (!strncmp(data, "wcd937x",		if (!strncmp(data, "wcd937x",
	sizeof("wcd937x"))) {		sizeof("wcd937x"))) {
			is_wcd937x_used = true;
			break;
			}
			}
			}
			}

			if (is_wcd937x_used) {
	bolero_set_port_map(component,		bolero_set_port_map(component,
	ARRAY_SIZE(sm_port_map_wcd937x),		ARRAY_SIZE(sm_port_map_wcd937x),
	sm_port_map_wcd937x);		sm_port_map_wcd937x);
	break;		} else if (pdata->lito_v2_enabled) {
	} else if (!strncmp( data, "wcd938x",
	sizeof("wcd938x"))) {
	if (pdata->lito_v2_enabled) {
	/*		/*
	* Enable tx data line3 for		* Enable tx data line3 for saipan version v2 and
	* saipan version v2 and		* write corresponding lpi register.
	* write corresponding
	* lpi register.
	*/		*/
	bolero_set_port_map(component,		bolero_set_port_map(component, ARRAY_SIZE(sm_port_map_v2),
	ARRAY_SIZE(sm_port_map_v2),
	sm_port_map_v2);		sm_port_map_v2);
	} else {		} else {
	bolero_set_port_map(component,		bolero_set_port_map(component, ARRAY_SIZE(sm_port_map),
	ARRAY_SIZE(sm_port_map),
	sm_port_map);		sm_port_map);
	}		}
	break;
	}
	}
	}
	}

	card = rtd->card->snd_card;		card = rtd->card->snd_card;
	if (!pdata->codec_root) {		if (!pdata->codec_root) {