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

Commit 9f180cb1 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 67e27e60 on remote branch 

Change-Id: Id1563639c599e35da1750a92fc072b81748f59b4
parents 5f2f80c9 67e27e60

Documentation/devicetree/bindings/sound/qcom-audio-dev.txt

+7 −2
Original line number Diff line number Diff line
@@ -642,6 +642,11 @@ Example: 
			compatible = "qcom,msm-dai-q6-dev";

			qcom,msm-dai-q6-dev-id = <32770>;

		};



		qcom,msm-dai-q6-incall-music-dl-rx {

			compatible = "qcom,msm-dai-q6-dev";

			qcom,msm-dai-q6-dev-id = <32774>;

		};

	};



	qcom,msm-pri-auxpcm {
@@ -2642,7 +2647,7 @@ Example: 
				<&incall_record_tx>, <&incall_music_rx>,

				<&dai_pri_tdm_rx_0>, <&dai_pri_tdm_tx_0>,

				<&dai_sec_tdm_rx_0>, <&dai_sec_tdm_tx_0>,

				<&dai_sec_auxpcm>;

				<&dai_sec_auxpcm>, <&incall_music_dl_rx>;

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

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

				"msm-dai-stub-dev.4", "msm-dai-stub-dev.5",
@@ -2653,7 +2658,7 @@ Example: 
				"msm-dai-q6-dev.32772", "msm-dai-q6-dev.32773",

				"msm-dai-q6-tdm.36864", "msm-dai-q6-tdm.36865",

				"msm-dai-q6-tdm.36880", "msm-dai-q6-tdm.36881",

				"msm-dai-q6-auxpcm.2";

				"msm-dai-q6-auxpcm.2", "msm-dai-q6-dev.32774";

		asoc-codec = <&tlv320aic3x_codec>, <&stub_codec>;

		asoc-codec-names = "tlv320aic3x-codec", "msm-stub-codec.1";

	};

arch/arm/boot/dts/qcom/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ dtb-$(CONFIG_ARCH_SDXPOORWILLS) += sdxpoorwills-rumi.dtb \ 
	sa415m-ccard.dtb \

	sa415m-ccard-pcie-ep.dtb \

	sa415m-ccard-usb-ep.dtb \

	sa415m-ttp-pcie-ep.dtb \

	sa415m-ttp-usb-ep.dtb \

	sa415m-mtp-256.dtb \

	sa415m-cdp.dtb \

arch/arm/boot/dts/qcom/sa415m-ttp-pcie-ep.dts

0 → 100644
+65 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2019, 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

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



/dts-v1/;



#include "sa415m-ttp.dtsi"

#include "sdxpoorwills-v2.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SA415M TTP PCIE-EP";

	compatible = "qcom,sa415m-ttp",

			"qcom,sdxpoorwills", "qcom,ttp";

	qcom,board-id = <30 0x101>;

};



&mss_mem {

	reg = <0x86400000 0x9300000>;

};



&usb {

	/delete-property/ iommus;

};



&pcie_ep {

	status = "okay";

};



&ipa_hw {

	qcom,use-ipa-in-mhi-mode;

	qcom,ipa-config-is-auto;

	qcom,mhi-event-ring-id-limits = <7 11>; /* start and end */

};



&cnss_pcie {

	status = "disabled";

};



&pcie0 {

	status = "disabled";

};



&mhi_device {

	status = "okay";

};



&restart_pshold {

	qcom,force-warm-reboot;

};



&ipc_router_mhi_dev_xprt {

	status = "okay";

};



&mhi_net_device {

	status = "okay";

};

arch/arm/boot/dts/qcom/sdx-audio-lpass.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -151,6 +151,11 @@ 
			compatible = "qcom,msm-dai-q6-dev";

			qcom,msm-dai-q6-dev-id = <32773>;

		};



		incall_music_dl_rx: qcom,msm-dai-q6-incall-music-dl-rx {

			compatible = "qcom,msm-dai-q6-dev";

			qcom,msm-dai-q6-dev-id = <32774>;

		};

	};



	pcm_dtmf: qcom,msm-pcm-dtmf {

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

+2 −2
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
				<&incall_record_tx>, <&incall_music_rx>,

				<&dai_pri_tdm_rx_0>, <&dai_pri_tdm_tx_0>,

				<&dai_sec_tdm_rx_0>, <&dai_sec_tdm_tx_0>,

				<&dai_sec_auxpcm>;

				<&dai_sec_auxpcm>, <&incall_music_dl_rx>;

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

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

				"msm-dai-stub-dev.4", "msm-dai-stub-dev.5",
@@ -50,6 +50,6 @@ 
				"msm-dai-q6-dev.32772", "msm-dai-q6-dev.32773",

				"msm-dai-q6-tdm.36864", "msm-dai-q6-tdm.36865",

				"msm-dai-q6-tdm.36880", "msm-dai-q6-tdm.36881",

				"msm-dai-q6-auxpcm.2";

				"msm-dai-q6-auxpcm.2", "msm-dai-q6-dev.32774";

	};

};