evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "ARM: dts: msm: Add audio support for SDM630, SDA630/660"

Browse source
This commit is contained in:
Linux Build Service Account 2017-02-09 22:09:20 -08:00 • committed by Gerrit - the friendly Code Review server
commit c2ae92ed42
28 changed files with 208 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
arch/arm/boot/dts/qcom/sda630-cdp.dts
View file

@ -15,6 +15,7 @@
#include "sda630.dtsi"
#include "sdm630-cdp.dtsi"
#include "sdm660-external-codec.dtsi"
/ {
model = "Qualcomm Technologies, Inc. SDA 630 PM660 + PM660L CDP";
@ -23,3 +24,13 @@
qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,
<0x0001001b 0x0201011a 0x0 0x0>;
};
&tavil_snd {
qcom,msm-mbhc-hphl-swh = <0>;
qcom,msm-mbhc-gnd-swh = <0>;
};
&tasha_snd {
qcom,msm-mbhc-hphl-swh = <0>;
qcom,msm-mbhc-gnd-swh = <0>;
};

5
arch/arm/boot/dts/qcom/sda630-mtp.dts
View file

@ -15,6 +15,7 @@
#include "sda630.dtsi"
#include "sdm630-mtp.dtsi"
#include "sdm660-external-codec.dtsi"
/ {
model = "Qualcomm Technologies, Inc. SDA 630 PM660 + PM660L MTP";
@ -23,3 +24,7 @@
qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,
<0x0001001b 0x0201011a 0x0 0x0>;
};
&tavil_snd {
qcom,msm-mbhc-moist-cfg = <0>, <0>, <3>;
};

11
arch/arm/boot/dts/qcom/sda630-pm660a-cdp.dts
View file

@ -16,6 +16,7 @@
#include "sda630.dtsi"
#include "sdm630-cdp.dtsi"
#include "msm-pm660a.dtsi"
#include "sdm660-external-codec.dtsi"
/ {
model = "Qualcomm Technologies, Inc. SDA 630 PM660 + PM660A CDP";
@ -23,3 +24,13 @@
qcom,board-id = <1 0>;
qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>;
};
&tavil_snd {
qcom,msm-mbhc-hphl-swh = <0>;
qcom,msm-mbhc-gnd-swh = <0>;
};
&tasha_snd {
qcom,msm-mbhc-hphl-swh = <0>;
qcom,msm-mbhc-gnd-swh = <0>;
};

5
arch/arm/boot/dts/qcom/sda630-pm660a-mtp.dts
View file

@ -16,6 +16,7 @@
#include "sda630.dtsi"
#include "sdm630-mtp.dtsi"
#include "msm-pm660a.dtsi"
#include "sdm660-external-codec.dtsi"
/ {
model = "Qualcomm Technologies, Inc. SDA 630 PM660 + PM660A MTP";
@ -23,3 +24,7 @@
qcom,board-id = <8 0>;
qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>;
};
&tavil_snd {
qcom,msm-mbhc-moist-cfg = <0>, <0>, <3>;
};

11
arch/arm/boot/dts/qcom/sda630-pm660a-rcm.dts
View file

@ -16,6 +16,7 @@
#include "sda630.dtsi"
#include "sdm630-cdp.dtsi"
#include "msm-pm660a.dtsi"
#include "sdm660-external-codec.dtsi"
/ {
model = "Qualcomm Technologies, Inc. SDA 630 PM660 + PM660A RCM";
@ -23,3 +24,13 @@
qcom,board-id = <21 0>;
qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>;
};
&tavil_snd {
qcom,msm-mbhc-hphl-swh = <0>;
qcom,msm-mbhc-gnd-swh = <0>;
};
&tasha_snd {
qcom,msm-mbhc-hphl-swh = <0>;
qcom,msm-mbhc-gnd-swh = <0>;
};

10
arch/arm/boot/dts/qcom/sda630-rcm.dts
View file

@ -23,3 +23,13 @@
qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,
<0x0001001b 0x0201011a 0x0 0x0>;
};
&tavil_snd {
qcom,msm-mbhc-hphl-swh = <0>;
qcom,msm-mbhc-gnd-swh = <0>;
};
&tasha_snd {
qcom,msm-mbhc-hphl-swh = <0>;
qcom,msm-mbhc-gnd-swh = <0>;
};

13
arch/arm/boot/dts/qcom/sda660-cdp.dts
View file

@ -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
@ -15,6 +15,7 @@
#include "sda660.dtsi"
#include "sdm660-cdp.dtsi"
#include "sdm660-external-codec.dtsi"
/ {
model = "Qualcomm Technologies, Inc. SDA 660 PM660 + PM660L CDP";
@ -23,3 +24,13 @@
qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,
<0x0001001b 0x0201011a 0x0 0x0>;
};
&tavil_snd {
qcom,msm-mbhc-hphl-swh = <0>;
qcom,msm-mbhc-gnd-swh = <0>;
};
&tasha_snd {
qcom,msm-mbhc-hphl-swh = <0>;
qcom,msm-mbhc-gnd-swh = <0>;
};

7
arch/arm/boot/dts/qcom/sda660-mtp.dts
View file

@ -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
@ -15,6 +15,7 @@
#include "sda660.dtsi"
#include "sdm660-mtp.dtsi"
#include "sdm660-external-codec.dtsi"
/ {
model = "Qualcomm Technologies, Inc. SDA 660 PM660 + PM660L MTP";
@ -23,3 +24,7 @@
qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,
<0x0001001b 0x0201011a 0x0 0x0>;
};
&tavil_snd {
qcom,msm-mbhc-moist-cfg = <0>, <0>, <3>;
};

13
arch/arm/boot/dts/qcom/sda660-pm660a-cdp.dts
View file

@ -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
@ -16,6 +16,7 @@
#include "sda660.dtsi"
#include "sdm660-cdp.dtsi"
#include "msm-pm660a.dtsi"
#include "sdm660-external-codec.dtsi"
/ {
model = "Qualcomm Technologies, Inc. SDA 660 PM660 + PM660A CDP";
@ -23,3 +24,13 @@
qcom,board-id = <1 0>;
qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>;
};
&tavil_snd {
qcom,msm-mbhc-hphl-swh = <0>;
qcom,msm-mbhc-gnd-swh = <0>;
};
&tasha_snd {
qcom,msm-mbhc-hphl-swh = <0>;
qcom,msm-mbhc-gnd-swh = <0>;
};

7
arch/arm/boot/dts/qcom/sda660-pm660a-mtp.dts
View file

@ -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
@ -16,6 +16,7 @@
#include "sda660.dtsi"
#include "sdm660-mtp.dtsi"
#include "msm-pm660a.dtsi"
#include "sdm660-external-codec.dtsi"
/ {
model = "Qualcomm Technologies, Inc. SDA 660 PM660 + PM660A MTP";
@ -23,3 +24,7 @@
qcom,board-id = <8 0>;
qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>;
};
&tavil_snd {
qcom,msm-mbhc-moist-cfg = <0>, <0>, <3>;
};

13
arch/arm/boot/dts/qcom/sda660-pm660a-rcm.dts
View file

@ -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
@ -16,6 +16,7 @@
#include "sda660.dtsi"
#include "sdm660-cdp.dtsi"
#include "msm-pm660a.dtsi"
#include "sdm660-external-codec.dtsi"
/ {
model = "Qualcomm Technologies, Inc. SDA 660 PM660 + PM660A RCM";
@ -23,3 +24,13 @@
qcom,board-id = <21 0>;
qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>;
};
&tavil_snd {
qcom,msm-mbhc-hphl-swh = <0>;
qcom,msm-mbhc-gnd-swh = <0>;
};
&tasha_snd {
qcom,msm-mbhc-hphl-swh = <0>;
qcom,msm-mbhc-gnd-swh = <0>;
};

13
arch/arm/boot/dts/qcom/sda660-rcm.dts
View file

@ -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
@ -15,6 +15,7 @@
#include "sda660.dtsi"
#include "sdm660-cdp.dtsi"
#include "sdm660-external-codec.dtsi"
/ {
model = "Qualcomm Technologies, Inc. SDA 660 PM660 + PM660L RCM";
@ -23,3 +24,13 @@
qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,
<0x0001001b 0x0201011a 0x0 0x0>;
};
&tavil_snd {
qcom,msm-mbhc-hphl-swh = <0>;
qcom,msm-mbhc-gnd-swh = <0>;
};
&tasha_snd {
qcom,msm-mbhc-hphl-swh = <0>;
qcom,msm-mbhc-gnd-swh = <0>;
};

11
arch/arm/boot/dts/qcom/sdm630-cdp.dts
View file

@ -15,6 +15,7 @@
#include "sdm630.dtsi"
#include "sdm630-cdp.dtsi"
#include "sdm660-external-codec.dtsi"
/ {
model = "Qualcomm Technologies, Inc. SDM 630 PM660 + PM660L CDP";
@ -23,3 +24,13 @@
qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,
<0x0001001b 0x0201011a 0x0 0x0>;
};
&tavil_snd {
qcom,msm-mbhc-hphl-swh = <0>;
qcom,msm-mbhc-gnd-swh = <0>;
};
&tasha_snd {
qcom,msm-mbhc-hphl-swh = <0>;
qcom,msm-mbhc-gnd-swh = <0>;
};

1
arch/arm/boot/dts/qcom/sdm630-internal-codec-cdp.dts
View file

@ -15,6 +15,7 @@
#include "sdm630.dtsi"
#include "sdm630-cdp.dtsi"
#include "sdm660-internal-codec.dtsi"
/ {
model = "Qualcomm Technologies, Inc. SDM 630 PM660 + PM660L Int. Audio Codec CDP";

5
arch/arm/boot/dts/qcom/sdm630-internal-codec-mtp.dts
View file

@ -15,6 +15,7 @@
#include "sdm630.dtsi"
#include "sdm630-mtp.dtsi"
#include "sdm660-internal-codec.dtsi"
/ {
model = "Qualcomm Technologies, Inc. SDM 630 PM660 + PM660L Int. Audio Codec MTP";
@ -23,3 +24,7 @@
qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,
<0x0001001b 0x0201011a 0x0 0x0>;
};
&int_codec {
qcom,model = "sdm660-snd-card-mtp";
};

1
arch/arm/boot/dts/qcom/sdm630-internal-codec-pm660a-cdp.dts
View file

@ -16,6 +16,7 @@
#include "sdm630.dtsi"
#include "sdm630-cdp.dtsi"
#include "msm-pm660a.dtsi"
#include "sdm660-internal-codec.dtsi"
/ {
model = "Qualcomm Technologies, Inc. SDM 630 PM660 + PM660A Int. Audio Codec CDP";

5
arch/arm/boot/dts/qcom/sdm630-internal-codec-pm660a-mtp.dts
View file

@ -16,6 +16,7 @@
#include "sdm630.dtsi"
#include "sdm630-mtp.dtsi"
#include "msm-pm660a.dtsi"
#include "sdm660-internal-codec.dtsi"
/ {
model = "Qualcomm Technologies, Inc. SDM 630 PM660 + PM660A Int. Audio Codec MTP";
@ -23,3 +24,7 @@
qcom,board-id = <8 1>;
qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>;
};
&int_codec {
qcom,model = "sdm660-snd-card-mtp";
};

1
arch/arm/boot/dts/qcom/sdm630-internal-codec-pm660a-rcm.dts
View file

@ -16,6 +16,7 @@
#include "sdm630.dtsi"
#include "sdm630-cdp.dtsi"
#include "msm-pm660a.dtsi"
#include "sdm660-internal-codec.dtsi"
/ {
model = "Qualcomm Technologies, Inc. SDM 630 PM660 + PM660A Int. Audio Codec RCM";

1
arch/arm/boot/dts/qcom/sdm630-internal-codec-rcm.dts
View file

@ -15,6 +15,7 @@
#include "sdm630.dtsi"
#include "sdm630-cdp.dtsi"
#include "sdm660-internal-codec.dtsi"
/ {
model = "Qualcomm Technologies, Inc. SDM 630 PM660 + PM660L Int. Audio Codec RCM";

5
arch/arm/boot/dts/qcom/sdm630-mtp.dts
View file

@ -15,6 +15,7 @@
#include "sdm630.dtsi"
#include "sdm630-mtp.dtsi"
#include "sdm660-external-codec.dtsi"
/ {
model = "Qualcomm Technologies, Inc. SDM 630 PM660 + PM660L MTP";
@ -23,3 +24,7 @@
qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,
<0x0001001b 0x0201011a 0x0 0x0>;
};
&tavil_snd {
qcom,msm-mbhc-moist-cfg = <0>, <0>, <3>;
};

11
arch/arm/boot/dts/qcom/sdm630-pm660a-cdp.dts
View file

@ -16,6 +16,7 @@
#include "sdm630.dtsi"
#include "sdm630-cdp.dtsi"
#include "msm-pm660a.dtsi"
#include "sdm660-external-codec.dtsi"
/ {
model = "Qualcomm Technologies, Inc. SDM 630 PM660 + PM660A CDP";
@ -23,3 +24,13 @@
qcom,board-id = <1 0>;
qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>;
};
&tavil_snd {
qcom,msm-mbhc-hphl-swh = <0>;
qcom,msm-mbhc-gnd-swh = <0>;
};
&tasha_snd {
qcom,msm-mbhc-hphl-swh = <0>;
qcom,msm-mbhc-gnd-swh = <0>;
};

5
arch/arm/boot/dts/qcom/sdm630-pm660a-mtp.dts
View file

@ -16,6 +16,7 @@
#include "sdm630.dtsi"
#include "sdm630-mtp.dtsi"
#include "msm-pm660a.dtsi"
#include "sdm660-external-codec.dtsi"
/ {
model = "Qualcomm Technologies, Inc. SDM 630 PM660 + PM660A MTP";
@ -23,3 +24,7 @@
qcom,board-id = <8 0>;
qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>;
};
&tavil_snd {
qcom,msm-mbhc-moist-cfg = <0>, <0>, <3>;
};

11
arch/arm/boot/dts/qcom/sdm630-pm660a-rcm.dts
View file

@ -16,6 +16,7 @@
#include "sdm630.dtsi"
#include "sdm630-cdp.dtsi"
#include "msm-pm660a.dtsi"
#include "sdm660-external-codec.dtsi"
/ {
model = "Qualcomm Technologies, Inc. SDM 630 PM660 + PM660A RCM";
@ -23,3 +24,13 @@
qcom,board-id = <21 0>;
qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>;
};
&tavil_snd {
qcom,msm-mbhc-hphl-swh = <0>;
qcom,msm-mbhc-gnd-swh = <0>;
};
&tasha_snd {
qcom,msm-mbhc-hphl-swh = <0>;
qcom,msm-mbhc-gnd-swh = <0>;
};

11
arch/arm/boot/dts/qcom/sdm630-rcm.dts
View file

@ -15,6 +15,7 @@
#include "sdm630.dtsi"
#include "sdm630-cdp.dtsi"
#include "sdm660-external-codec.dtsi"
/ {
model = "Qualcomm Technologies, Inc. SDM 630 PM660 + PM660L RCM";
@ -23,3 +24,13 @@
qcom,pmic-id = <0x0001001b 0x0101011a 0x0 0x0>,
<0x0001001b 0x0201011a 0x0 0x0>;
};
&tavil_snd {
qcom,msm-mbhc-hphl-swh = <0>;
qcom,msm-mbhc-gnd-swh = <0>;
};
&tasha_snd {
qcom,msm-mbhc-hphl-swh = <0>;
qcom,msm-mbhc-gnd-swh = <0>;
};

3
arch/arm/boot/dts/qcom/sdm630.dtsi
View file

@ -15,6 +15,7 @@
#include <dt-bindings/clock/qcom,gpu-sdm660.h>
#include <dt-bindings/clock/qcom,mmcc-sdm660.h>
#include <dt-bindings/clock/qcom,rpmcc.h>
#include <dt-bindings/clock/audio-ext-clk.h>
#include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/regulator/qcom,rpm-smd-regulator.h>
#include <dt-bindings/clock/qcom,cpu-osm.h>
@ -1908,6 +1909,8 @@
#include "msm-gdsc-660.dtsi"
#include "sdm660-common.dtsi"
#include "msm-arm-smmu-630.dtsi"
#include "msm-audio.dtsi"
#include "sdm660-audio.dtsi"
#include "sdm660-camera.dtsi"
#include "sdm630-pm.dtsi"
#include "sdm660-vidc.dtsi"

10
arch/arm/boot/dts/qcom/sdm660-pm660a-cdp.dts
View file

@ -36,3 +36,13 @@
lab-supply = <&lab_regulator>;
ibb-supply = <&ibb_regulator>;
};
&tavil_snd {
qcom,msm-mbhc-hphl-swh = <0>;
qcom,msm-mbhc-gnd-swh = <0>;
};
&tasha_snd {
qcom,msm-mbhc-hphl-swh = <0>;
qcom,msm-mbhc-gnd-swh = <0>;
};

4
arch/arm/boot/dts/qcom/sdm660-pm660a-mtp.dts
View file

@ -36,3 +36,7 @@
lab-supply = <&lab_regulator>;
ibb-supply = <&ibb_regulator>;
};
&tavil_snd {
qcom,msm-mbhc-moist-cfg = <0>, <0>, <3>;
};

10
arch/arm/boot/dts/qcom/sdm660-pm660a-rcm.dts
View file

@ -24,3 +24,13 @@
qcom,board-id = <21 0>;
qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>;
};
&tavil_snd {
qcom,msm-mbhc-hphl-swh = <0>;
qcom,msm-mbhc-gnd-swh = <0>;
};
&tasha_snd {
qcom,msm-mbhc-hphl-swh = <0>;
qcom,msm-mbhc-gnd-swh = <0>;
};