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

Commit 51d73696 authored by Shashi Kant Maurya's avatar Shashi Kant Maurya Committed by Gerrit - the friendly Code Review server
Browse files

ARM: dts: msm: Audio dtsi changes for SDM429 MTP 

Update the msm8937 audio dtsi for sdm429 mtp target and added
wsa881x analog clock changes.
Shortened pmic analog codec name to fix analog codec
probe issues.

Change-Id: I59e331463b9e4918ccb6fcbaeed4abebe5e4a55b
parent ed9443d3

qcom/msm8937-audio.dtsi

+18 −19
Original line number Diff line number Diff line 
#include <dt-bindings/clock/qcom,audio-ext-clk.h>

#include "msm-audio-lpass.dtsi"

#include "msm8953-wsa881x.dtsi"
@@ -7,10 +8,10 @@ 
};



&soc {

	qcom,msm-audio-apr {

	audio_apr: qcom,msm-audio-apr {

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

		msm_audio_apr_dummy {

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

		q6core: q6core {

			compatible = "qcom,q6core-audio";

		};

	};
@@ -81,37 +82,25 @@ 
			<&dai_mi2s0>, <&dai_mi2s1>,

			<&dai_mi2s2>, <&dai_mi2s3>,

			<&dai_mi2s4>, <&dai_mi2s5>,

			/* TBD

			 * &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>,

			<&int_fm_rx>, <&int_fm_tx>,

			<&afe_pcm_rx>, <&afe_pcm_tx>,

			<&afe_proxy_rx>, <&afe_proxy_tx>,

			<&incall_record_rx>, <&incall_record_tx>,

			<&incall_music_rx>, <&incall_music_2_rx>;

			/* TBD

			 * <&proxy_rx>, <&proxy_tx>;

			 */

			<&incall_music_rx>, <&incall_music_2_rx>,

			<&proxy_rx>, <&proxy_tx>;



		asoc-cpu-names = "msm-dai-q6-auxpcm.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.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.12292", "msm-dai-q6-dev.12293",

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

				"msm-dai-q6-dev.241", "msm-dai-q6-dev.240",

				"msm-dai-q6-dev.32771", "msm-dai-q6-dev.32772",

				"msm-dai-q6-dev.32773", "msm-dai-q6-dev.32770";

				/* TBD

				 * "msm-dai-q6-dev.8194", "msm-dai-q6-dev.8195";

				 */

				"msm-dai-q6-dev.32773", "msm-dai-q6-dev.32770",

				"msm-dai-q6-dev.8194", "msm-dai-q6-dev.8195";



		asoc-codec = <&stub_codec>, <&msm_digital_codec>,

				<&pmic_analog_codec>;
@@ -154,6 +143,8 @@ 
			status = "okay";

			compatible = "qcom,wsa881x-i2c-codec";

			reg = <0x0f>;

			clock-names = "wsa_mclk";

			clocks = <&wsa881x_analog_clk 0>;

			qcom,wsa-analog-vi-gpio = <&wsa881x_analog_vi_gpio>;

			qcom,wsa-analog-clk-gpio = <&wsa881x_analog_clk_gpio>;

			qcom,wsa-analog-reset-gpio =
@@ -188,6 +179,14 @@ 
		pinctrl-1 = <&wsa_reset_off>;

	};



	wsa881x_analog_clk: wsa_ana_clk {

		compatible = "qcom,audio-ref-clk";

		qcom,codec-ext-clk-src = <AUDIO_LPASS_MCLK_2>;

		qcom,codec-lpass-ext-clk-freq = <9600000>;

		qcom,codec-lpass-clk-id = <0x301>;

		#clock-cells = <1>;

	};



	ext_codec: sound-9335 {

		status = "disabled";

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

qcom/msm8937.dtsi

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

			qcom,smd-edge = <1>;

			qcom,remote-pid = <2>;

			mbox-names = "adsp_smem";

			label = "adsp";



			qcom,smd-channels = "IPCRTR";
@@ -1504,6 +1505,10 @@ 
			qcom,diag_cntl {

				qcom,smd-channels = "DIAG_CNTL";

			};



			qcom,apr_tal_rpmsg {

				qcom,smd-channels = "apr_audio_svc";

			};

		};



		wcnss {

qcom/sdm439-audio.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ 
};



&pm8953_1 {

	pmic_analog_codec: analog-codec@f000 {

	pmic_analog_codec: anlg-cdc@f000 {

		status = "okay";

		compatible = "qcom,pmic-analog-codec";

		reg = <0xf000 0x200>;