On 9.12.2024 1:09 PM, Dzmitry Sankouski wrote:
> Add support for sound (headphones and mics only)
> Also redefine slpi reserved memory, because adsp_mem overlaps with
> slpi_mem inherited from sdm845.dtsi.
>
> Signed-off-by: Dzmitry Sankouski <dsankouski@xxxxxxxxx>
>
> ---
> Changes in v8:
> - clarify FM with FM -> FM radio
>
> Changes in v7:
> - replace indeces with constants from dt-bindings/sound/qcom,wcd9340.h
> - add spaces after 'link-name' node
> - remove not connected digital mics from audio routing
> - add DMIC(0|2) -> MCLK routing, because digital mics
> need clocks
> - align mapping comments, add dmics comment
>
> Changes in v6:
> - refactor: s/starqltechn/sdm845-starqltechn in subject.
> ---
> arch/arm64/boot/dts/qcom/sdm845-samsung-starqltechn.dts | 223 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 223 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/qcom/sdm845-samsung-starqltechn.dts b/arch/arm64/boot/dts/qcom/sdm845-samsung-starqltechn.dts
> index 65f33be55da3..3a049459aeb3 100644
> --- a/arch/arm64/boot/dts/qcom/sdm845-samsung-starqltechn.dts
> +++ b/arch/arm64/boot/dts/qcom/sdm845-samsung-starqltechn.dts
> @@ -11,8 +11,16 @@
> #include <dt-bindings/gpio/gpio.h>
> #include <dt-bindings/leds/common.h>
> #include <dt-bindings/regulator/qcom,rpmh-regulator.h>
> +#include <dt-bindings/sound/qcom,q6afe.h>
> +#include <dt-bindings/sound/qcom,q6asm.h>
> +#include <dt-bindings/sound/qcom,wcd934x.h>
> +
> #include "sdm845.dtsi"
> #include "pm8998.dtsi"
> +#include "sdm845-wcd9340.dtsi"
> +
> +/delete-node/ &adsp_mem;
> +/delete-node/ &slpi_mem;
>
> / {
> chassis-type = "handset";
> @@ -97,6 +105,16 @@ memory@a1300000 {
> ftrace-size = <0x40000>;
> pmsg-size = <0x40000>;
> };
> +
> + slpi_mem: slpi@96700000 {
> + reg = <0 0x96700000 0 0xf00000>;
> + no-map;
> + };
> +
> + adsp_mem: memory@97800000 {
> + reg = <0 0x97800000 0 0x2000000>;
> + no-map;
> + };
> };
>
> i2c21 {
> @@ -590,6 +608,211 @@ touchscreen@48 {
> };
> };
>
> +&adsp_pas {
> + firmware-name = "qcom/sdm845/starqltechn/adsp.mbn";
> + status = "okay";
> +};
> +
> +&lpasscc {
> + status = "okay";
> +};
> +
> +&wcd9340 {
So this looks mostly good now.. but I noticed that the nodes are
referenced in rather random order, please re-sort the references
alphabetically
[...]
> + cpu {
> + sound-dai = <&q6afedai SLIMBUS_0_RX>;
> + };
> +
> + platform {
> + sound-dai = <&q6routing>;
> + };
> +
> + codec {
> + sound-dai = <&wcd9340 AIF1_PB>;
> + };
(and would be nice if these subnodes were sorted alphabetically too -
codec < cpu < platform)
Konrad
