Merge "asoc: sdm660: configure mi2s gpios from machine driver" (1228153f) · Commits · e / devices / android_kernel_fairphone_FP3

asoc/sdm660-common.c

+41 −12

Original line number	Diff line number	Diff line
		@@ -170,15 +170,6 @@ static struct dev_config usb_tx_cfg = {
		.channels = 1,
		};

		enum {
		PRIM_MI2S = 0,
		SEC_MI2S,
		TERT_MI2S,
		QUAT_MI2S,
		QUIN_MI2S,
		MI2S_MAX,
		};

		enum {
		PRIM_AUX_PCM = 0,
		SEC_AUX_PCM,
		@@ -208,7 +199,8 @@ static u32 mi2s_ebit_clk[MI2S_MAX] = {
		Q6AFE_LPASS_CLK_ID_PRI_MI2S_EBIT,
		Q6AFE_LPASS_CLK_ID_SEC_MI2S_EBIT,
		Q6AFE_LPASS_CLK_ID_TER_MI2S_EBIT,
		Q6AFE_LPASS_CLK_ID_QUAD_MI2S_EBIT
		Q6AFE_LPASS_CLK_ID_QUAD_MI2S_EBIT,
		Q6AFE_LPASS_CLK_ID_QUI_MI2S_EBIT
		};

		struct msm_wsa881x_dev_info {
		@@ -401,6 +393,14 @@ static struct afe_clk_set mi2s_clk[MI2S_MAX] = {
		Q6AFE_LPASS_CLK_ATTRIBUTE_COUPLE_NO,
		Q6AFE_LPASS_CLK_ROOT_DEFAULT,
		0,
		},
		{
		AFE_API_VERSION_I2S_CONFIG,
		Q6AFE_LPASS_CLK_ID_QUI_MI2S_IBIT,
		Q6AFE_LPASS_IBIT_CLK_1_P536_MHZ,
		Q6AFE_LPASS_CLK_ATTRIBUTE_COUPLE_NO,
		Q6AFE_LPASS_CLK_ROOT_DEFAULT,
		0,
		}
		};

		@@ -415,7 +415,7 @@ static struct afe_clk_set mi2s_mclk[MI2S_MAX] = {
		},
		{
		AFE_API_VERSION_I2S_CONFIG,
		Q6AFE_LPASS_CLK_ID_MCLK_4,
		Q6AFE_LPASS_CLK_ID_MCLK_2,
		Q6AFE_LPASS_OSR_CLK_9_P600_MHZ,
		Q6AFE_LPASS_CLK_ATTRIBUTE_COUPLE_NO,
		Q6AFE_LPASS_CLK_ROOT_DEFAULT,
		@@ -431,7 +431,15 @@ static struct afe_clk_set mi2s_mclk[MI2S_MAX] = {
		},
		{
		AFE_API_VERSION_I2S_CONFIG,
		Q6AFE_LPASS_CLK_ID_MCLK_2,
		Q6AFE_LPASS_CLK_ID_MCLK_1,
		Q6AFE_LPASS_OSR_CLK_9_P600_MHZ,
		Q6AFE_LPASS_CLK_ATTRIBUTE_COUPLE_NO,
		Q6AFE_LPASS_CLK_ROOT_DEFAULT,
		0,
		},
		{
		AFE_API_VERSION_I2S_CONFIG,
		Q6AFE_LPASS_CLK_ID_QUI_MI2S_OSR,
		Q6AFE_LPASS_OSR_CLK_9_P600_MHZ,
		Q6AFE_LPASS_CLK_ATTRIBUTE_COUPLE_NO,
		Q6AFE_LPASS_CLK_ROOT_DEFAULT,
		@@ -2614,6 +2622,8 @@ int msm_mi2s_snd_startup(struct snd_pcm_substream *substream)
		int port_id = msm_get_port_id(rtd->dai_link->id);
		int index = cpu_dai->id;
		unsigned int fmt = SND_SOC_DAIFMT_CBS_CFS;
		struct msm_asoc_mach_data *pdata =
		snd_soc_card_get_drvdata(rtd->card);

		dev_dbg(rtd->card->dev,
		"%s: substream = %s stream = %d, dai name %s, dai ID %d\n",
		@@ -2665,6 +2675,9 @@ int msm_mi2s_snd_startup(struct snd_pcm_substream *substream)
		goto clk_off;
		}
		}
		if (pdata->mi2s_gpio_p[index])
		msm_cdc_pinctrl_select_active_state(
		pdata->mi2s_gpio_p[index]);
		}
		mutex_unlock(&mi2s_intf_conf[index].lock);
		return 0;
		@@ -2691,6 +2704,8 @@ void msm_mi2s_snd_shutdown(struct snd_pcm_substream *substream)
		struct snd_soc_pcm_runtime *rtd = substream->private_data;
		int port_id = msm_get_port_id(rtd->dai_link->id);
		int index = rtd->cpu_dai->id;
		struct msm_asoc_mach_data *pdata =
		snd_soc_card_get_drvdata(rtd->card);

		pr_debug("%s(): substream = %s stream = %d\n", __func__,
		substream->name, substream->stream);
		@@ -2701,6 +2716,10 @@ void msm_mi2s_snd_shutdown(struct snd_pcm_substream *substream)

		mutex_lock(&mi2s_intf_conf[index].lock);
		if (--mi2s_intf_conf[index].ref_cnt == 0) {
		if (pdata->mi2s_gpio_p[index])
		msm_cdc_pinctrl_select_sleep_state(
		pdata->mi2s_gpio_p[index]);

		ret = msm_mi2s_set_sclk(substream, false);
		if (ret < 0) {
		pr_err("%s:clock disable failed for MI2S (%d); ret=%d\n",
		@@ -3245,6 +3264,16 @@ static int msm_asoc_machine_probe(struct platform_device *pdev)
		"qcom,cdc-ext-spk-gpios", 0);
		}

		pdata->mi2s_gpio_p[PRIM_MI2S] = of_parse_phandle(pdev->dev.of_node,
		"qcom,pri-mi2s-gpios", 0);
		pdata->mi2s_gpio_p[SEC_MI2S] = of_parse_phandle(pdev->dev.of_node,
		"qcom,sec-mi2s-gpios", 0);
		pdata->mi2s_gpio_p[TERT_MI2S] = of_parse_phandle(pdev->dev.of_node,
		"qcom,tert-mi2s-gpios", 0);
		pdata->mi2s_gpio_p[QUAT_MI2S] = of_parse_phandle(pdev->dev.of_node,
		"qcom,quat-mi2s-gpios", 0);
		pdata->mi2s_gpio_p[QUIN_MI2S] = of_parse_phandle(pdev->dev.of_node,
		"qcom,quin-mi2s-gpios", 0);
		/*
		* Parse US-Euro gpio info from DT. Report no error if us-euro
		* entry is not found in DT file as some targets do not support

asoc/sdm660-common.h

+10 −0

Original line number	Diff line number	Diff line
		@@ -60,6 +60,15 @@ struct tdm_port {
		u32 channel;
		};

		enum {
		PRIM_MI2S = 0,
		SEC_MI2S,
		TERT_MI2S,
		QUAT_MI2S,
		QUIN_MI2S,
		MI2S_MAX,
		};

		enum {
		DIG_CDC,
		ANA_CDC,
		@@ -90,6 +99,7 @@ struct msm_asoc_mach_data {
		struct device_node comp_gpio_p; / used by pinctrl API */
		struct device_node dmic_gpio_p; / used by pinctrl API */
		struct device_node ext_spk_gpio_p; / used by pinctrl API */
		struct device_node mi2s_gpio_p[MI2S_MAX]; / used by pinctrl API */
		struct snd_soc_codec *codec;
		struct sdm660_codec sdm660_codec_fn;
		struct snd_info_entry *codec_root;