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

Commit a093b85f authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add audio support for sdm670 internal codec overlay"

parents 0762e2f6 76cea396

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

+0 −1
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ 
	qcom,hph-en0-gpio = <&tavil_hph_en0>;

	qcom,hph-en1-gpio = <&tavil_hph_en1>;

	qcom,msm-mclk-freq = <9600000>;

	qcom,usbc-analog-en1_gpio = <&wcd_usbc_analog_en1_gpio>;

	asoc-codec = <&stub_codec>;

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

	qcom,wsa-max-devs = <2>;

arch/arm64/boot/dts/qcom/sdm670-audio.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ 
	int_codec: sound {

		status = "okay";

		compatible = "qcom,sdm670-asoc-snd";

		qcom,model = "sdm670-snd-card";

		qcom,model = "sdm670-snd-card-mtp";

		qcom,wcn-btfm;

		qcom,mi2s-audio-intf;

		qcom,auxpcm-audio-intf;

arch/arm64/boot/dts/qcom/sdm670-cdp-overlay.dts

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



#include "sdm670-cdp.dtsi"

#include "sdm670-audio-overlay.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SDM670 PM660 + PM660L CDP";

arch/arm64/boot/dts/qcom/sdm670-cdp.dts

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 


#include "sdm670.dtsi"

#include "sdm670-cdp.dtsi"

#include "sdm670-int-codec-audio-overlay.dtsi"

#include "sdm670-audio-overlay.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SDM670 PM660 + PM660L CDP";

arch/arm64/boot/dts/qcom/sdm670-ext-cdc-usbc-audio.dtsi

0 → 100644
+17 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2017, 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.

 */



&tavil_snd {

	qcom,msm-mbhc-usbc-audio-supported = <1>;

	qcom,usbc-analog-en1-gpio = <&wcd_usbc_analog_en1_gpio>;

};