Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1408fe61 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: msm8952: Update gpio set names and pin controls for aqp8017"

parents 300a240a a67b9f6b

arch/arm/boot/dts/qcom/apq8017-audio.dtsi

+23 −76
Original line number Diff line number Diff line
@@ -163,42 +163,25 @@ 
	qcom,msm-gpios =

		"quin_i2s",

		"us_eu_gpio",

		"sec_tdm",

		"pri_tdm";

		"quat_i2s";

	qcom,pinctrl-names =

		"all_off",

		"quin_act",

		"quin_i2s_act",

		"us_eu_gpio_act",

		"quin_us_eu_gpio_act",

		"sec_tdm_act",

		"sec_tdm_quin_i2s_act",

		"sec_tdm_us_eu_gpio_act",

		"sec_tdm_us_eu_gpio_quin_i2s_act",

		"pri_tdm_act",

		"pri_tdm_quin_i2s_act",

		"pri_tdm_us_eu_gpio_act",

		"pri_tdm_quin_i2s_us_eu_gpio_act",

		"pri_tdm_sec_tdm_act",

		"pri_tdm_sec_tdm_quin_i2s_act",

		"pri_tdm_sec_tdm_us_eu_gpio_act",

		"pri_tdm_sec_tdm_us_eu_gpio_quin_i2s_act";

		"quin_i2s_us_eu_gpio_act",

		"quat_i2s_act",

		"quat_i2s_quin_i2s_act",

		"quat_i2s_us_eu_gpio_act",

		"quat_i2s_us_eu_gpio_quin_i2s_act";

	pinctrl-names =

		"all_off",

		"quin_act",

		"quin_i2s_act",

		"us_eu_gpio_act",

		"quin_us_eu_gpio_act",

		"sec_tdm_act",

		"sec_tdm_quin_i2s_act",

		"sec_tdm_us_eu_gpio_act",

		"sec_tdm_us_eu_gpio_quin_i2s_act",

		"pri_tdm_act",

		"pri_tdm_quin_i2s_act",

		"pri_tdm_us_eu_gpio_act",

		"pri_tdm_quin_i2s_us_eu_gpio_act",

		"pri_tdm_sec_tdm_act",

		"pri_tdm_sec_tdm_quin_i2s_act",

		"pri_tdm_sec_tdm_us_eu_gpio_act",

		"pri_tdm_sec_tdm_us_eu_gpio_quin_i2s_act";

		"quin_i2s_us_eu_gpio_act",

		"quat_i2s_act",

		"quat_i2s_quin_i2s_act",

		"quat_i2s_us_eu_gpio_act",

		"quat_i2s_us_eu_gpio_quin_i2s_act";



	pinctrl-0 = <&pri_tlmm_ws_sus

		&cross_conn_det_sus &pri_mi2s_sd0_sleep
@@ -207,7 +190,7 @@ 
		&sec_mi2s_sd1_sleep &sec_mi2s_sd0_sleep>;

	pinctrl-1 = <&pri_tlmm_ws_act

		&cross_conn_det_sus &pri_mi2s_sd0_active

		&pri_mi2s_sck_active &pri_mi2s_sd1_sleep

		&pri_mi2s_sck_active &pri_mi2s_sd1_active

		&sec_mi2s_ws_sleep &sec_mi2s_sck_sleep

		&sec_mi2s_sd1_sleep &sec_mi2s_sd0_sleep>;

	pinctrl-2 = <&pri_tlmm_ws_sus
@@ -217,65 +200,25 @@ 
		&sec_mi2s_sd1_sleep &sec_mi2s_sd0_sleep>;

	pinctrl-3 = <&pri_tlmm_ws_act

		&cross_conn_det_act &pri_mi2s_sd0_active

		&pri_mi2s_sck_active &pri_mi2s_sd1_sleep

		&sec_mi2s_ws_sleep &sec_mi2s_sck_sleep

		&sec_mi2s_sd1_sleep &sec_mi2s_sd0_sleep>;

	pinctrl-4 = <&pri_tlmm_ws_act

		&cross_conn_det_sus &pri_mi2s_sd0_active

		&pri_mi2s_sck_active &pri_mi2s_sd1_active

		&sec_mi2s_ws_sleep &sec_mi2s_sck_sleep

		&sec_mi2s_sd1_sleep &sec_mi2s_sd0_sleep>;

	pinctrl-5 = <&pri_tlmm_ws_act

		&cross_conn_det_sus &pri_mi2s_sd0_active

		&pri_mi2s_sck_active &pri_mi2s_sd1_active

		&sec_mi2s_ws_sleep &sec_mi2s_sck_sleep

		&sec_mi2s_sd1_sleep &sec_mi2s_sd0_sleep>;

	pinctrl-6 = <&pri_tlmm_ws_act

		&cross_conn_det_act &pri_mi2s_sd0_active

		&pri_mi2s_sck_active &pri_mi2s_sd1_active

		&sec_mi2s_ws_sleep &sec_mi2s_sck_sleep

		&sec_mi2s_sd1_sleep &sec_mi2s_sd0_sleep>;

	pinctrl-7 = <&pri_tlmm_ws_act

		&cross_conn_det_act &pri_mi2s_sd0_active

		&pri_mi2s_sck_active &pri_mi2s_sd1_active

		&sec_mi2s_ws_sleep &sec_mi2s_sck_sleep

		&sec_mi2s_sd1_sleep &sec_mi2s_sd0_sleep>;

	pinctrl-8 = <&pri_tlmm_ws_sus

	pinctrl-4 = <&pri_tlmm_ws_sus

		&cross_conn_det_sus &pri_mi2s_sd0_sleep

		&pri_mi2s_sck_sleep &pri_mi2s_sd1_sleep

		&sec_mi2s_ws_active &sec_mi2s_sck_active

		&sec_mi2s_sd1_active &sec_mi2s_sd0_active>;

	pinctrl-9 = <&pri_tlmm_ws_act

	pinctrl-5 = <&pri_tlmm_ws_act

		&cross_conn_det_sus &pri_mi2s_sd0_active

		&pri_mi2s_sck_active &pri_mi2s_sd1_sleep

		&pri_mi2s_sck_active &pri_mi2s_sd1_active

		&sec_mi2s_ws_active &sec_mi2s_sck_active

		&sec_mi2s_sd1_active &sec_mi2s_sd0_active>;

	pinctrl-10 = <&pri_tlmm_ws_sus

	pinctrl-6 = <&pri_tlmm_ws_sus

		&cross_conn_det_act &pri_mi2s_sd0_sleep

		&pri_mi2s_sck_sleep &pri_mi2s_sd1_sleep

		&sec_mi2s_ws_active &sec_mi2s_sck_active

		&sec_mi2s_sd1_active &sec_mi2s_sd0_active>;

	pinctrl-11 = <&pri_tlmm_ws_act

		&cross_conn_det_act &pri_mi2s_sd0_active

		&pri_mi2s_sck_active &pri_mi2s_sd1_sleep

		&sec_mi2s_ws_active &sec_mi2s_sck_active

		&sec_mi2s_sd1_active &sec_mi2s_sd0_active>;

	pinctrl-12 = <&pri_tlmm_ws_act

		&cross_conn_det_sus &pri_mi2s_sd0_active

		&pri_mi2s_sck_active &pri_mi2s_sd1_active

		&sec_mi2s_ws_active &sec_mi2s_sck_active

		&sec_mi2s_sd1_active &sec_mi2s_sd0_active>;

	pinctrl-13 = <&pri_tlmm_ws_act

		&cross_conn_det_sus &pri_mi2s_sd0_active

		&pri_mi2s_sck_active &pri_mi2s_sd1_active

		&sec_mi2s_ws_active &sec_mi2s_sck_active

		&sec_mi2s_sd1_active &sec_mi2s_sd0_active>;

	pinctrl-14 = <&pri_tlmm_ws_act

		&cross_conn_det_act &pri_mi2s_sd0_active

		&pri_mi2s_sck_active &pri_mi2s_sd1_active

		&sec_mi2s_ws_active &sec_mi2s_sck_active

		&sec_mi2s_sd1_active &sec_mi2s_sd0_active>;

	pinctrl-15 = <&pri_tlmm_ws_act

	pinctrl-7 = <&pri_tlmm_ws_act

		&cross_conn_det_act &pri_mi2s_sd0_active

		&pri_mi2s_sck_active &pri_mi2s_sd1_active

		&sec_mi2s_ws_active &sec_mi2s_sck_active
@@ -388,6 +331,10 @@ 
	};

};



&dai_pri_auxpcm {

	qcom,msm-cpudai-afe-clk-ver = <2>;

};



&tlmm {

	tlmm_gpio_key {

		gpio_key_active: gpio_key_active {

sound/soc/msm/msm8952-slimbus.c

+4 −4
Original line number Diff line number Diff line
@@ -2793,7 +2793,7 @@ int msm_tdm_startup(struct snd_pcm_substream *substream) 
			return -EINVAL;

		}



		ret = msm_gpioset_activate(CLIENT_WCD_EXT, "pri_tdm");

		ret = msm_gpioset_activate(CLIENT_WCD_EXT, "quat_i2s");

		if (ret < 0)

			pr_err("%s: failed to activate primary TDM gpio set\n",

				   __func__);
@@ -2856,7 +2856,7 @@ int msm_tdm_startup(struct snd_pcm_substream *substream) 
		} else {

			return -EINVAL;

		}

		ret = msm_gpioset_activate(CLIENT_WCD_EXT, "sec_tdm");

		ret = msm_gpioset_activate(CLIENT_WCD_EXT, "quin_i2s");

		if (ret < 0)

			pr_err("%s: failed to activate secondary TDM gpio set\n",

				   __func__);
@@ -2893,7 +2893,7 @@ void msm_tdm_shutdown(struct snd_pcm_substream *substream) 
	case AFE_PORT_ID_PRIMARY_TDM_TX_5:

	case AFE_PORT_ID_PRIMARY_TDM_TX_6:

	case AFE_PORT_ID_PRIMARY_TDM_TX_7:

		ret = msm_gpioset_suspend(CLIENT_WCD_EXT, "pri_tdm");

		ret = msm_gpioset_suspend(CLIENT_WCD_EXT, "quat_i2s");

		if (ret < 0) {

			pr_err("%s: gpio set cannot be de-activated %s\n",

					__func__, "pri_tdm");
@@ -2916,7 +2916,7 @@ void msm_tdm_shutdown(struct snd_pcm_substream *substream) 
	case AFE_PORT_ID_SECONDARY_TDM_TX_5:

	case AFE_PORT_ID_SECONDARY_TDM_TX_6:

	case AFE_PORT_ID_SECONDARY_TDM_TX_7:

		ret = msm_gpioset_suspend(CLIENT_WCD_EXT, "sec_tdm");

		ret = msm_gpioset_suspend(CLIENT_WCD_EXT, "quin_i2s");

		if (ret < 0) {

			pr_err("%s: gpio set cannot be de-activated %s\n",

				   __func__, "sec_tdm");