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

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

Merge "ARM: dts: msm: add support for secondary MI2S on msm8996 adp/cdp"

parents fb45b110 f2d361d5

arch/arm/boot/dts/qcom/apq8096-auto-dragonboard.dtsi

+13 −3
Original line number Diff line number Diff line 
/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -624,7 +624,7 @@ 
				"msm-pcm-routing", "msm-compr-dsp",

				"msm-pcm-loopback.1";

		asoc-cpu = <&dai_pri_auxpcm>, <&dai_sec_auxpcm>, <&dai_hdmi>,

				<&dai_mi2s>, <&dai_mi2s_quat>,

				<&dai_mi2s_sec>, <&dai_mi2s>, <&dai_mi2s_quat>,

				<&afe_pcm_rx>, <&afe_pcm_tx>,

				<&afe_proxy_rx>, <&afe_proxy_tx>,

				<&incall_record_rx>, <&incall_record_tx>,
@@ -638,7 +638,7 @@ 
				<&dai_quat_tdm_tx_0>, <&dai_quat_tdm_tx_1>,

				<&dai_quat_tdm_tx_2>, <&dai_quat_tdm_tx_3>;

		asoc-cpu-names = "msm-dai-q6-auxpcm.1", "msm-dai-q6-auxpcm.2",

				"msm-dai-q6-hdmi.8",

				"msm-dai-q6-hdmi.8", "msm-dai-q6-mi2s.1",

				"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",

				"msm-dai-q6-dev.224", "msm-dai-q6-dev.225",

				"msm-dai-q6-dev.241", "msm-dai-q6-dev.240",
@@ -668,6 +668,16 @@ 
	};



	qcom,msm-dai-mi2s {

		dai_mi2s_sec: qcom,msm-dai-q6-mi2s-sec {

			qcom,msm-mi2s-rx-lines = <2>;

			qcom,msm-mi2s-tx-lines = <1>;

			pinctrl-names = "default", "sleep";

			pinctrl-0 = <&sec_mi2s_active &sec_mi2s_sd0_active

				&sec_mi2s_sd1_active>;

			pinctrl-1 = <&sec_mi2s_sleep &sec_mi2s_sd0_sleep

				&sec_mi2s_sd1_sleep>;

		};



		dai_mi2s_quat: qcom,msm-dai-q6-mi2s-quat {

			pinctrl-names = "default", "sleep";

			pinctrl-0 = <&quat_mi2s_active &quat_mi2s_sd0_active>;

arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi

+5 −3
Original line number Diff line number Diff line 
/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -607,7 +607,7 @@ 
				"msm-pcm-routing", "msm-compr-dsp",

				"msm-pcm-loopback.1";

		asoc-cpu = <&dai_pri_auxpcm>, <&dai_sec_auxpcm>, <&dai_hdmi>,

				<&dai_mi2s>, <&dai_mi2s_quat>,

				<&dai_mi2s_sec>, <&dai_mi2s>, <&dai_mi2s_quat>,

				<&afe_pcm_rx>, <&afe_pcm_tx>,

				<&afe_proxy_rx>, <&afe_proxy_tx>,

				<&incall_record_rx>, <&incall_record_tx>,
@@ -621,7 +621,7 @@ 
				<&dai_quat_tdm_tx_0>, <&dai_quat_tdm_tx_1>,

				<&dai_quat_tdm_tx_2>, <&dai_quat_tdm_tx_3>;

		asoc-cpu-names = "msm-dai-q6-auxpcm.1", "msm-dai-q6-auxpcm.2",

				"msm-dai-q6-hdmi.8",

				"msm-dai-q6-hdmi.8", "msm-dai-q6-mi2s.1",

				"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",

				"msm-dai-q6-dev.224", "msm-dai-q6-dev.225",

				"msm-dai-q6-dev.241", "msm-dai-q6-dev.240",
@@ -651,6 +651,8 @@ 


	qcom,msm-dai-mi2s {

		dai_mi2s_sec: qcom,msm-dai-q6-mi2s-sec {

			qcom,msm-mi2s-rx-lines = <2>;

			qcom,msm-mi2s-tx-lines = <1>;

			pinctrl-names = "default", "sleep";

			pinctrl-0 = <&sec_mi2s_active &sec_mi2s_sd0_active

				&sec_mi2s_sd1_active>;

arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi

+13 −3
Original line number Diff line number Diff line 
/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -628,7 +628,7 @@ 
				"msm-pcm-routing", "msm-compr-dsp",

				"msm-pcm-loopback.1";

		asoc-cpu = <&dai_pri_auxpcm>, <&dai_sec_auxpcm>, <&dai_hdmi>,

				<&dai_mi2s>, <&dai_mi2s_quat>,

				<&dai_mi2s_sec>, <&dai_mi2s>, <&dai_mi2s_quat>,

				<&afe_pcm_rx>, <&afe_pcm_tx>,

				<&afe_proxy_rx>, <&afe_proxy_tx>,

				<&incall_record_rx>, <&incall_record_tx>,
@@ -642,7 +642,7 @@ 
				<&dai_quat_tdm_tx_0>, <&dai_quat_tdm_tx_1>,

				<&dai_quat_tdm_tx_2>, <&dai_quat_tdm_tx_3>;

		asoc-cpu-names = "msm-dai-q6-auxpcm.1", "msm-dai-q6-auxpcm.2",

				"msm-dai-q6-hdmi.8",

				"msm-dai-q6-hdmi.8", "msm-dai-q6-mi2s.1",

				"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",

				"msm-dai-q6-dev.224", "msm-dai-q6-dev.225",

				"msm-dai-q6-dev.241", "msm-dai-q6-dev.240",
@@ -688,6 +688,16 @@ 
	};



	qcom,msm-dai-mi2s {

		dai_mi2s_sec: qcom,msm-dai-q6-mi2s-sec {

			qcom,msm-mi2s-rx-lines = <2>;

			qcom,msm-mi2s-tx-lines = <1>;

			pinctrl-names = "default", "sleep";

			pinctrl-0 = <&sec_mi2s_active &sec_mi2s_sd0_active

				&sec_mi2s_sd1_active>;

			pinctrl-1 = <&sec_mi2s_sleep &sec_mi2s_sd0_sleep

				&sec_mi2s_sd1_sleep>;

		};



		dai_mi2s_quat: qcom,msm-dai-q6-mi2s-quat {

			pinctrl-names = "default", "sleep";

			pinctrl-0 = <&quat_mi2s_active &quat_mi2s_sd0_active>;

arch/arm/boot/dts/qcom/msm8996-mmxf-adp.dtsi

+13 −3
Original line number Diff line number Diff line 
/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -533,7 +533,7 @@ 
				"msm-pcm-routing", "msm-compr-dsp",

				"msm-pcm-loopback.1";

		asoc-cpu = <&dai_pri_auxpcm>, <&dai_sec_auxpcm>, <&dai_hdmi>,

				<&dai_mi2s>, <&dai_mi2s_quat>,

				<&dai_mi2s_sec>, <&dai_mi2s>, <&dai_mi2s_quat>,

				<&afe_pcm_rx>, <&afe_pcm_tx>,

				<&afe_proxy_rx>, <&afe_proxy_tx>,

				<&incall_record_rx>, <&incall_record_tx>,
@@ -547,7 +547,7 @@ 
				<&dai_quat_tdm_tx_0>, <&dai_quat_tdm_tx_1>,

				<&dai_quat_tdm_tx_2>, <&dai_quat_tdm_tx_3>;

		asoc-cpu-names = "msm-dai-q6-auxpcm.1", "msm-dai-q6-auxpcm.2",

				"msm-dai-q6-hdmi.8",

				"msm-dai-q6-hdmi.8", "msm-dai-q6-mi2s.1",

				"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",

				"msm-dai-q6-dev.224", "msm-dai-q6-dev.225",

				"msm-dai-q6-dev.241", "msm-dai-q6-dev.240",
@@ -571,6 +571,16 @@ 
	};



	qcom,msm-dai-mi2s {

		dai_mi2s_sec: qcom,msm-dai-q6-mi2s-sec {

			qcom,msm-mi2s-rx-lines = <2>;

			qcom,msm-mi2s-tx-lines = <1>;

			pinctrl-names = "default", "sleep";

			pinctrl-0 = <&sec_mi2s_active &sec_mi2s_sd0_active

				&sec_mi2s_sd1_active>;

			pinctrl-1 = <&sec_mi2s_sleep &sec_mi2s_sd0_sleep

				&sec_mi2s_sd1_sleep>;

		};



		dai_mi2s_quat: qcom,msm-dai-q6-mi2s-quat {

			pinctrl-names = "default", "sleep";

			pinctrl-0 = <&quat_mi2s_active &quat_mi2s_sd0_active>;