A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-10 06:09:23 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "ARM: dts: qcom: Add entries for audio overlay"

Browse source
This commit is contained in:
qctecmdr 2020-12-18 03:37:13 -08:00 • committed by Gerrit - the friendly Code Review server
commit 2e85cb1a5a
16 changed files with 84 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

2
qcom/sdx-audio-lpass.dtsi
View file

@ -14,7 +14,7 @@
};
qcom,msm-audio-ion {
compatible = "qcom,msm-audio-ion";
compatible = "qcom,msm-audio-ion-cma";
memory-region = <&audio_mem>;
};

27
qcom/sdx-wsa881x.dtsi
View file

@ -1,35 +1,16 @@
&soc {
&i2c_3 {
tavil_codec {
swr_master {
compatible = "qcom,swr-wcd";
#address-cells = <2>;
#size-cells = <0>;
wsa881x_0211: wsa881x@20170211 {
status = "disabled";
compatible = "qcom,wsa881x";
reg = <0x00 0x20170211>;
qcom,spkr-sd-n-node = <&wsa_spkr_wcd_sd1>;
};
wsa881x_0212: wsa881x@20170212 {
status = "disabled";
compatible = "qcom,wsa881x";
reg = <0x00 0x20170212>;
qcom,spkr-sd-n-node = <&wsa_spkr_wcd_sd2>;
};
wsa881x_0213: wsa881x@21170213 {
status = "disabled";
compatible = "qcom,wsa881x";
reg = <0x00 0x21170213>;
qcom,spkr-sd-n-node = <&wsa_spkr_wcd_sd1>;
};
qcom,swr-num-dev = <1>;
wsa881x_0214: wsa881x@21170214 {
compatible = "qcom,wsa881x";
reg = <0x00 0x21170214>;
qcom,spkr-sd-n-node = <&wsa_spkr_wcd_sd2>;
qcom,spkr-sd-n-node = <&wsa_spkr_wcd_sd1>;
qcom,wsa-prefix = "SpkrLeft";
};
};
};

60
qcom/sdxlemur-audio-overlay.dtsi
View file

@ -6,41 +6,40 @@
qcom,audio-routing =
"RX_BIAS", "MCLK",
"MADINPUT", "MCLK",
"AMIC2", "MIC BIAS2",
"MIC BIAS2", "Headset Mic",
"AMIC3", "MIC BIAS2",
"MIC BIAS2", "ANCRight Headset Mic",
"AMIC4", "MIC BIAS2",
"MIC BIAS2", "ANCLeft Headset Mic",
"AMIC5", "MIC BIAS3",
"MIC BIAS3", "Handset Mic",
"AMIC2", "Headset Mic",
"Headset Mic", "MIC BIAS2",
"AMIC3", "ANCRight Headset Mic",
"ANCRight Headset Mic", "MIC BIAS2",
"AMIC4", "ANCLeft Headset Mic",
"ANCLeft Headset Mic", "MIC BIAS2",
"AMIC5", "Handset Mic",
"Handset Mic", "MIC BIAS3",
"DMIC1", "Digital Mic1",
"DMIC1", "MIC BIAS1",
"MIC BIAS1", "Digital Mic1",
"DMIC2", "Digital Mic2",
"DMIC2", "MIC BIAS3",
"MIC BIAS3", "Digital Mic2",
"DMIC3", "Digital Mic3",
"DMIC3", "MIC BIAS3",
"MIC BIAS3", "Digital Mic3",
"DMIC4", "Digital Mic4",
"DMIC4", "MIC BIAS4",
"MIC BIAS4", "Digital Mic4",
"DMIC5", "Digital Mic5",
"DMIC5", "MIC BIAS4",
"MIC BIAS4", "Digital Mic5",
"SpkrRight IN", "SPK2 OUT";
"SpkrLeft IN", "SPK2 OUT";
qcom,msm-mbhc-hphl-swh = <1>;
qcom,msm-mbhc-gnd-swh = <1>;
qcom,msm-mbhc-hs-mic-max-threshold-mv = <1700>;
qcom,msm-mbhc-hs-mic-min-threshold-mv = <50>;
qcom,cdc-ext-clk-rate = <19200000>;
qcom,tavil-mclk-clk-freq = <9600000>;
qcom,tavil-mclk-clk-freq = <12288000>;
asoc-codec = <&stub_codec>;
asoc-codec-names = "msm-stub-codec.1";
qcom,wsa-max-devs = <2>;
qcom,wsa-devs = <&wsa881x_0211>, <&wsa881x_0212>,
<&wsa881x_0213>, <&wsa881x_0214>;
qcom,wsa-aux-dev-prefix = "SpkrLeft", "SpkrRight",
"SpkrLeft", "SpkrRight";
qcom,wsa-max-devs = <1>;
qcom,swr-num-dev = <1>;
qcom,wsa-devs = <&wsa881x_0214>;
qcom,wsa-aux-dev-prefix = "SpkrLeft";
};
&soc {
@ -50,7 +49,7 @@
interrupt-controller;
#interrupt-cells = <1>;
interrupt-parent = <&tlmm>;
qcom,gpio-connect = <&tlmm 96 0>;
qcom,gpio-connect = <&tlmm 48 0>;
pinctrl-names = "default";
pinctrl-0 = <&wcd_intr_default>;
};
@ -58,7 +57,7 @@
clock_audio_up: audio_ext_clk_up {
compatible = "qcom,audio-ref-clk";
qcom,codec-ext-clk-src = <AUDIO_LPASS_MCLK_3>;
qcom,codec-lpass-clk-id = <770>;
qcom,codec-lpass-clk-id = <0x302>;
qcom,codec-lpass-ext-clk-freq = <9600000>;
qcom,use-pinctrl = <1>;
pinctrl-names = "sleep", "active";
@ -67,16 +66,17 @@
#clock-cells = <1>;
};
wcd_rst_gpio: msm_cdc_pinctrl@92 {
wcd_rst_gpio: msm_cdc_pinctrl@49 {
compatible = "qcom,msm-cdc-pinctrl";
qcom,cdc-rst-n-gpio = <&tlmm 92 0>;
qcom,cdc-rst-n-gpio = <&tlmm 49 0>;
pinctrl-names = "aud_active", "aud_sleep";
pinctrl-0 = <&cdc_reset_active>;
pinctrl-1 = <&cdc_reset_sleep>;
};
};
&soc {
&i2c_3 {
status = "ok"
wcd934x_cdc: tavil_codec {
compatible = "qcom,tavil-i2c";
reg = <0x0d>;
@ -91,23 +91,23 @@
clock-names = "wcd_clk";
clocks = <&clock_audio_up 0>;
cdc-vdd-buck-supply = <&pmxprairie_l6>;
cdc-vdd-buck-supply = <&pmx65_l6>;
qcom,cdc-vdd-buck-voltage = <1800000 1800000>;
qcom,cdc-vdd-buck-current = <650000>;
cdc-buck-sido-supply = <&pmxprairie_l6>;
cdc-buck-sido-supply = <&pmx65_l6>;
qcom,cdc-buck-sido-voltage = <1800000 1800000>;
qcom,cdc-buck-sido-current = <250000>;
cdc-vdd-tx-h-supply = <&pmxprairie_l6>;
cdc-vdd-tx-h-supply = <&pmx65_l6>;
qcom,cdc-vdd-tx-h-voltage = <1800000 1800000>;
qcom,cdc-vdd-tx-h-current = <25000>;
cdc-vdd-rx-h-supply = <&pmxprairie_l6>;
cdc-vdd-rx-h-supply = <&pmx65_l6>;
qcom,cdc-vdd-rx-h-voltage = <1800000 1800000>;
qcom,cdc-vdd-rx-h-current = <25000>;
cdc-vddpx-1-supply = <&pmxprairie_l6>;
cdc-vddpx-1-supply = <&pmx65_l6>;
qcom,cdc-vddpx-1-voltage = <1800000 1800000>;
qcom,cdc-vddpx-1-current = <10000>;

14
qcom/sdxlemur-cdp-audio-overlay.dtsi Normal file
View file

@ -0,0 +1,14 @@
#include "sdxlemur-audio-overlay.dtsi"
&soc {
sound-tavil {
qcom,wsa-max-devs = <1>;
qcom,wsa-devs = <&wsa881x_0214>;
qcom,wsa-aux-dev-prefix = "SpkrLeft";
};
};
&wsa_spkr_wcd_sd2 {
pinctrl-0 = <&spkr_1_wcd_en_active>;
pinctrl-1 = <&spkr_1_wcd_en_sleep>;
};

1
qcom/sdxlemur-cdp.dtsi
View file

@ -1,5 +1,6 @@
#include "sdxlemur-pmic-overlay.dtsi"
#include "sdxlemur-cnss.dtsi"
#include "sdxlemur-cdp-audio-overlay.dtsi"
&soc {

6
qcom/sdxlemur-ion.dtsi
View file

@ -10,6 +10,12 @@
reg = <ION_SYSTEM_HEAP_ID>;
qcom,ion-heap-type = "MSM_SYSTEM";
};
qcom,ion-heap@8 { /* AUDIO HEAP */
reg = <ION_AUDIO_HEAP_ID>;
memory-region = <&audio_mem>;
qcom,ion-heap-type = "DMA";
};
};
};

10
qcom/sdxlemur-mtp-audio-overlay.dtsi Normal file
View file

@ -0,0 +1,10 @@
#include "sdxlemur-audio-overlay.dtsi"
&soc {
sound-tavil {
qcom,wsa-max-devs = <1>;
qcom,wsa-devs = <&wsa881x_0214>;
qcom,wsa-aux-dev-prefix = "SpkrLeft";
};
};

1
qcom/sdxlemur-mtp-cpe.dtsi
View file

@ -1,4 +1,5 @@
#include "sdxlemur-mtp.dtsi"
#include "sdxlemur-mtp-audio-overlay.dtsi"
&soc {

1
qcom/sdxlemur-mtp-mbb-ntn3-pcie.dtsi
View file

@ -1,4 +1,5 @@
#include "sdxlemur-mtp.dtsi"
#include "sdxlemur-mtp-audio-overlay.dtsi"
&soc {

1
qcom/sdxlemur-mtp-mbb-pcie-ep.dtsi
View file

@ -1,5 +1,6 @@
#include "sdxlemur-mtp.dtsi"
#include "sdxlemur.dtsi"
#include "sdxlemur-mtp-audio-overlay.dtsi"
&soc {

1
qcom/sdxlemur-mtp-mbb-pcie-rc-ep.dtsi
View file

@ -1,4 +1,5 @@
#include "sdxlemur-mtp.dtsi"
#include "sdxlemur-mtp-audio-overlay.dtsi"
&soc {

1
qcom/sdxlemur-mtp-mbb.dtsi
View file

@ -3,6 +3,7 @@
#include <dt-bindings/iio/qti_power_supply_iio.h>
#include <dt-bindings/spmi/spmi.h>
#include "sdxlemur-cnss.dtsi"
#include "sdxlemur-mtp-audio-overlay.dtsi"
&pm7250b_clkdiv {
clocks = <&rpmhcc RPMH_CXO_CLK>;

1
qcom/sdxlemur-mtp.dtsi
View file

@ -1,4 +1,5 @@
#include "sdxlemur-pmic-overlay.dtsi"
#include "sdxlemur-mtp-audio-overlay.dtsi"
&soc {

16
qcom/sdxlemur-pinctrl.dtsi
View file

@ -1157,12 +1157,12 @@
wcd9xxx_intr {
wcd_intr_default: wcd_intr_default {
mux {
pins = "gpio96";
pins = "gpio48";
function = "gpio";
};
config {
pins = "gpio96";
pins = "gpio48";
drive-strength = <2>; /* 2 mA */
bias-pull-down; /* pull down */
input-enable;
@ -1173,12 +1173,12 @@
cdc_reset_ctrl {
cdc_reset_sleep: cdc_reset_sleep {
mux {
pins = "gpio92";
pins = "gpio49";
function = "gpio";
};
config {
pins = "gpio92";
pins = "gpio49";
drive-strength = <2>;
bias-disable;
output-low;
@ -1187,12 +1187,12 @@
cdc_reset_active:cdc_reset_active {
mux {
pins = "gpio92";
pins = "gpio49";
function = "gpio";
};
config {
pins = "gpio92";
pins = "gpio49";
drive-strength = <8>;
bias-pull-down;
output-high;
@ -1275,7 +1275,7 @@
pri_ws_active_master: pri_ws_active_master {
mux {
pins = "gpio12";
function = "pri_mi2s";
function = "pri_mi2s_ws";
};
config {
@ -1303,7 +1303,7 @@
pri_ws_active_slave: pri_ws_active_slave {
mux {
pins = "gpio12";
function = "pri_mi2s";
function = "pri_mi2s_ws";
};
config {

4
qcom/sdxlemur-wcd.dtsi
View file

@ -1,8 +1,8 @@
&soc {
&i2c_3 {
tavil_codec {
wcd: wcd_pinctrl@5 {
compatible = "qcom,wcd-pinctrl";
qcom,num-gpios = <5>;
qcom,gpios-count = <5>;
gpio-controller;
#gpio-cells = <2>;

3
qcom/sdxlemur.dtsi
View file

@ -52,7 +52,8 @@
audio_mem: audio_region@0 {
compatible = "shared-dma-pool";
no-map;
alloc-ranges = <0 0x00000000 0 0xffffffff>;
reusable;
size = <0x400000>;
};