sound work

This commit is contained in:
George Hotz
2020-06-09 15:16:44 -07:00
committed by Willem Melching
parent d4395dca11
commit caf802dc29
3 changed files with 64 additions and 2 deletions

View File

@@ -36,6 +36,9 @@
max98089@10 {
compatible = "maxim,max98089";
reg = <0x10>; /* slave address 0x20 for write, 0x21 for read */
mic-left-digital;
mic-right-digital;
mclk-pin = <2>;
status = "okay";
};
};
@@ -516,4 +519,62 @@
};
};
&snd_934x {
qcom,audio-routing =
"AIF4 VI", "MCLK",
"RX_BIAS", "MCLK",
"MADINPUT", "MCLK",
"hifi amp", "LINEOUT1",
"hifi amp", "LINEOUT2",
"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",
"DMIC0", "MIC BIAS1",
"MIC BIAS1", "Digital Mic0",
"DMIC1", "MIC BIAS1",
"MIC BIAS1", "Digital Mic1",
"DMIC2", "MIC BIAS3",
"MIC BIAS3", "Digital Mic2",
"DMIC3", "MIC BIAS3",
"MIC BIAS3", "Digital Mic3",
"DMIC4", "MIC BIAS4",
"MIC BIAS4", "Digital Mic4",
"DMIC5", "MIC BIAS4",
"MIC BIAS4", "Digital Mic5",
"SpkrLeft IN", "SPK1 OUT",
"SpkrRight 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,hph-en0-gpio = <&tavil_hph_en0>;
qcom,hph-en1-gpio = <&tavil_hph_en1>;*/
qcom,tavil-mclk-clk-freq = <9600000>;
asoc-codec = <&stub_codec>, <&ext_disp_audio_codec>;
asoc-codec-names = "msm-stub-codec.1", "msm-ext-disp-audio-codec-rx";
/*qcom,usbc-analog-en1-gpio = <&wcd_usbc_analog_en1_gpio>;
qcom,usbc-analog-en2-gpio = <&tlmm 51 0>;*/
pinctrl-names = "aud_active", "aud_sleep",
"quat-mi2s-sleep", "quat-mi2s-active",
"quat-tdm-sleep", "quat-tdm-active";
pinctrl-0 = <&wcd_usbc_analog_en2_active>;
pinctrl-1 = <&wcd_usbc_analog_en2_idle>;
pinctrl-2 = <&quat_mi2s_sleep &quat_mi2s_sd0_sleep &quat_mi2s_sd1_sleep &quat_mi2s_sd2_sleep &quat_mi2s_sd3_sleep>;
pinctrl-3 = <&quat_mi2s_active &quat_mi2s_sd0_active &quat_mi2s_sd1_active &quat_mi2s_sd2_active &quat_mi2s_sd3_active>;
pinctrl-4 = <&quat_tdm_sleep &quat_tdm_din_sleep &quat_tdm_dout_sleep>;
pinctrl-5 = <&quat_tdm_active &quat_tdm_din_active &quat_tdm_din_active>;
/*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";*/
};

View File

@@ -97,3 +97,4 @@
elemental-addr = [ff ff ff fe 17 02];
};
};

View File

@@ -5642,7 +5642,7 @@ CONFIG_QMI_ENCDEC=y
# CONFIG_QMI_ENCDEC_DEBUG is not set
# sound card
# CONFIG_SND_SOC_MACHINE_SDM845=y
CONFIG_SND_SOC_MACHINE_SDM845_MAX98089=y
CONFIG_SND_SOC_MACHINE_SDM845=y
#CONFIG_SND_SOC_MACHINE_SDM845_MAX98089=y
CONFIG_SND_SOC_MAX98088=y