diff --git a/Kbuild b/Kbuild
index c8e31331..4fc92edb 100644
--- a/Kbuild
+++ b/Kbuild
@@ -1,4 +1,4 @@
-
+ifeq ($(CONFIG_ARCH_KALAMA), y)
 dtbo-y += kalama-audio.dtbo \
                  kalama-audio-cdp.dtbo \
                  kalama-audio-wsa883x-cdp.dtbo \
@@ -7,6 +7,11 @@ dtbo-y += kalama-audio.dtbo \
                  kalama-audio-qrd.dtbo \
                  kalama-audio-rcm.dtbo \
                  kalama-audio-rumi.dtbo
+endif
+
+ifeq ($(CONFIG_ARCH_SA8155), y)
+dtbo-y +=  sa8155-audio.dtbo
+endif
 
  always-y    := $(dtb-y) $(dtbo-y)
  subdir-y    := $(dts-dirs)
diff --git a/msm-auto-audio-lpass.dtsi b/msm-auto-audio-lpass.dtsi
new file mode 100644
index 00000000..381131be
--- /dev/null
+++ b/msm-auto-audio-lpass.dtsi
@@ -0,0 +1,914 @@
+&soc {
+	pcm0: qcom,msm-pcm {
+		compatible = "qcom,msm-pcm-dsp";
+		qcom,msm-pcm-dsp-id = <0>;
+	};
+
+	routing: qcom,msm-pcm-routing {
+		compatible = "qcom,msm-pcm-routing";
+	};
+
+	compr: qcom,msm-compr-dsp {
+		compatible = "qcom,msm-compr-dsp";
+	};
+
+	pcm1: qcom,msm-pcm-low-latency {
+		compatible = "qcom,msm-pcm-dsp";
+		qcom,msm-pcm-dsp-id = <1>;
+		qcom,msm-pcm-low-latency;
+		qcom,latency-level = "regular";
+	};
+
+	pcm2: qcom,msm-ultra-low-latency {
+		compatible = "qcom,msm-pcm-dsp";
+		qcom,msm-pcm-dsp-id = <2>;
+		qcom,msm-pcm-low-latency;
+		qcom,latency-level = "ultra";
+	};
+
+	pcm_noirq: qcom,msm-pcm-dsp-noirq {
+		compatible = "qcom,msm-pcm-dsp-noirq";
+		qcom,msm-pcm-low-latency;
+		qcom,latency-level = "ultra";
+	};
+
+	trans_loopback: qcom,msm-transcode-loopback {
+		compatible = "qcom,msm-transcode-loopback";
+	};
+
+	compress: qcom,msm-compress-dsp {
+		compatible = "qcom,msm-compress-dsp";
+	};
+
+	voip: qcom,msm-voip-dsp {
+		compatible = "qcom,msm-voip-dsp";
+	};
+
+	voice: qcom,msm-pcm-voice {
+		compatible = "qcom,msm-pcm-voice";
+		qcom,destroy-cvd;
+	};
+
+	stub_codec: qcom,msm-stub-codec {
+		compatible = "qcom,msm-stub-codec";
+	};
+
+	qcom,msm-dai-fe {
+		compatible = "qcom,msm-dai-fe";
+	};
+
+	afe: qcom,msm-pcm-afe {
+		compatible = "qcom,msm-pcm-afe";
+	};
+
+	dai_hdmi: qcom,msm-dai-q6-hdmi {
+		compatible = "qcom,msm-dai-q6-hdmi";
+		qcom,msm-dai-q6-dev-id = <8>;
+	};
+
+	dai_dp: qcom,msm-dai-q6-dp {
+		compatible = "qcom,msm-dai-q6-hdmi";
+		qcom,msm-dai-q6-dev-id = <0>;
+	};
+
+	dai_dp1: qcom,msm-dai-q6-dp1 {
+		compatible = "qcom,msm-dai-q6-hdmi";
+		qcom,msm-dai-q6-dev-id = <1>;
+	};
+
+	loopback: qcom,msm-pcm-loopback {
+		compatible = "qcom,msm-pcm-loopback";
+	};
+
+	loopback1: qcom,msm-pcm-loopback-low-latency {
+		compatible = "qcom,msm-pcm-loopback";
+		qcom,msm-pcm-loopback-low-latency;
+	};
+
+	pcm_dtmf: qcom,msm-pcm-dtmf {
+		compatible = "qcom,msm-pcm-dtmf";
+	};
+
+	msm_dai_mi2s: qcom,msm-dai-mi2s {
+		compatible = "qcom,msm-dai-mi2s";
+		dai_mi2s0_rx: qcom,msm-dai-q6-mi2s-prim-rx {
+			compatible = "qcom,msm-dai-q6-mi2s";
+			qcom,msm-dai-q6-mi2s-dev-id = <0>;
+			qcom,msm-mi2s-lines = <3>;
+		};
+
+		dai_mi2s0_tx: qcom,msm-dai-q6-mi2s-prim-tx {
+			compatible = "qcom,msm-dai-q6-mi2s";
+			qcom,msm-dai-q6-mi2s-dev-id = <1>;
+			qcom,msm-mi2s-lines = <1>;
+		};
+
+		dai_mi2s1_rx: qcom,msm-dai-q6-mi2s-sec-rx {
+			compatible = "qcom,msm-dai-q6-mi2s";
+			qcom,msm-dai-q6-mi2s-dev-id = <2>;
+			qcom,msm-mi2s-lines = <1>;
+		};
+
+		dai_mi2s1_tx: qcom,msm-dai-q6-mi2s-sec-tx {
+			compatible = "qcom,msm-dai-q6-mi2s";
+			qcom,msm-dai-q6-mi2s-dev-id = <3>;
+			qcom,msm-mi2s-lines = <1>;
+		};
+
+		dai_mi2s2_rx: qcom,msm-dai-q6-mi2s-tert-rx {
+			compatible = "qcom,msm-dai-q6-mi2s";
+			qcom,msm-dai-q6-mi2s-dev-id = <4>;
+			qcom,msm-mi2s-lines = <1>;
+		};
+
+		dai_mi2s2_tx: qcom,msm-dai-q6-mi2s-tert-tx {
+			compatible = "qcom,msm-dai-q6-mi2s";
+			qcom,msm-dai-q6-mi2s-dev-id = <5>;
+			qcom,msm-mi2s-lines = <3>;
+		};
+
+		dai_mi2s3_rx: qcom,msm-dai-q6-mi2s-quat-rx {
+			compatible = "qcom,msm-dai-q6-mi2s";
+			qcom,msm-dai-q6-mi2s-dev-id = <6>;
+			qcom,msm-mi2s-lines = <1>;
+		};
+
+		dai_mi2s3_tx: qcom,msm-dai-q6-mi2s-quat-tx {
+			compatible = "qcom,msm-dai-q6-mi2s";
+			qcom,msm-dai-q6-mi2s-dev-id = <7>;
+			qcom,msm-mi2s-lines = <2>;
+		};
+
+		dai_mi2s4_rx: qcom,msm-dai-q6-mi2s-quin-rx {
+			compatible = "qcom,msm-dai-q6-mi2s";
+			qcom,msm-dai-q6-mi2s-dev-id = <8>;
+			qcom,msm-mi2s-lines = <1>;
+		};
+
+		dai_mi2s4_tx: qcom,msm-dai-q6-mi2s-quin-tx {
+			compatible = "qcom,msm-dai-q6-mi2s";
+			qcom,msm-dai-q6-mi2s-dev-id = <9>;
+			qcom,msm-mi2s-lines = <2>;
+		};
+
+		dai_mi2s5_rx: qcom,msm-dai-q6-mi2s-senary-rx {
+			compatible = "qcom,msm-dai-q6-mi2s";
+			qcom,msm-dai-q6-mi2s-dev-id = <10>;
+			qcom,msm-mi2s-lines = <1>;
+		};
+
+		dai_mi2s5_tx: qcom,msm-dai-q6-mi2s-senary-tx {
+			compatible = "qcom,msm-dai-q6-mi2s";
+			qcom,msm-dai-q6-mi2s-dev-id = <11>;
+			qcom,msm-mi2s-lines = <3>;
+		};
+	};
+
+	msm_dai_cdc_dma: qcom,msm-dai-cdc-dma {
+		compatible = "qcom,msm-dai-cdc-dma";
+		wsa_cdc_dma_0_rx: qcom,msm-dai-wsa-cdc-dma-0-rx {
+			compatible = "qcom,msm-dai-cdc-dma-dev";
+			qcom,msm-dai-cdc-dma-dev-id = <45056>;
+		};
+
+		wsa_cdc_dma_0_tx: qcom,msm-dai-wsa-cdc-dma-0-tx {
+			compatible = "qcom,msm-dai-cdc-dma-dev";
+			qcom,msm-dai-cdc-dma-dev-id = <45057>;
+		};
+
+		wsa_cdc_dma_1_rx: qcom,msm-dai-wsa-cdc-dma-1-rx {
+			compatible = "qcom,msm-dai-cdc-dma-dev";
+			qcom,msm-dai-cdc-dma-dev-id = <45058>;
+		};
+
+		wsa_cdc_dma_1_tx: qcom,msm-dai-wsa-cdc-dma-1-tx {
+			compatible = "qcom,msm-dai-cdc-dma-dev";
+			qcom,msm-dai-cdc-dma-dev-id = <45059>;
+		};
+
+		wsa_cdc_dma_2_tx: qcom,msm-dai-wsa-cdc-dma-2-tx {
+			compatible = "qcom,msm-dai-cdc-dma-dev";
+			qcom,msm-dai-cdc-dma-dev-id = <45061>;
+		};
+
+		va_cdc_dma_0_tx: qcom,msm-dai-va-cdc-dma-0-tx {
+			compatible = "qcom,msm-dai-cdc-dma-dev";
+			qcom,msm-dai-cdc-dma-dev-id = <45089>;
+		};
+
+		va_cdc_dma_1_tx: qcom,msm-dai-va-cdc-dma-1-tx {
+			compatible = "qcom,msm-dai-cdc-dma-dev";
+			qcom,msm-dai-cdc-dma-dev-id = <45091>;
+		};
+
+		va_cdc_dma_2_tx: qcom,msm-dai-va-cdc-dma-2-tx {
+			compatible = "qcom,msm-dai-cdc-dma-dev";
+			qcom,msm-dai-cdc-dma-dev-id = <45093>;
+		};
+
+		rx_cdc_dma_0_rx: qcom,msm-dai-rx-cdc-dma-0-rx {
+			compatible = "qcom,msm-dai-cdc-dma-dev";
+			qcom,msm-dai-cdc-dma-dev-id = <45104>;
+		};
+
+		rx_cdc_dma_1_rx: qcom,msm-dai-rx-cdc-dma-1-rx {
+			compatible = "qcom,msm-dai-cdc-dma-dev";
+			qcom,msm-dai-cdc-dma-dev-id = <45106>;
+		};
+
+		rx_cdc_dma_2_rx: qcom,msm-dai-rx-cdc-dma-2-rx {
+			compatible = "qcom,msm-dai-cdc-dma-dev";
+			qcom,msm-dai-cdc-dma-dev-id = <45108>;
+		};
+
+		rx_cdc_dma_3_rx: qcom,msm-dai-rx-cdc-dma-3-rx {
+			compatible = "qcom,msm-dai-cdc-dma-dev";
+			qcom,msm-dai-cdc-dma-dev-id = <45110>;
+		};
+
+		rx_cdc_dma_4_rx: qcom,msm-dai-rx-cdc-dma-4-rx {
+			compatible = "qcom,msm-dai-cdc-dma-dev";
+			qcom,msm-dai-cdc-dma-dev-id = <45112>;
+		};
+
+		rx_cdc_dma_5_rx: qcom,msm-dai-rx-cdc-dma-5-rx {
+			compatible = "qcom,msm-dai-cdc-dma-dev";
+			qcom,msm-dai-cdc-dma-dev-id = <45114>;
+		};
+
+		rx_cdc_dma_6_rx: qcom,msm-dai-rx-cdc-dma-6-rx {
+			compatible = "qcom,msm-dai-cdc-dma-dev";
+			qcom,msm-dai-cdc-dma-dev-id = <45116>;
+			qcom,msm-cdc-dma-data-align = <1>;
+		};
+
+		rx_cdc_dma_7_rx: qcom,msm-dai-rx-cdc-dma-7-rx {
+			compatible = "qcom,msm-dai-cdc-dma-dev";
+			qcom,msm-dai-cdc-dma-dev-id = <45118>;
+		};
+
+		tx_cdc_dma_0_tx: qcom,msm-dai-tx-cdc-dma-0-tx {
+			compatible = "qcom,msm-dai-cdc-dma-dev";
+			qcom,msm-dai-cdc-dma-dev-id = <45105>;
+		};
+
+		tx_cdc_dma_1_tx: qcom,msm-dai-tx-cdc-dma-1-tx {
+			compatible = "qcom,msm-dai-cdc-dma-dev";
+			qcom,msm-dai-cdc-dma-dev-id = <45107>;
+		};
+
+		tx_cdc_dma_2_tx: qcom,msm-dai-tx-cdc-dma-2-tx {
+			compatible = "qcom,msm-dai-cdc-dma-dev";
+			qcom,msm-dai-cdc-dma-dev-id = <45109>;
+		};
+
+		tx_cdc_dma_3_tx: qcom,msm-dai-tx-cdc-dma-3-tx {
+			compatible = "qcom,msm-dai-cdc-dma-dev";
+			qcom,msm-dai-cdc-dma-dev-id = <45111>;
+		};
+
+		tx_cdc_dma_4_tx: qcom,msm-dai-tx-cdc-dma-4-tx {
+			compatible = "qcom,msm-dai-cdc-dma-dev";
+			qcom,msm-dai-cdc-dma-dev-id = <45113>;
+		};
+
+		tx_cdc_dma_5_tx: qcom,msm-dai-tx-cdc-dma-5-tx {
+			compatible = "qcom,msm-dai-cdc-dma-dev";
+			qcom,msm-dai-cdc-dma-dev-id = <45115>;
+		};
+	};
+
+	lsm: qcom,msm-lsm-client {
+		compatible = "qcom,msm-lsm-client";
+	};
+
+	dai_msm_q6:qcom,msm-dai-q6 {
+		compatible = "qcom,msm-dai-q6";
+		sb_7_rx: qcom,msm-dai-q6-sb-7-rx {
+			compatible = "qcom,msm-dai-q6-dev";
+			qcom,msm-dai-q6-dev-id = <16398>;
+			qcom,msm-dai-q6-slim-dev-id = <0>;
+		};
+
+		sb_7_tx: qcom,msm-dai-q6-sb-7-tx {
+			compatible = "qcom,msm-dai-q6-dev";
+			qcom,msm-dai-q6-dev-id = <16399>;
+			qcom,msm-dai-q6-slim-dev-id = <0>;
+		};
+
+		sb_8_tx: qcom,msm-dai-q6-sb-8-tx {
+			compatible = "qcom,msm-dai-q6-dev";
+			qcom,msm-dai-q6-dev-id = <16401>;
+			qcom,msm-dai-q6-slim-dev-id = <0>;
+		};
+
+		bt_sco_rx: qcom,msm-dai-q6-bt-sco-rx {
+			compatible = "qcom,msm-dai-q6-dev";
+			qcom,msm-dai-q6-dev-id = <12288>;
+		};
+
+		bt_sco_tx: qcom,msm-dai-q6-bt-sco-tx {
+			compatible = "qcom,msm-dai-q6-dev";
+			qcom,msm-dai-q6-dev-id = <12289>;
+		};
+
+		int_fm_rx: qcom,msm-dai-q6-int-fm-rx {
+			compatible = "qcom,msm-dai-q6-dev";
+			qcom,msm-dai-q6-dev-id = <12292>;
+		};
+
+		int_fm_tx: qcom,msm-dai-q6-int-fm-tx {
+			compatible = "qcom,msm-dai-q6-dev";
+			qcom,msm-dai-q6-dev-id = <12293>;
+		};
+
+		afe_pcm_rx: qcom,msm-dai-q6-be-afe-pcm-rx {
+			compatible = "qcom,msm-dai-q6-dev";
+			qcom,msm-dai-q6-dev-id = <224>;
+		};
+
+		afe_pcm_tx: qcom,msm-dai-q6-be-afe-pcm-tx {
+			compatible = "qcom,msm-dai-q6-dev";
+			qcom,msm-dai-q6-dev-id = <225>;
+		};
+
+		afe_proxy_rx: qcom,msm-dai-q6-afe-proxy-rx {
+			compatible = "qcom,msm-dai-q6-dev";
+			qcom,msm-dai-q6-dev-id = <241>;
+		};
+
+		afe_proxy_tx: qcom,msm-dai-q6-afe-proxy-tx {
+			compatible = "qcom,msm-dai-q6-dev";
+			qcom,msm-dai-q6-dev-id = <240>;
+		};
+
+		incall_record_rx: qcom,msm-dai-q6-incall-record-rx {
+			compatible = "qcom,msm-dai-q6-dev";
+			qcom,msm-dai-q6-dev-id = <32771>;
+		};
+
+		incall_record_tx: qcom,msm-dai-q6-incall-record-tx {
+			compatible = "qcom,msm-dai-q6-dev";
+			qcom,msm-dai-q6-dev-id = <32772>;
+		};
+
+		incall_music_rx: qcom,msm-dai-q6-incall-music-rx {
+			compatible = "qcom,msm-dai-q6-dev";
+			qcom,msm-dai-q6-dev-id = <32773>;
+		};
+
+		incall_music_2_rx: qcom,msm-dai-q6-incall-music-2-rx {
+			compatible = "qcom,msm-dai-q6-dev";
+			qcom,msm-dai-q6-dev-id = <32770>;
+		};
+
+		afe_proxy_tx_1: qcom,msm-dai-q6-afe-proxy-tx-1 {
+			compatible = "qcom,msm-dai-q6-dev";
+			qcom,msm-dai-q6-dev-id = <242>;
+		};
+
+		proxy_rx: qcom,msm-dai-q6-proxy-rx {
+			compatible = "qcom,msm-dai-q6-dev";
+			qcom,msm-dai-q6-dev-id = <8194>;
+		};
+
+		proxy_tx: qcom,msm-dai-q6-proxy-tx {
+			compatible = "qcom,msm-dai-q6-dev";
+			qcom,msm-dai-q6-dev-id = <8195>;
+		};
+
+		usb_audio_rx: qcom,msm-dai-q6-usb-audio-rx {
+			compatible = "qcom,msm-dai-q6-dev";
+			qcom,msm-dai-q6-dev-id = <28672>;
+		};
+
+		usb_audio_tx: qcom,msm-dai-q6-usb-audio-tx {
+			compatible = "qcom,msm-dai-q6-dev";
+			qcom,msm-dai-q6-dev-id = <28673>;
+		};
+	};
+
+	hostless: qcom,msm-pcm-hostless {
+		compatible = "qcom,msm-pcm-hostless";
+	};
+
+	audio_apr: qcom,msm-audio-apr {
+		compatible = "qcom,msm-audio-apr";
+		qcom,subsys-name = "apr_adsp";
+
+		msm_audio_ion: qcom,msm-audio-ion {
+			compatible = "qcom,msm-audio-ion";
+			qcom,smmu-version = <2>;
+			qcom,smmu-enabled;
+			iommus = <&apps_smmu 0x1801 0x0>;
+			qcom,iommu-dma-addr-pool = <0x10000000 0x10000000>;
+		};
+	};
+
+	dai_pri_auxpcm: qcom,msm-pri-auxpcm {
+		compatible = "qcom,msm-auxpcm-dev";
+		qcom,msm-cpudai-auxpcm-mode = <0>, <0>;
+		qcom,msm-cpudai-auxpcm-sync = <1>, <1>;
+		qcom,msm-cpudai-auxpcm-frame = <5>, <4>;
+		qcom,msm-cpudai-auxpcm-quant = <2>, <2>;
+		qcom,msm-cpudai-auxpcm-num-slots = <1>, <1>;
+		qcom,msm-cpudai-auxpcm-slot-mapping = <1>, <1>;
+		qcom,msm-cpudai-auxpcm-data = <0>, <0>;
+		qcom,msm-cpudai-auxpcm-pcm-clk-rate = <2048000>, <2048000>;
+		qcom,msm-auxpcm-interface = "primary";
+		qcom,msm-cpudai-afe-clk-ver = <2>;
+	};
+
+	dai_sec_auxpcm: qcom,msm-sec-auxpcm {
+		compatible = "qcom,msm-auxpcm-dev";
+		qcom,msm-cpudai-auxpcm-mode = <0>, <0>;
+		qcom,msm-cpudai-auxpcm-sync = <1>, <1>;
+		qcom,msm-cpudai-auxpcm-frame = <5>, <4>;
+		qcom,msm-cpudai-auxpcm-quant = <2>, <2>;
+		qcom,msm-cpudai-auxpcm-num-slots = <1>, <1>;
+		qcom,msm-cpudai-auxpcm-slot-mapping = <1>, <1>;
+		qcom,msm-cpudai-auxpcm-data = <0>, <0>;
+		qcom,msm-cpudai-auxpcm-pcm-clk-rate = <2048000>, <2048000>;
+		qcom,msm-auxpcm-interface = "secondary";
+		qcom,msm-cpudai-afe-clk-ver = <2>;
+	};
+
+	dai_tert_auxpcm: qcom,msm-tert-auxpcm {
+		compatible = "qcom,msm-auxpcm-dev";
+		qcom,msm-cpudai-auxpcm-mode = <0>, <0>;
+		qcom,msm-cpudai-auxpcm-sync = <1>, <1>;
+		qcom,msm-cpudai-auxpcm-frame = <5>, <4>;
+		qcom,msm-cpudai-auxpcm-quant = <2>, <2>;
+		qcom,msm-cpudai-auxpcm-num-slots = <1>, <1>;
+		qcom,msm-cpudai-auxpcm-slot-mapping = <1>, <1>;
+		qcom,msm-cpudai-auxpcm-data = <0>, <0>;
+		qcom,msm-cpudai-auxpcm-pcm-clk-rate = <2048000>, <2048000>;
+		qcom,msm-auxpcm-interface = "tertiary";
+		qcom,msm-cpudai-afe-clk-ver = <2>;
+	};
+
+	dai_quat_auxpcm: qcom,msm-quat-auxpcm {
+		compatible = "qcom,msm-auxpcm-dev";
+		qcom,msm-cpudai-auxpcm-mode = <0>, <0>;
+		qcom,msm-cpudai-auxpcm-sync = <1>, <1>;
+		qcom,msm-cpudai-auxpcm-frame = <5>, <4>;
+		qcom,msm-cpudai-auxpcm-quant = <2>, <2>;
+		qcom,msm-cpudai-auxpcm-num-slots = <1>, <1>;
+		qcom,msm-cpudai-auxpcm-slot-mapping = <1>, <1>;
+		qcom,msm-cpudai-auxpcm-data = <0>, <0>;
+		qcom,msm-cpudai-auxpcm-pcm-clk-rate = <2048000>, <2048000>;
+		qcom,msm-auxpcm-interface = "quaternary";
+		qcom,msm-cpudai-afe-clk-ver = <2>;
+	};
+
+	dai_quin_auxpcm: qcom,msm-quin-auxpcm {
+		compatible = "qcom,msm-auxpcm-dev";
+		qcom,msm-cpudai-auxpcm-mode = <0>, <0>;
+		qcom,msm-cpudai-auxpcm-sync = <1>, <1>;
+		qcom,msm-cpudai-auxpcm-frame = <5>, <4>;
+		qcom,msm-cpudai-auxpcm-quant = <2>, <2>;
+		qcom,msm-cpudai-auxpcm-num-slots = <1>, <1>;
+		qcom,msm-cpudai-auxpcm-slot-mapping = <1>, <1>;
+		qcom,msm-cpudai-auxpcm-data = <0>, <0>;
+		qcom,msm-cpudai-auxpcm-pcm-clk-rate = <2048000>, <2048000>;
+		qcom,msm-auxpcm-interface = "quinary";
+		qcom,msm-cpudai-afe-clk-ver = <2>;
+	};
+
+	dai_sen_auxpcm: qcom,msm-sen-auxpcm {
+		compatible = "qcom,msm-auxpcm-dev";
+		qcom,msm-cpudai-auxpcm-mode = <0>, <0>;
+		qcom,msm-cpudai-auxpcm-sync = <1>, <1>;
+		qcom,msm-cpudai-auxpcm-frame = <5>, <4>;
+		qcom,msm-cpudai-auxpcm-quant = <2>, <2>;
+		qcom,msm-cpudai-auxpcm-num-slots = <1>, <1>;
+		qcom,msm-cpudai-auxpcm-slot-mapping = <1>, <1>;
+		qcom,msm-cpudai-auxpcm-data = <0>, <0>;
+		qcom,msm-cpudai-auxpcm-pcm-clk-rate = <2048000>, <2048000>;
+		qcom,msm-auxpcm-interface = "senary";
+		qcom,msm-cpudai-afe-clk-ver = <2>;
+	};
+
+	hdmi_dba: qcom,msm-hdmi-dba-codec-rx {
+		compatible = "qcom,msm-hdmi-dba-codec-rx";
+		qcom,dba-bridge-chip = "adv7533";
+	};
+
+	adsp_loader: qcom,msm-adsp-loader {
+		status = "ok";
+		compatible = "qcom,adsp-loader";
+		qcom,rproc-handle = <&adsp_pas>;
+		qcom,adsp-state = <0>;
+	};
+
+	adsp_notify: qcom,msm-adsp-notify {
+		status = "ok";
+		compatible = "qcom,adsp-notify";
+		qcom,rproc-handle = <&adsp_pas>;
+	};
+
+	tdm_pri_rx: qcom,msm-dai-tdm-pri-rx {
+		compatible = "qcom,msm-dai-tdm";
+		qcom,msm-cpudai-tdm-group-id = <37120>;
+		qcom,msm-cpudai-tdm-group-num-ports = <1>;
+		qcom,msm-cpudai-tdm-group-port-id = <36864>;
+		qcom,msm-cpudai-tdm-clk-rate = <1536000>;
+		qcom,msm-cpudai-tdm-clk-internal = <1>;
+		qcom,msm-cpudai-tdm-sync-mode = <1>;
+		qcom,msm-cpudai-tdm-sync-src = <1>;
+		qcom,msm-cpudai-tdm-data-out = <0>;
+		qcom,msm-cpudai-tdm-invert-sync = <1>;
+		qcom,msm-cpudai-tdm-data-delay = <1>;
+		dai_pri_tdm_rx_0: qcom,msm-dai-q6-tdm-pri-rx-0 {
+			compatible = "qcom,msm-dai-q6-tdm";
+			qcom,msm-cpudai-tdm-dev-id = <36864>;
+			qcom,msm-cpudai-tdm-data-align = <0>;
+		};
+	};
+
+	tdm_pri_tx: qcom,msm-dai-tdm-pri-tx {
+		compatible = "qcom,msm-dai-tdm";
+		qcom,msm-cpudai-tdm-group-id = <37121>;
+		qcom,msm-cpudai-tdm-group-num-ports = <1>;
+		qcom,msm-cpudai-tdm-group-port-id = <36865>;
+		qcom,msm-cpudai-tdm-clk-rate = <1536000>;
+		qcom,msm-cpudai-tdm-clk-internal = <1>;
+		qcom,msm-cpudai-tdm-sync-mode = <1>;
+		qcom,msm-cpudai-tdm-sync-src = <1>;
+		qcom,msm-cpudai-tdm-data-out = <0>;
+		qcom,msm-cpudai-tdm-invert-sync = <1>;
+		qcom,msm-cpudai-tdm-data-delay = <1>;
+		dai_pri_tdm_tx_0: qcom,msm-dai-q6-tdm-pri-tx-0 {
+			compatible = "qcom,msm-dai-q6-tdm";
+			qcom,msm-cpudai-tdm-dev-id = <36865>;
+			qcom,msm-cpudai-tdm-data-align = <0>;
+		};
+	};
+
+	tdm_sec_rx: qcom,msm-dai-tdm-sec-rx {
+		compatible = "qcom,msm-dai-tdm";
+		qcom,msm-cpudai-tdm-group-id = <37136>;
+		qcom,msm-cpudai-tdm-group-num-ports = <1>;
+		qcom,msm-cpudai-tdm-group-port-id = <36880>;
+		qcom,msm-cpudai-tdm-clk-rate = <1536000>;
+		qcom,msm-cpudai-tdm-clk-internal = <1>;
+		qcom,msm-cpudai-tdm-sync-mode = <1>;
+		qcom,msm-cpudai-tdm-sync-src = <1>;
+		qcom,msm-cpudai-tdm-data-out = <0>;
+		qcom,msm-cpudai-tdm-invert-sync = <1>;
+		qcom,msm-cpudai-tdm-data-delay = <1>;
+		dai_sec_tdm_rx_0: qcom,msm-dai-q6-tdm-sec-rx-0 {
+			compatible = "qcom,msm-dai-q6-tdm";
+			qcom,msm-cpudai-tdm-dev-id = <36880>;
+			qcom,msm-cpudai-tdm-data-align = <0>;
+		};
+	};
+
+	tdm_sec_tx: qcom,msm-dai-tdm-sec-tx {
+		compatible = "qcom,msm-dai-tdm";
+		qcom,msm-cpudai-tdm-group-id = <37137>;
+		qcom,msm-cpudai-tdm-group-num-ports = <1>;
+		qcom,msm-cpudai-tdm-group-port-id = <36881>;
+		qcom,msm-cpudai-tdm-clk-rate = <1536000>;
+		qcom,msm-cpudai-tdm-clk-internal = <1>;
+		qcom,msm-cpudai-tdm-sync-mode = <1>;
+		qcom,msm-cpudai-tdm-sync-src = <1>;
+		qcom,msm-cpudai-tdm-data-out = <0>;
+		qcom,msm-cpudai-tdm-invert-sync = <1>;
+		qcom,msm-cpudai-tdm-data-delay = <1>;
+		dai_sec_tdm_tx_0: qcom,msm-dai-q6-tdm-sec-tx-0 {
+			compatible = "qcom,msm-dai-q6-tdm";
+			qcom,msm-cpudai-tdm-dev-id = <36881>;
+			qcom,msm-cpudai-tdm-data-align = <0>;
+		};
+	};
+
+	tdm_tert_rx: qcom,msm-dai-tdm-tert-rx {
+		compatible = "qcom,msm-dai-tdm";
+		qcom,msm-cpudai-tdm-group-id = <37152>;
+		qcom,msm-cpudai-tdm-group-num-ports = <1>;
+		qcom,msm-cpudai-tdm-group-port-id = <36896>;
+		qcom,msm-cpudai-tdm-clk-rate = <1536000>;
+		qcom,msm-cpudai-tdm-clk-internal = <1>;
+		qcom,msm-cpudai-tdm-sync-mode = <1>;
+		qcom,msm-cpudai-tdm-sync-src = <1>;
+		qcom,msm-cpudai-tdm-data-out = <0>;
+		qcom,msm-cpudai-tdm-invert-sync = <1>;
+		qcom,msm-cpudai-tdm-data-delay = <1>;
+		dai_tert_tdm_rx_0: qcom,msm-dai-q6-tdm-tert-rx-0 {
+			compatible = "qcom,msm-dai-q6-tdm";
+			qcom,msm-cpudai-tdm-dev-id = <36896>;
+			qcom,msm-cpudai-tdm-data-align = <0>;
+		};
+	};
+
+	tdm_tert_tx: qcom,msm-dai-tdm-tert-tx {
+		compatible = "qcom,msm-dai-tdm";
+		qcom,msm-cpudai-tdm-group-id = <37153>;
+		qcom,msm-cpudai-tdm-group-num-ports = <1>;
+		qcom,msm-cpudai-tdm-group-port-id = <36897 >;
+		qcom,msm-cpudai-tdm-clk-rate = <1536000>;
+		qcom,msm-cpudai-tdm-clk-internal = <1>;
+		qcom,msm-cpudai-tdm-sync-mode = <1>;
+		qcom,msm-cpudai-tdm-sync-src = <1>;
+		qcom,msm-cpudai-tdm-data-out = <0>;
+		qcom,msm-cpudai-tdm-invert-sync = <1>;
+		qcom,msm-cpudai-tdm-data-delay = <1>;
+		dai_tert_tdm_tx_0: qcom,msm-dai-q6-tdm-tert-tx-0 {
+			compatible = "qcom,msm-dai-q6-tdm";
+			qcom,msm-cpudai-tdm-dev-id = <36897 >;
+			qcom,msm-cpudai-tdm-data-align = <0>;
+		};
+	};
+
+	tdm_quat_rx: qcom,msm-dai-tdm-quat-rx {
+		compatible = "qcom,msm-dai-tdm";
+		qcom,msm-cpudai-tdm-group-id = <37168>;
+		qcom,msm-cpudai-tdm-group-num-ports = <1>;
+		qcom,msm-cpudai-tdm-group-port-id = <36912>;
+		qcom,msm-cpudai-tdm-clk-rate = <1536000>;
+		qcom,msm-cpudai-tdm-clk-internal = <1>;
+		qcom,msm-cpudai-tdm-sync-mode = <1>;
+		qcom,msm-cpudai-tdm-sync-src = <1>;
+		qcom,msm-cpudai-tdm-data-out = <0>;
+		qcom,msm-cpudai-tdm-invert-sync = <1>;
+		qcom,msm-cpudai-tdm-data-delay = <1>;
+		dai_quat_tdm_rx_0: qcom,msm-dai-q6-tdm-quat-rx-0 {
+			compatible = "qcom,msm-dai-q6-tdm";
+			qcom,msm-cpudai-tdm-dev-id = <36912>;
+			qcom,msm-cpudai-tdm-data-align = <0>;
+		};
+	};
+
+	tdm_quat_tx: qcom,msm-dai-tdm-quat-tx {
+		compatible = "qcom,msm-dai-tdm";
+		qcom,msm-cpudai-tdm-group-id = <37169>;
+		qcom,msm-cpudai-tdm-group-num-ports = <1>;
+		qcom,msm-cpudai-tdm-group-port-id = <36913 >;
+		qcom,msm-cpudai-tdm-clk-rate = <1536000>;
+		qcom,msm-cpudai-tdm-clk-internal = <1>;
+		qcom,msm-cpudai-tdm-sync-mode = <1>;
+		qcom,msm-cpudai-tdm-sync-src = <1>;
+		qcom,msm-cpudai-tdm-data-out = <0>;
+		qcom,msm-cpudai-tdm-invert-sync = <1>;
+		qcom,msm-cpudai-tdm-data-delay = <1>;
+		dai_quat_tdm_tx_0: qcom,msm-dai-q6-tdm-quat-tx-0 {
+			compatible = "qcom,msm-dai-q6-tdm";
+			qcom,msm-cpudai-tdm-dev-id = <36913 >;
+			qcom,msm-cpudai-tdm-data-align = <0>;
+		};
+	};
+
+	tdm_quin_rx: qcom,msm-dai-tdm-quin-rx {
+		compatible = "qcom,msm-dai-tdm";
+		qcom,msm-cpudai-tdm-group-id = <37184>;
+		qcom,msm-cpudai-tdm-group-num-ports = <1>;
+		qcom,msm-cpudai-tdm-group-port-id = <36928>;
+		qcom,msm-cpudai-tdm-clk-rate = <1536000>;
+		qcom,msm-cpudai-tdm-clk-internal = <1>;
+		qcom,msm-cpudai-tdm-sync-mode = <1>;
+		qcom,msm-cpudai-tdm-sync-src = <1>;
+		qcom,msm-cpudai-tdm-data-out = <0>;
+		qcom,msm-cpudai-tdm-invert-sync = <1>;
+		qcom,msm-cpudai-tdm-data-delay = <1>;
+		dai_quin_tdm_rx_0: qcom,msm-dai-q6-tdm-quin-rx-0 {
+			compatible = "qcom,msm-dai-q6-tdm";
+			qcom,msm-cpudai-tdm-dev-id = <36928>;
+			qcom,msm-cpudai-tdm-data-align = <0>;
+		};
+	};
+
+	tdm_quin_tx: qcom,msm-dai-tdm-quin-tx {
+		compatible = "qcom,msm-dai-tdm";
+		qcom,msm-cpudai-tdm-group-id = <37185>;
+		qcom,msm-cpudai-tdm-group-num-ports = <1>;
+		qcom,msm-cpudai-tdm-group-port-id = <36929>;
+		qcom,msm-cpudai-tdm-clk-rate = <1536000>;
+		qcom,msm-cpudai-tdm-clk-internal = <1>;
+		qcom,msm-cpudai-tdm-sync-mode = <1>;
+		qcom,msm-cpudai-tdm-sync-src = <1>;
+		qcom,msm-cpudai-tdm-data-out = <0>;
+		qcom,msm-cpudai-tdm-invert-sync = <1>;
+		qcom,msm-cpudai-tdm-data-delay = <1>;
+		dai_quin_tdm_tx_0: qcom,msm-dai-q6-tdm-quin-tx-0 {
+			compatible = "qcom,msm-dai-q6-tdm";
+			qcom,msm-cpudai-tdm-dev-id = <36929>;
+			qcom,msm-cpudai-tdm-data-align = <0>;
+		};
+	};
+
+	tdm_sen_rx: qcom,msm-dai-tdm-sen-rx {
+		compatible = "qcom,msm-dai-tdm";
+		qcom,msm-cpudai-tdm-group-id = <37200>;
+		qcom,msm-cpudai-tdm-group-num-ports = <1>;
+		qcom,msm-cpudai-tdm-group-port-id = <36944>;
+		qcom,msm-cpudai-tdm-clk-rate = <1536000>;
+		qcom,msm-cpudai-tdm-clk-internal = <1>;
+		qcom,msm-cpudai-tdm-sync-mode = <1>;
+		qcom,msm-cpudai-tdm-sync-src = <1>;
+		qcom,msm-cpudai-tdm-data-out = <0>;
+		qcom,msm-cpudai-tdm-invert-sync = <1>;
+		qcom,msm-cpudai-tdm-data-delay = <1>;
+		dai_sen_tdm_rx_0: qcom,msm-dai-q6-tdm-sen-rx-0 {
+			compatible = "qcom,msm-dai-q6-tdm";
+			qcom,msm-cpudai-tdm-dev-id = <36944>;
+			qcom,msm-cpudai-tdm-data-align = <0>;
+		};
+	};
+
+	tdm_sen_tx: qcom,msm-dai-tdm-sen-tx {
+		compatible = "qcom,msm-dai-tdm";
+		qcom,msm-cpudai-tdm-group-id = <37201>;
+		qcom,msm-cpudai-tdm-group-num-ports = <1>;
+		qcom,msm-cpudai-tdm-group-port-id = <36945>;
+		qcom,msm-cpudai-tdm-clk-rate = <1536000>;
+		qcom,msm-cpudai-tdm-clk-internal = <1>;
+		qcom,msm-cpudai-tdm-sync-mode = <1>;
+		qcom,msm-cpudai-tdm-sync-src = <1>;
+		qcom,msm-cpudai-tdm-data-out = <0>;
+		qcom,msm-cpudai-tdm-invert-sync = <1>;
+		qcom,msm-cpudai-tdm-data-delay = <1>;
+		dai_sen_tdm_tx_0: qcom,msm-dai-q6-tdm-sen-tx-0 {
+			compatible = "qcom,msm-dai-q6-tdm";
+			qcom,msm-cpudai-tdm-dev-id = <36945>;
+			qcom,msm-cpudai-tdm-data-align = <0>;
+		};
+	};
+
+	tdm_sep_rx: qcom,msm-dai-tdm-sep-rx {
+		compatible = "qcom,msm-dai-tdm";
+		qcom,msm-cpudai-tdm-group-id = <37216>;
+		qcom,msm-cpudai-tdm-group-num-ports = <1>;
+		qcom,msm-cpudai-tdm-group-port-id = <36960>;
+		qcom,msm-cpudai-tdm-clk-rate = <1536000>;
+		qcom,msm-cpudai-tdm-clk-internal = <1>;
+		qcom,msm-cpudai-tdm-sync-mode = <1>;
+		qcom,msm-cpudai-tdm-sync-src = <1>;
+		qcom,msm-cpudai-tdm-data-out = <0>;
+		qcom,msm-cpudai-tdm-invert-sync = <1>;
+		qcom,msm-cpudai-tdm-data-delay = <1>;
+		dai_sep_tdm_rx_0: qcom,msm-dai-q6-tdm-sep-rx-0 {
+			compatible = "qcom,msm-dai-q6-tdm";
+			qcom,msm-cpudai-tdm-dev-id = <36960>;
+			qcom,msm-cpudai-tdm-data-align = <0>;
+		};
+	};
+
+	tdm_sep_tx: qcom,msm-dai-tdm-sep-tx {
+		compatible = "qcom,msm-dai-tdm";
+		qcom,msm-cpudai-tdm-group-id = <37217>;
+		qcom,msm-cpudai-tdm-group-num-ports = <1>;
+		qcom,msm-cpudai-tdm-group-port-id = <36961>;
+		qcom,msm-cpudai-tdm-clk-rate = <1536000>;
+		qcom,msm-cpudai-tdm-clk-internal = <1>;
+		qcom,msm-cpudai-tdm-sync-mode = <1>;
+		qcom,msm-cpudai-tdm-sync-src = <1>;
+		qcom,msm-cpudai-tdm-data-out = <0>;
+		qcom,msm-cpudai-tdm-invert-sync = <1>;
+		qcom,msm-cpudai-tdm-data-delay = <1>;
+		dai_sep_tdm_tx_0: qcom,msm-dai-q6-tdm-sep-tx-0 {
+			compatible = "qcom,msm-dai-q6-tdm";
+			qcom,msm-cpudai-tdm-dev-id = <36961>;
+			qcom,msm-cpudai-tdm-data-align = <0>;
+		};
+	};
+
+	tdm_hsif0_rx: qcom,msm-dai-tdm-hsif0-rx {
+		compatible = "qcom,msm-dai-tdm";
+		qcom,msm-cpudai-tdm-group-id = <37232>;
+		qcom,msm-cpudai-tdm-group-num-ports = <1>;
+		qcom,msm-cpudai-tdm-group-port-id = <36976>;
+		qcom,msm-cpudai-tdm-clk-rate = <1536000>;
+		qcom,msm-cpudai-tdm-clk-internal = <1>;
+		qcom,msm-cpudai-tdm-sync-mode = <1>;
+		qcom,msm-cpudai-tdm-sync-src = <1>;
+		qcom,msm-cpudai-tdm-data-out = <0>;
+		qcom,msm-cpudai-tdm-invert-sync = <1>;
+		qcom,msm-cpudai-tdm-data-delay = <1>;
+		dai_hsif0_tdm_rx_0: qcom,msm-dai-q6-tdm-hsif0-rx-0 {
+			compatible = "qcom,msm-dai-q6-tdm";
+			qcom,msm-cpudai-tdm-dev-id = <36976>;
+			qcom,msm-cpudai-tdm-data-align = <0>;
+		};
+	};
+
+	tdm_hsif0_tx: qcom,msm-dai-tdm-hsif0-tx {
+		compatible = "qcom,msm-dai-tdm";
+		qcom,msm-cpudai-tdm-group-id = <37231>;
+		qcom,msm-cpudai-tdm-group-num-ports = <1>;
+		qcom,msm-cpudai-tdm-group-port-id = <36977>;
+		qcom,msm-cpudai-tdm-clk-rate = <1536000>;
+		qcom,msm-cpudai-tdm-clk-internal = <1>;
+		qcom,msm-cpudai-tdm-sync-mode = <1>;
+		qcom,msm-cpudai-tdm-sync-src = <1>;
+		qcom,msm-cpudai-tdm-data-out = <0>;
+		qcom,msm-cpudai-tdm-invert-sync = <1>;
+		qcom,msm-cpudai-tdm-data-delay = <1>;
+		dai_hsif0_tdm_tx_0: qcom,msm-dai-q6-tdm-hsif0-tx-0 {
+			compatible = "qcom,msm-dai-q6-tdm";
+			qcom,msm-cpudai-tdm-dev-id = <36977>;
+			qcom,msm-cpudai-tdm-data-align = <0>;
+		};
+	};
+
+	tdm_hsif1_rx: qcom,msm-dai-tdm-hsif1-rx {
+		compatible = "qcom,msm-dai-tdm";
+		qcom,msm-cpudai-tdm-group-id = <37248>;
+		qcom,msm-cpudai-tdm-group-num-ports = <1>;
+		qcom,msm-cpudai-tdm-group-port-id = <36992>;
+		qcom,msm-cpudai-tdm-clk-rate = <1536000>;
+		qcom,msm-cpudai-tdm-clk-internal = <1>;
+		qcom,msm-cpudai-tdm-sync-mode = <1>;
+		qcom,msm-cpudai-tdm-sync-src = <1>;
+		qcom,msm-cpudai-tdm-data-out = <0>;
+		qcom,msm-cpudai-tdm-invert-sync = <1>;
+		qcom,msm-cpudai-tdm-data-delay = <1>;
+		dai_hsif1_tdm_rx_0: qcom,msm-dai-q6-tdm-hsif1-rx-0 {
+			compatible = "qcom,msm-dai-q6-tdm";
+			qcom,msm-cpudai-tdm-dev-id = <36992>;
+			qcom,msm-cpudai-tdm-data-align = <0>;
+		};
+	};
+
+	tdm_hsif1_tx: qcom,msm-dai-tdm-hsif1-tx {
+		compatible = "qcom,msm-dai-tdm";
+		qcom,msm-cpudai-tdm-group-id = <37249>;
+		qcom,msm-cpudai-tdm-group-num-ports = <1>;
+		qcom,msm-cpudai-tdm-group-port-id = <36993>;
+		qcom,msm-cpudai-tdm-clk-rate = <1536000>;
+		qcom,msm-cpudai-tdm-clk-internal = <1>;
+		qcom,msm-cpudai-tdm-sync-mode = <1>;
+		qcom,msm-cpudai-tdm-sync-src = <1>;
+		qcom,msm-cpudai-tdm-data-out = <0>;
+		qcom,msm-cpudai-tdm-invert-sync = <1>;
+		qcom,msm-cpudai-tdm-data-delay = <1>;
+		dai_hsif1_tdm_tx_0: qcom,msm-dai-q6-tdm-hsif1-tx-0 {
+			compatible = "qcom,msm-dai-q6-tdm";
+			qcom,msm-cpudai-tdm-dev-id = <36993>;
+			qcom,msm-cpudai-tdm-data-align = <0>;
+		};
+	};
+
+	tdm_hsif2_rx: qcom,msm-dai-tdm-hsif2-rx {
+		compatible = "qcom,msm-dai-tdm";
+		qcom,msm-cpudai-tdm-group-id = <37264>;
+		qcom,msm-cpudai-tdm-group-num-ports = <1>;
+		qcom,msm-cpudai-tdm-group-port-id = <37008>;
+		qcom,msm-cpudai-tdm-clk-rate = <1536000>;
+		qcom,msm-cpudai-tdm-clk-internal = <1>;
+		qcom,msm-cpudai-tdm-sync-mode = <1>;
+		qcom,msm-cpudai-tdm-sync-src = <1>;
+		qcom,msm-cpudai-tdm-data-out = <0>;
+		qcom,msm-cpudai-tdm-invert-sync = <1>;
+		qcom,msm-cpudai-tdm-data-delay = <1>;
+		dai_hsif2_tdm_rx_0: qcom,msm-dai-q6-tdm-hsif2-rx-0 {
+			compatible = "qcom,msm-dai-q6-tdm";
+			qcom,msm-cpudai-tdm-dev-id = <37008>;
+			qcom,msm-cpudai-tdm-data-align = <0>;
+		};
+	};
+
+	tdm_hsif2_tx: qcom,msm-dai-tdm-hsif2-tx {
+		compatible = "qcom,msm-dai-tdm";
+		qcom,msm-cpudai-tdm-group-id = <37265>;
+		qcom,msm-cpudai-tdm-group-num-ports = <1>;
+		qcom,msm-cpudai-tdm-group-port-id = <37009>;
+		qcom,msm-cpudai-tdm-clk-rate = <1536000>;
+		qcom,msm-cpudai-tdm-clk-internal = <1>;
+		qcom,msm-cpudai-tdm-sync-mode = <1>;
+		qcom,msm-cpudai-tdm-sync-src = <1>;
+		qcom,msm-cpudai-tdm-data-out = <0>;
+		qcom,msm-cpudai-tdm-invert-sync = <1>;
+		qcom,msm-cpudai-tdm-data-delay = <1>;
+		dai_hsif2_tdm_tx_0: qcom,msm-dai-q6-tdm-hsif2-tx-0 {
+			compatible = "qcom,msm-dai-q6-tdm";
+			qcom,msm-cpudai-tdm-dev-id = <37009>;
+			qcom,msm-cpudai-tdm-data-align = <0>;
+		};
+	};
+
+	dai_pri_spdif_rx: qcom,msm-dai-q6-spdif-pri-rx {
+		compatible = "qcom,msm-dai-q6-spdif";
+		qcom,msm-dai-q6-dev-id = <20480>;
+	};
+
+	dai_pri_spdif_tx: qcom,msm-dai-q6-spdif-pri-tx {
+		compatible = "qcom,msm-dai-q6-spdif";
+		qcom,msm-dai-q6-dev-id = <20481>;
+	};
+
+	dai_sec_spdif_rx: qcom,msm-dai-q6-spdif-sec-rx {
+		compatible = "qcom,msm-dai-q6-spdif";
+		qcom,msm-dai-q6-dev-id = <20482>;
+	};
+
+	dai_sec_spdif_tx: qcom,msm-dai-q6-spdif-sec-tx {
+		compatible = "qcom,msm-dai-q6-spdif";
+		qcom,msm-dai-q6-dev-id = <20483>;
+	};
+
+	afe_loopback_tx: qcom,msm-dai-q6-afe-loopback-tx {
+		compatible = "qcom,msm-dai-q6-dev";
+		qcom,msm-dai-q6-dev-id = <24577>;
+	};
+};
diff --git a/sa8155-audio.dts b/sa8155-audio.dts
new file mode 100644
index 00000000..45c82f41
--- /dev/null
+++ b/sa8155-audio.dts
@@ -0,0 +1,18 @@
+/dts-v1/;
+/plugin/;
+
+#include <dt-bindings/clock/qcom,gcc-sm8150.h>
+#include <dt-bindings/interrupt-controller/arm-gic.h>
+#include <dt-bindings/interconnect/qcom,sm8150.h>
+#include <dt-bindings/regulator/qcom,rpmh-regulator-levels.h>
+
+#include "sa8155-audio.dtsi"
+
+/ {
+
+	model = "Qualcomm Technologies, Inc. SA8155";
+	compatible = "qcom,sa8155";
+	qcom,msm-id = <339 0x10000>, <339 0x20000>, <362 0x10000>,
+			<362 0x20000>, <367 0x10000>, <367 0x20000>;
+	qcom,board-id = <0 0>;
+};
diff --git a/sa8155-audio.dtsi b/sa8155-audio.dtsi
new file mode 100644
index 00000000..d3e50dc5
--- /dev/null
+++ b/sa8155-audio.dtsi
@@ -0,0 +1,614 @@
+#include "msm-auto-audio-lpass.dtsi"
+
+&msm_audio_ion {
+	iommus = <&apps_smmu 0x1b21 0x0>;
+	qcom,smmu-sid-mask = /bits/ 64 <0xf>;
+	/delete-property/ qcom,iommu-dma-addr-pool;
+};
+
+
+&tdm_pri_rx{
+	compatible = "qcom,msm-dai-tdm";
+	qcom,msm-cpudai-tdm-group-id = <37120>;
+	qcom,msm-cpudai-tdm-group-num-ports = <4>;
+	qcom,msm-cpudai-tdm-group-port-id = <36864 36866 36868 36870>;
+	qcom,msm-cpudai-tdm-clk-rate = <12288000>;
+	qcom,msm-cpudai-tdm-clk-internal = <1>;
+	qcom,msm-cpudai-tdm-sync-mode = <1>;
+	qcom,msm-cpudai-tdm-sync-src = <1>;
+	qcom,msm-cpudai-tdm-data-out = <0>;
+	qcom,msm-cpudai-tdm-invert-sync = <0>;
+	qcom,msm-cpudai-tdm-data-delay = <0>;
+	dai_pri_tdm_rx_0: qcom,msm-dai-q6-tdm-pri-rx-0 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36864>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_pri_tdm_rx_1: qcom,msm-dai-q6-tdm-pri-rx-1 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36866>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_pri_tdm_rx_2: qcom,msm-dai-q6-tdm-pri-rx-2 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36868>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_pri_tdm_rx_3: qcom,msm-dai-q6-tdm-pri-rx-3 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36870>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+};
+
+&tdm_pri_tx{
+	compatible = "qcom,msm-dai-tdm";
+	qcom,msm-cpudai-tdm-group-id = <37121>;
+	qcom,msm-cpudai-tdm-group-num-ports = <4>;
+	qcom,msm-cpudai-tdm-group-port-id = <36865 36867 36869 36871>;
+	qcom,msm-cpudai-tdm-clk-rate = <12288000>;
+	qcom,msm-cpudai-tdm-clk-internal = <1>;
+	qcom,msm-cpudai-tdm-sync-mode = <1>;
+	qcom,msm-cpudai-tdm-sync-src = <1>;
+	qcom,msm-cpudai-tdm-data-out = <0>;
+	qcom,msm-cpudai-tdm-invert-sync = <0>;
+	qcom,msm-cpudai-tdm-data-delay = <0>;
+	dai_pri_tdm_tx_0: qcom,msm-dai-q6-tdm-pri-tx-0 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36865>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_pri_tdm_tx_1: qcom,msm-dai-q6-tdm-pri-tx-1 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36867>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_pri_tdm_tx_2: qcom,msm-dai-q6-tdm-pri-tx-2 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36869>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_pri_tdm_tx_3: qcom,msm-dai-q6-tdm-pri-tx-3 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36871>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+};
+
+&tdm_sec_rx {
+	compatible = "qcom,msm-dai-tdm";
+	qcom,msm-cpudai-tdm-group-id = <37136>;
+	qcom,msm-cpudai-tdm-group-num-ports = <5>;
+	qcom,msm-cpudai-tdm-group-port-id = <36880 36882 36884
+						36886 36894>;
+	qcom,msm-cpudai-tdm-clk-rate = <12288000>;
+	qcom,msm-cpudai-tdm-clk-internal = <0>;
+	qcom,msm-cpudai-tdm-sync-mode = <1>;
+	qcom,msm-cpudai-tdm-sync-src = <0>;
+	qcom,msm-cpudai-tdm-data-out = <0>;
+	qcom,msm-cpudai-tdm-invert-sync = <0>;
+	qcom,msm-cpudai-tdm-data-delay = <0>;
+	pinctrl-names = "default", "active";
+	pinctrl-0 = <&sec_tdm_sleep &sec_tdm_din_sleep
+			 &sec_tdm_dout_sleep>;
+	pinctrl-1 = <&sec_tdm_active &sec_tdm_din_active
+			 &sec_tdm_dout_active>;
+	#gpio-cells = <0>;
+	dai_sec_tdm_rx_0: qcom,msm-dai-q6-tdm-sec-rx-0 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36880>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_sec_tdm_rx_1: qcom,msm-dai-q6-tdm-sec-rx-1 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36882>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_sec_tdm_rx_2: qcom,msm-dai-q6-tdm-sec-rx-2 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36884>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_sec_tdm_rx_3: qcom,msm-dai-q6-tdm-sec-rx-3 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36886>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_sec_tdm_rx_7: qcom,msm-dai-q6-tdm-sec-rx-7 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36894>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+};
+
+&tdm_sec_tx {
+	compatible = "qcom,msm-dai-tdm";
+	qcom,msm-cpudai-tdm-group-id = <37137>;
+	qcom,msm-cpudai-tdm-group-num-ports = <4>;
+	qcom,msm-cpudai-tdm-group-port-id = <36881 36883 36885 36887>;
+	qcom,msm-cpudai-tdm-clk-rate = <12288000>;
+	qcom,msm-cpudai-tdm-clk-internal = <0>;
+	qcom,msm-cpudai-tdm-sync-mode = <1>;
+	qcom,msm-cpudai-tdm-sync-src = <0>;
+	qcom,msm-cpudai-tdm-data-out = <0>;
+	qcom,msm-cpudai-tdm-invert-sync = <0>;
+	qcom,msm-cpudai-tdm-data-delay = <0>;
+	dai_sec_tdm_tx_0: qcom,msm-dai-q6-tdm-sec-tx-0 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36881>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_sec_tdm_tx_1: qcom,msm-dai-q6-tdm-sec-tx-1 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36883>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_sec_tdm_tx_2: qcom,msm-dai-q6-tdm-sec-tx-2 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36885>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_sec_tdm_tx_3: qcom,msm-dai-q6-tdm-sec-tx-3 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36887>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+};
+
+&tdm_tert_rx{
+	compatible = "qcom,msm-dai-tdm";
+	qcom,msm-cpudai-tdm-group-id = <37152>;
+	qcom,msm-cpudai-tdm-group-num-ports = <5>;
+	qcom,msm-cpudai-tdm-group-port-id = <36896 36898 36900
+						36902 36904>;
+	qcom,msm-cpudai-tdm-clk-rate = <12288000>;
+	qcom,msm-cpudai-tdm-clk-internal = <1>;
+	qcom,msm-cpudai-tdm-sync-mode = <1>;
+	qcom,msm-cpudai-tdm-sync-src = <1>;
+	qcom,msm-cpudai-tdm-data-out = <0>;
+	qcom,msm-cpudai-tdm-invert-sync = <0>;
+	qcom,msm-cpudai-tdm-data-delay = <0>;
+	pinctrl-names = "default", "active";
+	pinctrl-0 = <&tert_tdm_sleep &tert_tdm_din_sleep
+			 &tert_tdm_dout_sleep>;
+	pinctrl-1 = <&tert_tdm_active &tert_tdm_din_active
+			 &tert_tdm_dout_active>;
+	#gpio-cells = <0>;
+	dai_tert_tdm_rx_0: qcom,msm-dai-q6-tdm-tert-rx-0 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36896>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_tert_tdm_rx_1: qcom,msm-dai-q6-tdm-tert-rx-1 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36898>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_tert_tdm_rx_2: qcom,msm-dai-q6-tdm-tert-rx-2 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36900>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_tert_tdm_rx_3: qcom,msm-dai-q6-tdm-tert-rx-3 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36902>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_tert_tdm_rx_4: qcom,msm-dai-q6-tdm-tert-rx-4 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36904>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+};
+
+&tdm_tert_tx {
+	compatible = "qcom,msm-dai-tdm";
+	qcom,msm-cpudai-tdm-group-id = <37153>;
+	qcom,msm-cpudai-tdm-group-num-ports = <5>;
+	qcom,msm-cpudai-tdm-group-port-id = <36897 36899 36901
+						36903 36911>;
+	qcom,msm-cpudai-tdm-clk-rate = <12288000>;
+	qcom,msm-cpudai-tdm-clk-internal = <1>;
+	qcom,msm-cpudai-tdm-sync-mode = <1>;
+	qcom,msm-cpudai-tdm-sync-src = <1>;
+	qcom,msm-cpudai-tdm-data-out = <0>;
+	qcom,msm-cpudai-tdm-invert-sync = <0>;
+	qcom,msm-cpudai-tdm-data-delay = <0>;
+	dai_tert_tdm_tx_0: qcom,msm-dai-q6-tdm-tert-tx-0 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36897>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_tert_tdm_tx_1: qcom,msm-dai-q6-tdm-tert-tx-1 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36899>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_tert_tdm_tx_2: qcom,msm-dai-q6-tdm-tert-tx-2 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36901>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_tert_tdm_tx_3: qcom,msm-dai-q6-tdm-tert-tx-3 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36903>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_tert_tdm_tx_7: qcom,msm-dai-q6-tdm-tert-tx-7 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36911>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+};
+
+&tdm_quat_rx {
+	compatible = "qcom,msm-dai-tdm";
+	qcom,msm-cpudai-tdm-group-id = <37168>;
+	qcom,msm-cpudai-tdm-group-num-ports = <5>;
+	qcom,msm-cpudai-tdm-group-port-id = <36912 36914 36916
+						36918 36926>;
+	qcom,msm-cpudai-tdm-lane-mask = /bits/ 16 <10>;
+	qcom,msm-cpudai-tdm-clk-rate = <24576000>;
+	qcom,msm-cpudai-tdm-clk-internal = <1>;
+	qcom,msm-cpudai-tdm-sync-mode = <1>;
+	qcom,msm-cpudai-tdm-sync-src = <1>;
+	qcom,msm-cpudai-tdm-data-out = <0>;
+	qcom,msm-cpudai-tdm-invert-sync = <0>;
+	qcom,msm-cpudai-tdm-data-delay = <0>;
+	pinctrl-names = "default", "active";
+	pinctrl-0 = <&quat_tdm_sleep &quat_tdm_din_sleep
+			 &quat_tdm_dout_sleep>;
+	pinctrl-1 = <&quat_tdm_active &quat_tdm_din_active
+			 &quat_tdm_dout_active>;
+	#gpio-cells = <0>;
+	dai_quat_tdm_rx_0: qcom,msm-dai-q6-tdm-quat-rx-0 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36912>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_quat_tdm_rx_1: qcom,msm-dai-q6-tdm-quat-rx-1 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36914>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_quat_tdm_rx_2: qcom,msm-dai-q6-tdm-quat-rx-2 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36916>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_quat_tdm_rx_3: qcom,msm-dai-q6-tdm-quat-rx-3 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36918>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_quat_tdm_rx_7: qcom,msm-dai-q6-tdm-quat-rx-7 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36926>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+};
+
+&tdm_quat_tx {
+	compatible = "qcom,msm-dai-tdm";
+	qcom,msm-cpudai-tdm-group-id = <37169>;
+	qcom,msm-cpudai-tdm-group-num-ports = <5>;
+	qcom,msm-cpudai-tdm-group-port-id = <36913 36915 36917
+						36919 36927>;
+	qcom,msm-cpudai-tdm-lane-mask = /bits/ 16 <5>;
+	qcom,msm-cpudai-tdm-clk-rate = <24576000>;
+	qcom,msm-cpudai-tdm-clk-internal = <1>;
+	qcom,msm-cpudai-tdm-sync-mode = <1>;
+	qcom,msm-cpudai-tdm-sync-src = <1>;
+	qcom,msm-cpudai-tdm-data-out = <0>;
+	qcom,msm-cpudai-tdm-invert-sync = <0>;
+	qcom,msm-cpudai-tdm-data-delay = <0>;
+	dai_quat_tdm_tx_0: qcom,msm-dai-q6-tdm-quat-tx-0 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36913>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_quat_tdm_tx_1: qcom,msm-dai-q6-tdm-quat-tx-1 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36915>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_quat_tdm_tx_2: qcom,msm-dai-q6-tdm-quat-tx-2 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36917>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_quat_tdm_tx_3: qcom,msm-dai-q6-tdm-quat-tx-3 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36919>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_quat_tdm_tx_7: qcom,msm-dai-q6-tdm-quat-tx-7 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36927>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+};
+
+&tdm_quin_rx {
+	compatible = "qcom,msm-dai-tdm";
+	qcom,msm-cpudai-tdm-group-id = <37184>;
+	qcom,msm-cpudai-tdm-group-num-ports = <5>;
+	qcom,msm-cpudai-tdm-group-port-id = <36928 36930 36932
+						36934 36942>;
+	qcom,msm-cpudai-tdm-clk-rate = <24576000>;
+	qcom,msm-cpudai-tdm-clk-internal = <1>;
+	qcom,msm-cpudai-tdm-sync-mode = <1>;
+	qcom,msm-cpudai-tdm-sync-src = <1>;
+	qcom,msm-cpudai-tdm-data-out = <0>;
+	qcom,msm-cpudai-tdm-invert-sync = <0>;
+	qcom,msm-cpudai-tdm-data-delay = <0>;
+	pinctrl-names = "default", "active";
+	pinctrl-0 = <&quin_tdm_sleep &quin_tdm_din_sleep
+			 &quin_tdm_dout_sleep>;
+	pinctrl-1 = <&quin_tdm_active &quin_tdm_din_active
+			 &quin_tdm_dout_active>;
+	#gpio-cells = <0>;
+	dai_quin_tdm_rx_0: qcom,msm-dai-q6-tdm-quin-rx-0 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36928>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_quin_tdm_rx_1: qcom,msm-dai-q6-tdm-quin-rx-1 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36930>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_quin_tdm_rx_2: qcom,msm-dai-q6-tdm-quin-rx-2 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36932>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_quin_tdm_rx_3: qcom,msm-dai-q6-tdm-quin-rx-3 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36934>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_quin_tdm_rx_7: qcom,msm-dai-q6-tdm-quin-rx-7 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36942>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+};
+
+&tdm_quin_tx {
+	compatible = "qcom,msm-dai-tdm";
+	qcom,msm-cpudai-tdm-group-id = <37185>;
+	qcom,msm-cpudai-tdm-group-num-ports = <5>;
+	qcom,msm-cpudai-tdm-group-port-id = <36929 36931 36933
+						36935 36943>;
+	qcom,msm-cpudai-tdm-clk-rate = <24576000>;
+	qcom,msm-cpudai-tdm-clk-internal = <1>;
+	qcom,msm-cpudai-tdm-sync-mode = <1>;
+	qcom,msm-cpudai-tdm-sync-src = <1>;
+	qcom,msm-cpudai-tdm-data-out = <0>;
+	qcom,msm-cpudai-tdm-invert-sync = <0>;
+	qcom,msm-cpudai-tdm-data-delay = <0>;
+	dai_quin_tdm_tx_0: qcom,msm-dai-q6-tdm-quin-tx-0 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36929>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_quin_tdm_tx_1: qcom,msm-dai-q6-tdm-quin-tx-1 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36931>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_quin_tdm_tx_2: qcom,msm-dai-q6-tdm-quin-tx-2 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36933>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_quin_tdm_tx_3: qcom,msm-dai-q6-tdm-quin-tx-3 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36935>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_quin_tdm_tx_7: qcom,msm-dai-q6-tdm-quin-tx-7 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36943>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+};
+
+&dai_pri_auxpcm{
+	pinctrl-names = "default", "sleep";
+	pinctrl-0 = <&pri_aux_pcm_clk_active &pri_aux_pcm_sync_active
+			 &pri_aux_pcm_din_active &pri_aux_pcm_dout_active>;
+	pinctrl-1 = <&pri_aux_pcm_clk_sleep &pri_aux_pcm_sync_sleep
+			 &pri_aux_pcm_din_sleep &pri_aux_pcm_dout_sleep>;
+};
+
+&dai_msm_q6 {
+	compatible = "qcom,msm-dai-q6";
+
+	afe_pcm_rx_1: qcom,msm-dai-q6-be-afe-pcm-rx-1 {
+		compatible = "qcom,msm-dai-q6-dev";
+		qcom,msm-dai-q6-dev-id = <226>;
+	};
+
+	afe_proxy_tx_1: qcom,msm-dai-q6-afe-proxy-tx-1 {
+		compatible = "qcom,msm-dai-q6-dev";
+		qcom,msm-dai-q6-dev-id = <242>;
+	};
+};
+
+&soc  {
+
+	q6core: qcom,q6core-audio {
+		compatible = "qcom,q6core-audio";
+	};
+};
+
+&soc  {
+	snd_8155: sound-adp-star {
+		compatible = "qcom,sa8155-asoc-snd-adp-star";
+		qcom,model = "sa8155-adp-star-snd-card";
+		qcom,mi2s-audio-intf;
+		qcom,auxpcm-audio-intf;
+		qcom,msm-mi2s-master = <1>, <1>, <1>, <1>, <1>;
+
+		qcom,sec-tdm-gpios = <&tdm_sec_rx>;
+		qcom,tert-tdm-gpios = <&tdm_tert_rx>;
+		qcom,quat-tdm-gpios = <&tdm_quat_rx>;
+		qcom,quin-tdm-gpios = <&tdm_quin_rx>;
+
+		asoc-platform = <&pcm0>, <&pcm1>, <&pcm2>, <&voip>, <&voice>,
+				<&loopback>, <&compress>, <&hostless>,
+				<&afe>, <&lsm>, <&routing>, <&compr>,
+				<&pcm_noirq>, <&loopback1>, <&pcm_dtmf>;
+		asoc-platform-names = "msm-pcm-dsp.0", "msm-pcm-dsp.1",
+				"msm-pcm-dsp.2", "msm-voip-dsp",
+				"msm-pcm-voice", "msm-pcm-loopback",
+				"msm-compress-dsp", "msm-pcm-hostless",
+				"msm-pcm-afe", "msm-lsm-client",
+				"msm-pcm-routing", "msm-compr-dsp",
+				"msm-pcm-dsp-noirq", "msm-pcm-loopback.1",
+				"msm-pcm-dtmf";
+		asoc-cpu = <&dai_hdmi>, <&dai_dp>,
+				<&dai_mi2s0_rx>, <&dai_mi2s0_tx>,
+				<&dai_mi2s1_rx>, <&dai_mi2s1_tx>,
+				<&dai_mi2s2_rx>, <&dai_mi2s2_tx>,
+				<&dai_mi2s3_rx>, <&dai_mi2s3_tx>,
+				<&dai_mi2s4_rx>, <&dai_mi2s4_tx>,
+				<&dai_pri_auxpcm>,
+				<&dai_sec_auxpcm>, <&dai_tert_auxpcm>,
+				<&dai_quat_auxpcm>, <&dai_quin_auxpcm>,
+				<&afe_pcm_rx>, <&afe_pcm_tx>,
+				<&afe_proxy_rx>, <&afe_proxy_tx>,
+				<&afe_pcm_rx_1>, <&afe_proxy_tx_1>,
+				<&incall_record_rx>, <&incall_record_tx>,
+				<&incall_music_rx>, <&incall_music_2_rx>,
+				<&usb_audio_rx>, <&usb_audio_tx>,
+				<&dai_pri_tdm_rx_0>, <&dai_pri_tdm_rx_1>,
+				<&dai_pri_tdm_rx_2>, <&dai_pri_tdm_rx_3>,
+				<&dai_pri_tdm_tx_0>, <&dai_pri_tdm_tx_1>,
+				<&dai_pri_tdm_tx_2>, <&dai_pri_tdm_tx_3>,
+				<&dai_sec_tdm_rx_0>, <&dai_sec_tdm_rx_1>,
+				<&dai_sec_tdm_rx_2>, <&dai_sec_tdm_rx_3>,
+				<&dai_sec_tdm_rx_7>, <&dai_sec_tdm_tx_0>,
+				<&dai_sec_tdm_tx_1>, <&dai_sec_tdm_tx_2>,
+				<&dai_sec_tdm_tx_3>, <&dai_tert_tdm_rx_0>,
+				<&dai_tert_tdm_rx_1>, <&dai_tert_tdm_rx_2>,
+				<&dai_tert_tdm_rx_3>, <&dai_tert_tdm_rx_4>,
+				<&dai_tert_tdm_tx_0>, <&dai_tert_tdm_tx_1>,
+				<&dai_tert_tdm_tx_2>, <&dai_tert_tdm_tx_3>,
+				<&dai_tert_tdm_tx_7>, <&dai_quat_tdm_rx_0>,
+				<&dai_quat_tdm_rx_1>, <&dai_quat_tdm_rx_2>,
+				<&dai_quat_tdm_rx_3>, <&dai_quat_tdm_rx_7>,
+				<&dai_quat_tdm_tx_0>, <&dai_quat_tdm_tx_1>,
+				<&dai_quat_tdm_tx_2>, <&dai_quat_tdm_tx_3>,
+				<&dai_quat_tdm_tx_7>, <&dai_quin_tdm_rx_0>,
+				<&dai_quin_tdm_rx_1>, <&dai_quin_tdm_rx_2>,
+				<&dai_quin_tdm_rx_3>, <&dai_quin_tdm_rx_7>,
+				<&dai_quin_tdm_tx_0>, <&dai_quin_tdm_tx_1>,
+				<&dai_quin_tdm_tx_2>, <&dai_quin_tdm_tx_3>,
+				<&dai_quin_tdm_tx_7>;
+		asoc-cpu-names = "msm-dai-q6-hdmi.8",  "msm-dai-q6-dp.0",
+				"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.5",
+				"msm-dai-q6-mi2s.6", "msm-dai-q6-mi2s.7",
+				"msm-dai-q6-mi2s.8", "msm-dai-q6-mi2s.9",
+				"msm-dai-q6-auxpcm.1",
+				"msm-dai-q6-auxpcm.2", "msm-dai-q6-auxpcm.3",
+				"msm-dai-q6-auxpcm.4", "msm-dai-q6-auxpcm.5",
+				"msm-dai-q6-dev.224", "msm-dai-q6-dev.225",
+				"msm-dai-q6-dev.241", "msm-dai-q6-dev.240",
+				"msm-dai-q6-dev.226", "msm-dai-q6-dev.242",
+				"msm-dai-q6-dev.32771", "msm-dai-q6-dev.32772",
+				"msm-dai-q6-dev.32773", "msm-dai-q6-dev.32770",
+				"msm-dai-q6-dev.28672", "msm-dai-q6-dev.28673",
+				"msm-dai-q6-tdm.36864", "msm-dai-q6-tdm.36866",
+				"msm-dai-q6-tdm.36868", "msm-dai-q6-tdm.36870",
+				"msm-dai-q6-tdm.36865", "msm-dai-q6-tdm.36867",
+				"msm-dai-q6-tdm.36869", "msm-dai-q6-tdm.36871",
+				"msm-dai-q6-tdm.36880", "msm-dai-q6-tdm.36882",
+				"msm-dai-q6-tdm.36884", "msm-dai-q6-tdm.36886",
+				"msm-dai-q6-tdm.36894", "msm-dai-q6-tdm.36881",
+				"msm-dai-q6-tdm.36883", "msm-dai-q6-tdm.36885",
+				"msm-dai-q6-tdm.36887", "msm-dai-q6-tdm.36896",
+				"msm-dai-q6-tdm.36898", "msm-dai-q6-tdm.36900",
+				"msm-dai-q6-tdm.36902", "msm-dai-q6-tdm.36904",
+				"msm-dai-q6-tdm.36897", "msm-dai-q6-tdm.36899",
+				"msm-dai-q6-tdm.36901", "msm-dai-q6-tdm.36903",
+				"msm-dai-q6-tdm.36911", "msm-dai-q6-tdm.36912",
+				"msm-dai-q6-tdm.36914", "msm-dai-q6-tdm.36916",
+				"msm-dai-q6-tdm.36918", "msm-dai-q6-tdm.36926",
+				"msm-dai-q6-tdm.36913", "msm-dai-q6-tdm.36915",
+				"msm-dai-q6-tdm.36917", "msm-dai-q6-tdm.36919",
+				"msm-dai-q6-tdm.36927", "msm-dai-q6-tdm.36928",
+				"msm-dai-q6-tdm.36930", "msm-dai-q6-tdm.36932",
+				"msm-dai-q6-tdm.36934", "msm-dai-q6-tdm.36942",
+				"msm-dai-q6-tdm.36929", "msm-dai-q6-tdm.36931",
+				"msm-dai-q6-tdm.36933", "msm-dai-q6-tdm.36935",
+				"msm-dai-q6-tdm.36943";
+		asoc-codec = <&stub_codec>;
+		asoc-codec-names = "msm-stub-codec.1";
+		qcom,msm_audio_ssr_devs = <&audio_apr>, <&q6core>;
+	};
+};
+
+&qupv3_se20_i2c {
+	status = "ok";
+
+	pinctrl-0 = <&qupv3_se20_i2c_active
+			&audio_ioexp_reset_active>;
+
+	gpio@3e {
+		compatible = "semtech,sx1509q";
+		reg = <0x3e>;
+		semtech,probe-reset;
+	};
+};
+
+&qupv3_se22_spi {
+	status = "ok";
+	spi_codec@0 {
+		compatible = "qcom,spi-msm-codec-slave";
+		reg = <0>;
+		spi-max-frequency = <10000000>;
+		spi-cpha;
+	};
+};