Merge "dts: arm: enable q6core platform device for sdxpoorwills" (730d69dc) · Commits · e / devices / android_kernel_fairphone_FP3

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -674,6 +674,9 @@ Example:
		msm_audio_apr_dummy {
		compatible = "qcom,msm-audio-apr-dummy";
		};
		q6core {
		compatible = "qcom,q6core-audio";
		};

		qcom,subsys-name = "apr_adsp";
		};
		@@ -2590,6 +2593,7 @@ Example:
		"msm-dai-q6-dev.240", "msm-dai-q6-dev.32771",
		"msm-dai-q6-dev.32772", "msm-dai-q6-dev.32773",
		"msm-dai-q6-auxpcm.2", "msm-dai-q6-dev.32774";
		qcom,msm_audio_ssr_devs = <&audio_apr>, <&q6core>;
		};

		* SDX ASoC Auto Machine driver

+8 −1

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2015-2019, The Linux Foundation. All rights reserved.
		* Copyright (c) 2015-2020, 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
		@@ -72,6 +72,13 @@
		audio_apr: qcom,msm-audio-apr {
		compatible = "qcom,msm-audio-apr";
		qcom,subsys-name = "apr_modem";
		msm_audio_apr_dummy {
		compatible = "qcom,msm-audio-apr-dummy";
		};
		};

		q6core: qcom,q6core-audio {
		compatible = "qcom,q6core-audio";
		};

		host_pcm: qcom,msm-voice-host-pcm {

+3 −1

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2017, The Linux Foundation. All rights reserved.
		* Copyright (c) 2017, 2020, 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
		@@ -53,6 +53,8 @@
		<&wsa881x_0213>, <&wsa881x_0214>;
		qcom,wsa-aux-dev-prefix = "SpkrLeft", "SpkrRight",
		"SpkrLeft", "SpkrRight";
		qcom,msm_audio_ssr_devs = <&audio_apr>, <&wcd934x_cdc>,
		<&q6core>;
		};

		&soc {