| Message ID | 20230926-msm8916-modem-v1-13-398eec74bac9@gerhold.net (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | arm64: dts: qcom: msm8916/39: Enable sound and modem with QDSP6 | expand |
On 26.09.2023 18:51, Stephan Gerhold wrote: > From: "Lin, Meng-Bo" <linmengbo0689@protonmail.com> > > 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: "Lin, Meng-Bo" <linmengbo0689@protonmail.com> > [Stephan: Add consistent commit message] > Signed-off-by: Stephan Gerhold <stephan@gerhold.net> > --- [...] > > +&lpass { > + dai-link@3 { > + reg = <MI2S_QUATERNARY>; > + qcom,playback-sd-lines = <1>; > + }; > +}; reserved hw? Konrad
On Tue, Sep 26, 2023 at 09:04:47PM +0200, Konrad Dybcio wrote: > On 26.09.2023 18:51, Stephan Gerhold wrote: > > From: "Lin, Meng-Bo" <linmengbo0689@protonmail.com> > > > > 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: "Lin, Meng-Bo" <linmengbo0689@protonmail.com> > > [Stephan: Add consistent commit message] > > Signed-off-by: Stephan Gerhold <stephan@gerhold.net> > > --- > [...] > > > > > +&lpass { > > + dai-link@3 { > > + reg = <MI2S_QUATERNARY>; > > + qcom,playback-sd-lines = <1>; > > + }; > > +}; > reserved hw? > My previous reply for reference: https://lore.kernel.org/linux-arm-msm/ZRMwdRo9hAm4BO5E@gerhold.net/ Thanks, Stephan
diff --git a/arch/arm64/boot/dts/qcom/msm8939-samsung-a7.dts b/arch/arm64/boot/dts/qcom/msm8939-samsung-a7.dts index fccd8fec8b8f..4951b3e265d2 100644 --- a/arch/arm64/boot/dts/qcom/msm8939-samsung-a7.dts +++ b/arch/arm64/boot/dts/qcom/msm8939-samsung-a7.dts @@ -3,10 +3,12 @@ /dts-v1/; #include "msm8939-pm8916.dtsi" +#include "msm8916-modem-qdsp6.dtsi" #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/input.h> #include <dt-bindings/interrupt-controller/irq.h> +#include <dt-bindings/sound/apq8016-lpass.h> / { model = "Samsung Galaxy A7 (2015)"; @@ -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 { status = "okay"; @@ -309,6 +323,17 @@ &blsp_uart2 { status = "okay"; }; +&lpass { + dai-link@3 { + reg = <MI2S_QUATERNARY>; + qcom,playback-sd-lines = <1>; + }; +}; + +&mpss_mem { + reg = <0x0 0x86800000 0x0 0x5800000>; +}; + &pm8916_resin { linux,code = <KEY_VOLUMEDOWN>; status = "okay"; @@ -321,6 +346,13 @@ pm8916_l17: l17 { }; }; +&q6afedai { + dai@22 { + reg = <QUATERNARY_MI2S_RX>; + qcom,sd-lines = <1>; + }; +}; + &sdhc_1 { status = "okay"; }; @@ -335,6 +367,28 @@ &sdhc_2 { 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"; + + status = "okay"; +}; + +&sound_dai_quaternary { + status = "okay"; + + codec { + sound-dai = <&speaker_codec>; + }; +}; + &usb { extcon = <&muic>, <&muic>; status = "okay";