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

Commit 3d4f14fb authored by Meng Wang's avatar Meng Wang
Browse files

ARM: dts: msm: enable audio on apq8096 



Enable audio nodes for apq8096 to make audio work.
Change to new WSA GPIOs to make wsa work.

Change-Id: Ieea01de9dd709aaf590ad10baa40b7197d62fde2
Signed-off-by: default avatarMeng Wang <mwang@codeaurora.org>
parent 2e1cd8de

arch/arm/boot/dts/qcom/apq8096-v3-drone.dts

+77 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 


#include "apq8096-v3.dtsi"

#include "apq8096-drone.dtsi"

#include "msm8996-wsa881x.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. APQ8096v3 + PM8996&PMI8996 Drone";
@@ -244,3 +245,79 @@ 
	no-map;

	reg = <0 0x8ea00000 0 0x3200000>;

};



&slim_msm {

	status = "ok";

	tasha_codec {

		status = "ok";

	};

};



&wsa881x_211 {

	qcom,spkr-sd-n-gpio = <&tlmm 114 0>;

};



&wsa881x_212 {

	qcom,spkr-sd-n-gpio = <&tlmm 91 0>;

};



&wsa881x_213 {

	qcom,spkr-sd-n-gpio = <&tlmm 114 0>;

};



&wsa881x_214 {

	qcom,spkr-sd-n-gpio = <&tlmm 91 0>;

};





&soc {

	qcom,msm-dai-mi2s {

		status = "ok";

	};



	sound-9335 {

		status = "ok";



		qcom,audio-routing =

			"AIF4 VI", "MCLK",

			"RX_BIAS", "MCLK",

			"MADINPUT", "MCLK",

			"AMIC1", "MIC BIAS1",

			"MIC BIAS1", "Handset Mic",

			"AMIC2", "MIC BIAS3",

			"MIC BIAS3", "Headset Mic",

			"AMIC3", "MIC BIAS1",

			"MIC BIAS1", "ANCRight Headset Mic",

			"AMIC4", "MIC BIAS3",

			"MIC BIAS3", "ANCLeft Headset Mic",

			"AMIC5", "MIC BIAS4",

			"MIC BIAS4", "Handset Mic",

			"AMIC6", "MIC BIAS4",

			"MIC BIAS4", "Analog Mic6",

			"DMIC0", "MIC BIAS1",

			"MIC BIAS1", "Digital Mic0",

			"DMIC1", "MIC BIAS1",

			"MIC BIAS1", "Digital Mic1",

			"DMIC2", "MIC BIAS3",

			"MIC BIAS3", "Digital Mic2",

			"DMIC3", "MIC BIAS3",

			"MIC BIAS3", "Digital Mic3",

			"DMIC4", "MIC BIAS4",

			"MIC BIAS4", "Digital Mic4",

			"DMIC5", "MIC BIAS4",

			"MIC BIAS4", "Digital Mic5",

			"SpkrLeft IN", "SPK1 OUT",

			"SpkrRight IN", "SPK2 OUT";



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

		qcom,wsa-devs = <&wsa881x_211>, <&wsa881x_212>,

				<&wsa881x_213>, <&wsa881x_214>;

		qcom,wsa-aux-dev-prefix = "SpkrLeft", "SpkrRight",

					  "SpkrLeft", "SpkrRight";

	};

};



&wcd9xxx_intc {

	qcom,gpio-connect = <&tlmm 127 0>;

	pinctrl-0 = <&wcd_intr_default2>;

};

arch/arm/boot/dts/qcom/msm8996-pinctrl.dtsi

+15 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2014-2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2014-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
@@ -1440,6 +1440,20 @@ 
					input-enable;

				};

			};



			wcd_intr_default2: wcd_intr_default2{

				mux {

					pins = "gpio127";

					function = "gpio";

				};



				config {

					pins = "gpio127";

					drive-strength = <2>; /* 2 mA */

					bias-pull-down; /* pull down */

					input-enable;

				};

			};

		};



		cdc_reset_ctrl {