2023-09-27 00:58:50

by Stephan Gerhold

Subject: [PATCH 11/13] arm64: dts: qcom: msm8916-samsung-gt5: Add sound and modem

From: Jasper Korten <[email protected]>

Enable sound and modem for the Samsung Galaxy Tab A 2015 tablets.
The setup is similar to most MSM8916 devices, i.e.:

- QDSP6 audio
- Headphones/microphones via digital/analog codec in
MSM8916/PM8916. Earpiece exists on samsung-gt58 only.
- WWAN Internet via BAM-DMUX

except:

- gt510: Stereo Maxim MAX98357A codecs for speaker on Quaternary MI2S
- gt58: Mono NXP TFA9895 codec for speaker on Quaternary MI2S
- For some reason connected to GPIOs where no hardware I2C
controller is available -> need to use i2c-gpio
- Samsung-specific audio jack detection (not supported yet)

Signed-off-by: Jasper Korten <[email protected]>
Co-developed-by: Siddharth Manthan <[email protected]>
Signed-off-by: Siddharth Manthan <[email protected]>
Co-developed-by: Nikita Travkin <[email protected]>
Signed-off-by: Nikita Travkin <[email protected]>
[Stephan: Add consistent commit message]
Signed-off-by: Stephan Gerhold <[email protected]>
---
.../boot/dts/qcom/msm8916-samsung-gt5-common.dtsi | 36 ++++++++++++++++++
arch/arm64/boot/dts/qcom/msm8916-samsung-gt510.dts | 23 ++++++++++++
arch/arm64/boot/dts/qcom/msm8916-samsung-gt58.dts | 43 ++++++++++++++++++++++
3 files changed, 102 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi b/arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi
index 6a16eb5ce07b..396853fcece5 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi
@@ -3,9 +3,12 @@
/dts-v1/;

#include "msm8916-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>

/ {
aliases {
@@ -116,6 +119,17 @@ &blsp_uart2 {
status = "okay";
};

+&lpass {
+ dai-link@3 {
+ reg = <MI2S_QUATERNARY>;
+ qcom,playback-sd-lines = <1>;
+ };
+};
+
+&mpss_mem {
+ reg = <0x0 0x86800000 0x0 0x5400000>;
+};
+
&pm8916_resin {
linux,code = <KEY_VOLUMEDOWN>;
status = "okay";
@@ -133,6 +147,13 @@ &pm8916_usbin {
status = "okay";
};

+&q6afedai {
+ dai@22 {
+ reg = <QUATERNARY_MI2S_RX>;
+ qcom,sd-lines = <1>;
+ };
+};
+
&sdhc_1 {
status = "okay";
};
@@ -147,6 +168,21 @@ &sdhc_2 {
status = "okay";
};

+&sound {
+ audio-routing =
+ "AMIC1", "MIC BIAS External1",
+ "AMIC2", "MIC BIAS Internal2",
+ "AMIC3", "MIC BIAS External1";
+};
+
+&sound_dai_quaternary {
+ status = "okay";
+
+ codec {
+ sound-dai = <&speaker_codec>;
+ };
+};
+
&usb {
dr_mode = "peripheral";
extcon = <&pm8916_usbin>;
diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-gt510.dts b/arch/arm64/boot/dts/qcom/msm8916-samsung-gt510.dts
index c3f1acc55078..f393e9efa72c 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-gt510.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-gt510.dts
@@ -9,6 +9,14 @@ / {
compatible = "samsung,gt510", "qcom,msm8916";
chassis-type = "tablet";

+ speaker_codec: audio-codec {
+ compatible = "maxim,max98357a";
+ sdmode-gpios = <&tlmm 55 GPIO_ACTIVE_HIGH>;
+ #sound-dai-cells = <0>;
+ pinctrl-0 = <&audio_sdmode_default>;
+ pinctrl-names = "default";
+ };
+
clk_pwm: pwm {
compatible = "clk-pwm";
#pwm-cells = <2>;
@@ -146,7 +154,22 @@ &mdss_dsi0_out {
remote-endpoint = <&panel_in>;
};

+&sound {
+ model = "samsung-gt510";
+ pinctrl-0 = <&cdc_pdm_default &sec_mi2s_default>;
+ pinctrl-1 = <&cdc_pdm_sleep &sec_mi2s_sleep>;
+ pinctrl-names = "default", "sleep";
+ status = "okay";
+};
+
&tlmm {
+ audio_sdmode_default: audio-sdmode-default-state {
+ pins = "gpio55";
+ function = "gpio";
+ drive-strength = <2>;
+ bias-disable;
+ };
+
buckbooster_en_default: buckbooster-en-default-state {
pins = "gpio51";
function = "gpio";
diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-gt58.dts b/arch/arm64/boot/dts/qcom/msm8916-samsung-gt58.dts
index 998625abd409..3f2165556986 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-gt58.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-gt58.dts
@@ -35,6 +35,26 @@ reg_vdd_tsp: regulator-vdd-tsp {
pinctrl-names = "default";
};

+ i2c-amplifier {
+ compatible = "i2c-gpio";
+ sda-gpios = <&tlmm 55 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
+ scl-gpios = <&tlmm 56 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
+
+ pinctrl-0 = <&amp_i2c_default>;
+ pinctrl-names = "default";
+
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ speaker_codec: audio-codec@34 {
+ compatible = "nxp,tfa9895";
+ reg = <0x34>;
+ vddd-supply = <&pm8916_l5>;
+ sound-name-prefix = "Speaker";
+ #sound-dai-cells = <0>;
+ };
+ };
+
vibrator {
compatible = "gpio-vibrator";
enable-gpios = <&tlmm 76 GPIO_ACTIVE_HIGH>;
@@ -98,7 +118,22 @@ &mdss_dsi0_out {
remote-endpoint = <&panel_in>;
};

+&sound {
+ model = "samsung-a2015";
+ pinctrl-0 = <&cdc_pdm_default &sec_mi2s_default &secondary_mic_default>;
+ pinctrl-1 = <&cdc_pdm_sleep &sec_mi2s_sleep &secondary_mic_default>;
+ pinctrl-names = "default", "sleep";
+ status = "okay";
+};
+
&tlmm {
+ amp_i2c_default: amp-i2c-default-state {
+ pins = "gpio55", "gpio56";
+ function = "gpio";
+ drive-strength = <2>;
+ bias-disable;
+ };
+
buckbooster_en_default: buckbooster-en-default-state {
pins = "gpio8";
function = "gpio";
@@ -127,6 +162,14 @@ reg_tsp_en_default: reg-tsp-en-default-state {
bias-disable;
};

+ secondary_mic_default: secondary-mic-default-state {
+ pins = "gpio98";
+ function = "gpio";
+ drive-strength = <2>;
+ bias-disable;
+ output-high;
+ };
+
tsp_int_default: tsp-int-default-state {
pins = "gpio13";
function = "gpio";

--
2.42.0

2023-09-27 03:19:50

by Stephan Gerhold

Subject: Re: [PATCH 11/13] arm64: dts: qcom: msm8916-samsung-gt5: Add sound and modem

On Tue, Sep 26, 2023 at 09:03:14PM +0200, Konrad Dybcio wrote:
> On 26.09.2023 18:51, Stephan Gerhold wrote:
> > From: Jasper Korten <[email protected]>
> >
> > Enable sound and modem for the Samsung Galaxy Tab A 2015 tablets.
> > The setup is similar to most MSM8916 devices, i.e.:
> >
> > - QDSP6 audio
> > - Headphones/microphones via digital/analog codec in
> > MSM8916/PM8916. Earpiece exists on samsung-gt58 only.
> > - WWAN Internet via BAM-DMUX
> >
> > except:
> >
> > - gt510: Stereo Maxim MAX98357A codecs for speaker on Quaternary MI2S
> > - gt58: Mono NXP TFA9895 codec for speaker on Quaternary MI2S
> > - For some reason connected to GPIOs where no hardware I2C
> > controller is available -> need to use i2c-gpio
> > - Samsung-specific audio jack detection (not supported yet)
> >
> > Signed-off-by: Jasper Korten <[email protected]>
> > Co-developed-by: Siddharth Manthan <[email protected]>
> > Signed-off-by: Siddharth Manthan <[email protected]>
> > Co-developed-by: Nikita Travkin <[email protected]>
> > Signed-off-by: Nikita Travkin <[email protected]>
> > [Stephan: Add consistent commit message]
> > Signed-off-by: Stephan Gerhold <[email protected]>
> > ---
> > .../boot/dts/qcom/msm8916-samsung-gt5-common.dtsi | 36 ++++++++++++++++++
> > arch/arm64/boot/dts/qcom/msm8916-samsung-gt510.dts | 23 ++++++++++++
> > arch/arm64/boot/dts/qcom/msm8916-samsung-gt58.dts | 43 ++++++++++++++++++++++
> > 3 files changed, 102 insertions(+)
> >
> > diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi b/arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi
> > index 6a16eb5ce07b..396853fcece5 100644
> > --- a/arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi
> > +++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi
> > @@ -3,9 +3,12 @@
> > /dts-v1/;
> >
> > #include "msm8916-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>
> >
> > / {
> > aliases {
> > @@ -116,6 +119,17 @@ &blsp_uart2 {
> > status = "okay";
> > };
> >
> > +&lpass {
> > + dai-link@3 {
> > + reg = <MI2S_QUATERNARY>;
> > + qcom,playback-sd-lines = <1>;
> > + };
> > +};
> status = reserved?
>

For reference:
https://lore.kernel.org/linux-arm-msm/[email protected]/

> [...]
> >
> > + i2c-amplifier {
> > + compatible = "i2c-gpio";
> > + sda-gpios = <&tlmm 55 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
> > + scl-gpios = <&tlmm 56 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
> non-msm8916 files have a space around the OR operator, hm
>

Hm I can add a space if you think it looks better. :D

Thanks,
Stephan

2023-09-27 04:42:48

by Konrad Dybcio

Subject: Re: [PATCH 11/13] arm64: dts: qcom: msm8916-samsung-gt5: Add sound and modem

On 26.09.2023 18:51, Stephan Gerhold wrote:
> From: Jasper Korten <[email protected]>
>
> Enable sound and modem for the Samsung Galaxy Tab A 2015 tablets.
> The setup is similar to most MSM8916 devices, i.e.:
>
> - QDSP6 audio
> - Headphones/microphones via digital/analog codec in
> MSM8916/PM8916. Earpiece exists on samsung-gt58 only.
> - WWAN Internet via BAM-DMUX
>
> except:
>
> - gt510: Stereo Maxim MAX98357A codecs for speaker on Quaternary MI2S
> - gt58: Mono NXP TFA9895 codec for speaker on Quaternary MI2S
> - For some reason connected to GPIOs where no hardware I2C
> controller is available -> need to use i2c-gpio
> - Samsung-specific audio jack detection (not supported yet)
>
> Signed-off-by: Jasper Korten <[email protected]>
> Co-developed-by: Siddharth Manthan <[email protected]>
> Signed-off-by: Siddharth Manthan <[email protected]>
> Co-developed-by: Nikita Travkin <[email protected]>
> Signed-off-by: Nikita Travkin <[email protected]>
> [Stephan: Add consistent commit message]
> Signed-off-by: Stephan Gerhold <[email protected]>
> ---
> .../boot/dts/qcom/msm8916-samsung-gt5-common.dtsi | 36 ++++++++++++++++++
> arch/arm64/boot/dts/qcom/msm8916-samsung-gt510.dts | 23 ++++++++++++
> arch/arm64/boot/dts/qcom/msm8916-samsung-gt58.dts | 43 ++++++++++++++++++++++
> 3 files changed, 102 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi b/arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi
> index 6a16eb5ce07b..396853fcece5 100644
> --- a/arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi
> +++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi
> @@ -3,9 +3,12 @@
> /dts-v1/;
>
> #include "msm8916-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>
>
> / {
> aliases {
> @@ -116,6 +119,17 @@ &blsp_uart2 {
> status = "okay";
> };
>
> +&lpass {
> + dai-link@3 {
> + reg = <MI2S_QUATERNARY>;
> + qcom,playback-sd-lines = <1>;
> + };
> +};
status = reserved?

[...]
>
> + i2c-amplifier {
> + compatible = "i2c-gpio";
> + sda-gpios = <&tlmm 55 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
> + scl-gpios = <&tlmm 56 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>;
non-msm8916 files have a space around the OR operator, hm

Konrad