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

Commit f21f049c authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Audio dtsi changes for QM215"

parents b8b16d99 5c2e55b5

qcom/msm8917.dtsi

+5 −0
Original line number Original line Diff line number Diff line
@@ -1210,6 +1210,7 @@ 
			qcom,ipc = <&apcs 0 8>;

			qcom,ipc = <&apcs 0 8>;

			qcom,smd-edge = <1>;

			qcom,smd-edge = <1>;

			qcom,remote-pid = <2>;

			qcom,remote-pid = <2>;

			mbox-names = "adsp_smem";

			label = "adsp";

			label = "adsp";





			qcom,smd-channels = "IPCRTR";

			qcom,smd-channels = "IPCRTR";
@@ -1225,6 +1226,10 @@ 
			qcom,diag_cntl {

			qcom,diag_cntl {

				qcom,smd-channels = "DIAG_CNTL";

				qcom,smd-channels = "DIAG_CNTL";

			};

			};



			qcom,apr_tal_rpmsg {

				qcom,smd-channels = "apr_audio_svc";

			};

		};

		};





		wcnss {

		wcnss {

qcom/qm215-audio.dtsi

+8 −13
Original line number Original line Diff line number Diff line
@@ -5,14 +5,8 @@ 
	qcom,smmu-sid-mask = /bits/ 64 <0xf>;

	qcom,smmu-sid-mask = /bits/ 64 <0xf>;

};

};





&soc {

	qcom,msm-audio-apr {

		compatible = "qcom,msm-audio-apr";

		msm_audio_apr_dummy {

			compatible = "qcom,msm-audio-apr-dummy";

		};

	};





&soc {

	qcom,avtimer@c0a300c {

	qcom,avtimer@c0a300c {

		compatible = "qcom,avtimer";

		compatible = "qcom,avtimer";

		reg = <0x0c0a300c 0x4>,

		reg = <0x0c0a300c 0x4>,
@@ -21,6 +15,13 @@ 
		qcom,clk-div = <27>;

		qcom,clk-div = <27>;

	};

	};





	audio_apr: qcom,msm-audio-apr {

		compatible = "qcom,msm-audio-apr";

		q6core: q6core {

			compatible = "qcom,q6core-audio";

		};

	};



	int_codec: sound {

	int_codec: sound {

		status = "okay";

		status = "okay";

		compatible = "qcom,msm8952-audio-codec";

		compatible = "qcom,msm8952-audio-codec";
@@ -76,8 +77,6 @@ 
			<&dai_mi2s0>, <&dai_mi2s1>,

			<&dai_mi2s0>, <&dai_mi2s1>,

			<&dai_mi2s2>, <&dai_mi2s3>,

			<&dai_mi2s2>, <&dai_mi2s3>,

			<&dai_mi2s4>, <&dai_mi2s5>,

			<&dai_mi2s4>, <&dai_mi2s5>,

			<&sb_0_rx>, <&sb_0_tx>, <&sb_1_rx>, <&sb_1_tx>,

			<&sb_3_rx>, <&sb_3_tx>, <&sb_4_rx>, <&sb_4_tx>,

			<&bt_sco_rx>, <&bt_sco_tx>,

			<&bt_sco_rx>, <&bt_sco_tx>,

			<&int_fm_rx>, <&int_fm_tx>,

			<&int_fm_rx>, <&int_fm_tx>,

			<&afe_pcm_rx>, <&afe_pcm_tx>,

			<&afe_pcm_rx>, <&afe_pcm_tx>,
@@ -90,10 +89,6 @@ 
				"msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1",

				"msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1",

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

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

				"msm-dai-q6-mi2s.4", "msm-dai-q6-mi2s.6",

				"msm-dai-q6-mi2s.4", "msm-dai-q6-mi2s.6",

				"msm-dai-q6-dev.16384", "msmdai-q6-dev.16385",

				"msm-dai-q6-dev.16386", "msm-dai-q6-dev.16387",

				"msm-dai-q6-dev.16390", "msm-dai-q6-dev.16391",

				"msm-dai-q6-dev.16392", "msm-dai-q6-dev.16393",

				"msm-dai-q6-dev.12288", "msm-dai-q6-dev.12289",

				"msm-dai-q6-dev.12288", "msm-dai-q6-dev.12289",

				"msm-dai-q6-dev.12292", "msm-dai-q6-dev.12293",

				"msm-dai-q6-dev.12292", "msm-dai-q6-dev.12293",

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

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

qcom/qm215.dts

+1 −2
Original line number Original line Diff line number Diff line
@@ -2,8 +2,7 @@ 




#include "qm215.dtsi"

#include "qm215.dtsi"

#include "qm215-pm8916.dtsi"

#include "qm215-pm8916.dtsi"

/* TBD */

#include "qm215-audio.dtsi"

/* #include "qm215-audio.dtsi" */





/ {

/ {

	model = "Qualcomm Technologies, Inc. QM215";

	model = "Qualcomm Technologies, Inc. QM215";