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

ARM: dts: msm: Update audio WDSP entries for sdm660

Browse source 
Add support for WDSP, SPI used for CPE.
Update pm660a internal codec files to disable
external codec nodes. Also update external codec
CDP and RCM headset jack properties to use
NC(Normally Closed) type.

CRs-Fixed: 1094763
Change-Id: Ib45c13ab56323aef667aac588b2c22384a573a14
Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
This commit is contained in:
Laxminath Kasam 2017-01-05 19:47:39 +05:30
parent b1cb986a8f
commit 4afc49bef9
10 changed files with 335 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
arch/arm/boot/dts/qcom/msm-audio.dtsi
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
* Copyright (c) 2015-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
@ -11,6 +11,10 @@
* GNU General Public License for more details.
*/
&spi_7 {
status = "okay";
};
&soc {
pcm0: qcom,msm-pcm {
compatible = "qcom,msm-pcm-dsp";
@ -61,6 +65,18 @@
qcom,msm-cpe-lsm-id = <3>;
};
wdsp_mgr: qcom,wcd-dsp-mgr {
compatible = "qcom,wcd-dsp-mgr";
qcom,wdsp-components = <&wcd934x_cdc 0>,
<&wcd_spi_0 1>,
<&glink_spi_xprt_wdsp 2>;
qcom,img-filename = "cpe_9340";
};
wdsp_glink: qcom,wcd-dsp-glink {
compatible = "qcom,wcd-dsp-glink";
};
compress: qcom,msm-compress-dsp {
compatible = "qcom,msm-compress-dsp";
};

12
arch/arm/boot/dts/qcom/sdm660-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
@ -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>;
};

26
arch/arm/boot/dts/qcom/sdm660-internal-codec-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
@ -60,6 +60,30 @@
status = "disabled";
};
&spi_7 {
status = "disabled";
};
&wdsp_mgr {
status = "disabled";
};
&wdsp_glink {
status = "disabled";
};
&glink_spi_xprt_wdsp {
status = "disabled";
};
&glink_fifo_wdsp {
status = "disabled";
};
&glink_qos_wdsp {
status = "disabled";
};
&int_codec {
status = "okay";
};

26
arch/arm/boot/dts/qcom/sdm660-internal-codec-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
@ -60,6 +60,30 @@
status = "disabled";
};
&spi_7 {
status = "disabled";
};
&wdsp_mgr {
status = "disabled";
};
&wdsp_glink {
status = "disabled";
};
&glink_spi_xprt_wdsp {
status = "disabled";
};
&glink_fifo_wdsp {
status = "disabled";
};
&glink_qos_wdsp {
status = "disabled";
};
&int_codec {
qcom,model = "sdm660-snd-card-mtp";
status = "okay";

74
arch/arm/boot/dts/qcom/sdm660-internal-codec-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
@ -23,3 +23,75 @@
qcom,board-id = <1 1>;
qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>;
};
&slim_aud {
status = "disabled";
};
&dai_slim {
status = "disabled";
};
&wcd9335 {
status = "disabled";
};
&wcd934x_cdc {
status = "disabled";
};
&clock_audio {
status = "disabled";
};
&wcd_rst_gpio {
status = "disabled";
};
&wcd9xxx_intc {
status = "disabled";
};
&tasha_snd {
status = "disabled";
};
&tavil_snd {
status = "disabled";
};
&spi_7 {
status = "disabled";
};
&wdsp_mgr {
status = "disabled";
};
&wdsp_glink {
status = "disabled";
};
&glink_spi_xprt_wdsp {
status = "disabled";
};
&glink_fifo_wdsp {
status = "disabled";
};
&glink_qos_wdsp {
status = "disabled";
};
&int_codec {
status = "okay";
};
&pmic_analog_codec {
status = "okay";
};
&msm_sdw_codec {
status = "okay";
};

74
arch/arm/boot/dts/qcom/sdm660-internal-codec-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
@ -23,3 +23,75 @@
qcom,board-id = <8 1>;
qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>;
};
&slim_aud {
status = "disabled";
};
&dai_slim {
status = "disabled";
};
&wcd9335 {
status = "disabled";
};
&wcd934x_cdc {
status = "disabled";
};
&clock_audio {
status = "disabled";
};
&wcd_rst_gpio {
status = "disabled";
};
&wcd9xxx_intc {
status = "disabled";
};
&tasha_snd {
status = "disabled";
};
&tavil_snd {
status = "disabled";
};
&spi_7 {
status = "disabled";
};
&wdsp_mgr {
status = "disabled";
};
&wdsp_glink {
status = "disabled";
};
&glink_spi_xprt_wdsp {
status = "disabled";
};
&glink_fifo_wdsp {
status = "disabled";
};
&glink_qos_wdsp {
status = "disabled";
};
&int_codec {
status = "okay";
};
&pmic_analog_codec {
status = "okay";
};
&msm_sdw_codec {
status = "okay";
};

74
arch/arm/boot/dts/qcom/sdm660-internal-codec-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
@ -23,3 +23,75 @@
qcom,board-id = <21 1>;
qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>;
};
&slim_aud {
status = "disabled";
};
&dai_slim {
status = "disabled";
};
&wcd9335 {
status = "disabled";
};
&wcd934x_cdc {
status = "disabled";
};
&clock_audio {
status = "disabled";
};
&wcd_rst_gpio {
status = "disabled";
};
&wcd9xxx_intc {
status = "disabled";
};
&tasha_snd {
status = "disabled";
};
&tavil_snd {
status = "disabled";
};
&spi_7 {
status = "disabled";
};
&wdsp_mgr {
status = "disabled";
};
&wdsp_glink {
status = "disabled";
};
&glink_spi_xprt_wdsp {
status = "disabled";
};
&glink_fifo_wdsp {
status = "disabled";
};
&glink_qos_wdsp {
status = "disabled";
};
&int_codec {
status = "okay";
};
&pmic_analog_codec {
status = "okay";
};
&msm_sdw_codec {
status = "okay";
};

26
arch/arm/boot/dts/qcom/sdm660-internal-codec-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
@ -60,6 +60,30 @@
status = "disabled";
};
&spi_7 {
status = "disabled";
};
&wdsp_mgr {
status = "disabled";
};
&wdsp_glink {
status = "disabled";
};
&glink_spi_xprt_wdsp {
status = "disabled";
};
&glink_fifo_wdsp {
status = "disabled";
};
&glink_qos_wdsp {
status = "disabled";
};
&int_codec {
status = "okay";
};

12
arch/arm/boot/dts/qcom/sdm660-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
@ -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>;
};

4
arch/arm/boot/dts/qcom/sdm660.dtsi
View file

@ -2258,8 +2258,6 @@
#include "msm-gdsc-660.dtsi"
#include "sdm660-gpu.dtsi"
#include "sdm660-pm.dtsi"
#include "msm-audio.dtsi"
#include "sdm660-audio.dtsi"
&gdsc_usb30 {
status = "ok";
@ -2342,6 +2340,8 @@
#include "sdm660-blsp.dtsi"
#include "sdm660-camera.dtsi"
#include "sdm660-vidc.dtsi"
#include "msm-audio.dtsi"
#include "sdm660-audio.dtsi"
&pm660l_gpios {
/* GPIO 7 for VOL_UP */