Re: [PATCH 2/2] arm64: dts: qcom/sdm845-shift-axolotl: Add audio support

From: Luca Weiss
Date: Thu Jun 09 2022 - 13:19:26 EST


Hi Alexander,

On Donnerstag, 9. Juni 2022 11:54:12 CEST Alexander Martinz wrote:
> This patch adds audio support for the SHIFT6mq phone.
>
> The primary microphone and headphone jack are handled by the
> SDM845 sound card and WCD9340 codec.
>
> The primary speaker needs to go through the TFA9890 speaker
> amplifier.
>
> Signed-off-by: Alexander Martinz <amartinz@xxxxxxxxxxxxxxx>
> Tested-by: Dylan Van Assche <me@xxxxxxxxxxxxxxxxx>
> ---
> .../boot/dts/qcom/sdm845-shift-axolotl.dts | 141 ++++++++++++++++++
> 1 file changed, 141 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
> b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts index
> fa72f23ef0c2..8c4967d6d0e3 100644
> --- a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
> +++ b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
> @@ -8,6 +8,8 @@
>
> #include <dt-bindings/gpio/gpio.h>
> #include <dt-bindings/regulator/qcom,rpmh-regulator.h>
> +#include <dt-bindings/sound/qcom,q6afe.h>
> +#include <dt-bindings/sound/qcom,q6asm.h>
> #include "sdm845.dtsi"
> #include "pm8998.dtsi"
> #include "pmi8998.dtsi"
> @@ -492,6 +494,19 @@ touchscreen@38 {
> };
> };
>
> +&i2c11 {
> + status = "okay";
> + clock-frequency = <400000>;
> +
> + tfa9890_codec: tfa9890@34 {
> + compatible = "nxp,tfa9890";
> + reg = <0x34>;
> + vddd-supply = <&vreg_s4a_1p8>;
> + reset-gpio = <&tlmm 7 0>;
> + #sound-dai-cells = <1>;
> + };
> +};
> +
> &ipa {
> status = "okay";
>
> @@ -530,6 +545,27 @@ volume_down_resin: resin {
> };
> };
>
> +&q6afedai {
> + qi2s@22 {
> + reg = <22>;
> + qcom,sd-lines = <0>;
> + };
> +};

While my patch hasn't been reviewed yet, I have proposed to change the magic
number <22> to the constant QUATERNARY_MI2S_RX here in existing dts files which
better describes what the reg here is.

https://lore.kernel.org/linux-arm-msm/20220603094710.64591-1-luca.weiss@xxxxxxxxxxxxx/

Maybe worth doing the same here for v2?

Regards
Luca