Merge "ARM: dts: msm: Add support for AATC variant in atoll target" (9bb150be) · Commits · e / devices / android_kernel_xiaomi_nabu

arch/arm64/boot/dts/qcom/atoll-audio-overlay.dtsi

+3 −3

Original line number	Diff line number	Diff line
		@@ -285,7 +285,6 @@
		&atoll_snd {
		qcom,model = "atoll-idp-snd-card";
		qcom,msm-mi2s-master = <1>, <1>, <1>, <1>, <1>, <1>;
		qcom,ext-disp-audio-rx = <0>;
		qcom,audio-routing =
		"AMIC1", "MIC BIAS1",
		"MIC BIAS1", "Analog Mic1",
		@@ -370,8 +369,9 @@
		qcom,cdc-dmic01-gpios = <&cdc_dmic01_gpios>;
		qcom,cdc-dmic23-gpios = <&cdc_dmic23_gpios>;
		qcom,cdc-dmic45-gpios = <&cdc_dmic45_gpios>;
		asoc-codec = <&stub_codec>, <&bolero>;
		asoc-codec-names = "msm-stub-codec.1", "bolero_codec";
		asoc-codec = <&stub_codec>, <&bolero>, <&ext_disp_audio_codec>;
		asoc-codec-names = "msm-stub-codec.1", "bolero_codec",
		"msm-ext-disp-audio-codec-rx";
		qcom,wsa-max-devs = <2>;
		qcom,wsa-devs = <&wsa881x_0211>, <&wsa881x_0212>,
		<&wsa881x_0213>, <&wsa881x_0214>;

+1 −1

Original line number	Diff line number	Diff line
		@@ -80,7 +80,7 @@
		qcom,mi2s-audio-intf = <1>;
		qcom,auxpcm-audio-intf = <1>;
		qcom,wcn-btfm = <1>;
		qcom,ext-disp-audio-rx = <0>;
		qcom,ext-disp-audio-rx = <1>;
		qcom,afe-rxtx-lb = <0>;

		asoc-platform = <&pcm0>, <&pcm1>, <&pcm2>, <&voip>, <&voice>,

+1 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@
		#include <dt-bindings/interrupt-controller/arm-gic.h>

		#include "atoll-idp.dtsi"
		#include "atoll-usbc-idp.dtsi"

		/ {
		model = "USBC Audio IDP";

+1 −0

Original line number	Diff line number	Diff line
		@@ -14,6 +14,7 @@

		#include "atoll.dtsi"
		#include "atoll-idp.dtsi"
		#include "atoll-usbc-idp.dtsi"

		/ {
		model = "Qualcomm Technologies, Inc. ATOLL PM6150 USBC Audio IDP";

0 → 100644

+19 −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.
		*/

		#include "atoll-audio-overlay.dtsi"

		&atoll_snd {
		qcom,msm-mbhc-usbc-audio-supported = <1>;
		qcom,msm-mbhc-hphl-swh = <0>;
		qcom,msm-mbhc-gnd-swh = <0>;
		};