Commit dd5ab5d2 authored by Lin, Meng-Bo's avatar Lin, Meng-Bo Committed by Bjorn Andersson

arm64: dts: qcom: msm8939-samsung-a7: Add sound and modem

Enable sound and modem for the Samsung A7. The setup is similar to most
MSM8916 devices, i.e.:

 - QDSP6 audio
 - Earpiece/headphones/microphones via digital/analog codec in
   MSM8916/PM8916
 - WWAN Internet via BAM-DMUX

except for the same differences as the MSM8916-based Samsung A2015
devices:

 - NXP TFA9895 codec for speaker on Quaternary MI2S
 - Samsung-specific audio jack detection (not supported yet)
Signed-off-by: default avatar"Lin, Meng-Bo" <linmengbo0689@protonmail.com>
[Stephan: Add consistent commit message, minor refactoring]
Signed-off-by: default avatarStephan Gerhold <stephan@gerhold.net>
Link: https://lore.kernel.org/r/20231003-msm8916-modem-v2-14-61b684be55c0@gerhold.netSigned-off-by: default avatarBjorn Andersson <andersson@kernel.org>
parent cf12268e
...@@ -3,10 +3,12 @@ ...@@ -3,10 +3,12 @@
/dts-v1/; /dts-v1/;
#include "msm8939-pm8916.dtsi" #include "msm8939-pm8916.dtsi"
#include "msm8916-modem-qdsp6.dtsi"
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/sound/apq8016-lpass.h>
/ { / {
model = "Samsung Galaxy A7 (2015)"; model = "Samsung Galaxy A7 (2015)";
...@@ -287,6 +289,18 @@ muic: extcon@25 { ...@@ -287,6 +289,18 @@ muic: extcon@25 {
}; };
}; };
&blsp_i2c2 {
status = "okay";
speaker_codec: audio-codec@34 {
compatible = "nxp,tfa9895";
reg = <0x34>;
vddd-supply = <&pm8916_l5>;
sound-name-prefix = "Speaker";
#sound-dai-cells = <0>;
};
};
&blsp_i2c5 { &blsp_i2c5 {
status = "okay"; status = "okay";
...@@ -309,6 +323,29 @@ &blsp_uart2 { ...@@ -309,6 +323,29 @@ &blsp_uart2 {
status = "okay"; status = "okay";
}; };
/*
* For some reason the speaker amplifier is connected to the second SD line
* (MI2S_2_D1) instead of the first (MI2S_2_D0). This must be configured in the
* device tree, otherwise audio will seemingly play fine on the wrong SD line
* but the speaker stays silent.
*
* When routing audio via QDSP6 (the default) the &lpass node is reserved and
* the definitions from &q6afedai are used. When the modem is disabled audio can
* be alternatively routed directly to the LPASS hardware with reduced latency.
* The definitions for &lpass are here for completeness to simplify changing the
* setup with minor changes to the DT (either manually or with DT overlays).
*/
&lpass {
dai-link@3 {
reg = <MI2S_QUATERNARY>;
qcom,playback-sd-lines = <1>;
};
};
&mpss_mem {
reg = <0x0 0x86800000 0x0 0x5800000>;
};
&pm8916_resin { &pm8916_resin {
linux,code = <KEY_VOLUMEDOWN>; linux,code = <KEY_VOLUMEDOWN>;
status = "okay"; status = "okay";
...@@ -321,6 +358,13 @@ pm8916_l17: l17 { ...@@ -321,6 +358,13 @@ pm8916_l17: l17 {
}; };
}; };
&q6afedai {
dai@22 {
reg = <QUATERNARY_MI2S_RX>;
qcom,sd-lines = <1>;
};
};
&sdhc_1 { &sdhc_1 {
status = "okay"; status = "okay";
}; };
...@@ -335,6 +379,32 @@ &sdhc_2 { ...@@ -335,6 +379,32 @@ &sdhc_2 {
status = "okay"; status = "okay";
}; };
&sound {
model = "samsung-a2015";
audio-routing =
"AMIC1", "MIC BIAS External1",
"AMIC2", "MIC BIAS Internal2",
"AMIC3", "MIC BIAS External1";
pinctrl-0 = <&cdc_pdm_default &sec_mi2s_default>;
pinctrl-1 = <&cdc_pdm_sleep &sec_mi2s_sleep>;
pinctrl-names = "default", "sleep";
sound_link_backend2: backend2-dai-link {
link-name = "Quaternary MI2S";
cpu {
sound-dai = <&q6afedai QUATERNARY_MI2S_RX>;
};
platform {
sound-dai = <&q6routing>;
};
codec {
sound-dai = <&speaker_codec>;
};
};
};
&usb { &usb {
extcon = <&muic>, <&muic>; extcon = <&muic>, <&muic>;
status = "okay"; status = "okay";
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment