Merge "ARM: dts: msm: Add support for audio over USBC for SDM630"

This commit is contained in:
Linux Build Service Account 2017-02-23 21:35:44 -08:00 committed by Gerrit - the friendly Code Review server
commit 1569b17292
3 changed files with 64 additions and 0 deletions

View file

@ -164,6 +164,7 @@ dtb-$(CONFIG_ARCH_SDM660) += sdm660-sim.dtb \
sdm660-headset-jacktype-no-rcm.dtb \ sdm660-headset-jacktype-no-rcm.dtb \
sdm660-pm660a-headset-jacktype-no-cdp.dtb \ sdm660-pm660a-headset-jacktype-no-cdp.dtb \
sdm660-pm660a-headset-jacktype-no-rcm.dtb \ sdm660-pm660a-headset-jacktype-no-rcm.dtb \
sdm660-usbc-audio-mtp.dtb \
sdm658-mtp.dtb \ sdm658-mtp.dtb \
sdm658-cdp.dtb \ sdm658-cdp.dtb \
sdm658-rcm.dtb \ sdm658-rcm.dtb \
@ -188,6 +189,7 @@ dtb-$(CONFIG_ARCH_SDM660) += sdm660-sim.dtb \
dtb-$(CONFIG_ARCH_SDM630) += sdm630-rumi.dtb \ dtb-$(CONFIG_ARCH_SDM630) += sdm630-rumi.dtb \
sdm630-pm660a-rumi.dtb \ sdm630-pm660a-rumi.dtb \
sdm630-mtp.dtb \ sdm630-mtp.dtb \
sdm630-usbc-audio-mtp.dtb \
sdm630-cdp.dtb \ sdm630-cdp.dtb \
sdm630-rcm.dtb \ sdm630-rcm.dtb \
sdm630-internal-codec-mtp.dtb \ sdm630-internal-codec-mtp.dtb \

View file

@ -0,0 +1,31 @@
/* 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.
*/
/dts-v1/;
#include "sdm630.dtsi"
#include "sdm630-mtp.dtsi"
#include "sdm660-external-codec.dtsi"
/ {
model = "Qualcomm Technologies, Inc. SDM 630 PM660 + PM660L, USBC Audio MTP";
compatible = "qcom,sdm630-mtp", "qcom,sdm630", "qcom,mtp";
qcom,board-id = <8 2>;
qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,
<0x0001001b 0x0201011a 0x0 0x0>;
};
&tavil_snd {
qcom,msm-mbhc-moist-cfg = <0>, <0>, <3>;
qcom,msm-mbhc-usbc-audio-supported = <1>;
};

View file

@ -0,0 +1,31 @@
/* 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.
*/
/dts-v1/;
#include "sdm660.dtsi"
#include "sdm660-mtp.dtsi"
#include "sdm660-external-codec.dtsi"
/ {
model = "Qualcomm Technologies, Inc. SDM 660 PM660 + PM660L, USBC Audio MTP";
compatible = "qcom,sdm660-mtp", "qcom,sdm660", "qcom,mtp";
qcom,board-id = <8 2>;
qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,
<0x0001001b 0x0201011a 0x0 0x0>;
};
&tavil_snd {
qcom,msm-mbhc-moist-cfg = <0>, <0>, <3>;
qcom,msm-mbhc-usbc-audio-supported = <1>;
};