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

Commit cbb135e3 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 support for ANC headset detection on MSM8998"

parents f95682ab 9e1f5d51

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

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
		qcom,clk-div = <27>;

	};



	sound-9335 {

	snd_9335: sound-9335 {

		compatible = "qcom,msm8998-asoc-snd-tasha";

		qcom,model = "msm8998-tasha-snd-card";

		qcom,ext-disp-audio-rx;

arch/arm/boot/dts/qcom/msm8998-cdp.dtsi

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

/* Copyright (c) 2016-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
@@ -512,6 +512,10 @@ 
	status = "ok";

};



&snd_9335 {

	qcom,mbhc-audio-jack-type = "6-pole-jack";

};



&soc {

	gpio_keys {

		compatible = "gpio-keys";

arch/arm/boot/dts/qcom/msm8998-mtp.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -534,6 +534,10 @@ 
	status = "ok";

};



&snd_9335 {

	qcom,mbhc-audio-jack-type = "6-pole-jack";

};



&soc {

	gpio_keys {

		compatible = "gpio-keys";