diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-02-09 13:16:06 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-02-09 13:16:05 -0800 |
| commit | cbb135e3008a54948905b2775c5ff6d5c368fa16 (patch) | |
| tree | f4d7aff8df9c0011a034dd90dec80cb8d7eb86e6 | |
| parent | f95682ab99a96b84ff9a0fe97487b9270838c8a2 (diff) | |
| parent | 9e1f5d5167a776a572db18787638752a1a881c4a (diff) | |
Merge "ARM: dts: msm: Add support for ANC headset detection on MSM8998"
| -rw-r--r-- | arch/arm/boot/dts/qcom/msm8998-audio.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/qcom/msm8998-cdp.dtsi | 6 | ||||
| -rw-r--r-- | arch/arm/boot/dts/qcom/msm8998-mtp.dtsi | 4 |
3 files changed, 10 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/qcom/msm8998-audio.dtsi b/arch/arm/boot/dts/qcom/msm8998-audio.dtsi index 4e7b3d4ee65d..09f0b2dbbe9b 100644 --- a/arch/arm/boot/dts/qcom/msm8998-audio.dtsi +++ b/arch/arm/boot/dts/qcom/msm8998-audio.dtsi @@ -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; diff --git a/arch/arm/boot/dts/qcom/msm8998-cdp.dtsi b/arch/arm/boot/dts/qcom/msm8998-cdp.dtsi index f91b29bca493..48415eb81406 100644 --- a/arch/arm/boot/dts/qcom/msm8998-cdp.dtsi +++ b/arch/arm/boot/dts/qcom/msm8998-cdp.dtsi @@ -1,4 +1,4 @@ -/* 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"; diff --git a/arch/arm/boot/dts/qcom/msm8998-mtp.dtsi b/arch/arm/boot/dts/qcom/msm8998-mtp.dtsi index 236020385e1c..dd10c3b1ea96 100644 --- a/arch/arm/boot/dts/qcom/msm8998-mtp.dtsi +++ b/arch/arm/boot/dts/qcom/msm8998-mtp.dtsi @@ -534,6 +534,10 @@ status = "ok"; }; +&snd_9335 { + qcom,mbhc-audio-jack-type = "6-pole-jack"; +}; + &soc { gpio_keys { compatible = "gpio-keys"; |