| Message ID | 20250211225808.3050-4-laurentiumihalcea111@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | add sof support on imx95 | expand |
On Tue, Feb 11, 2025 at 05:58:08PM -0500, Laurentiu Mihalcea wrote: > From: Laurentiu Mihalcea <laurentiu.mihalcea@nxp.com> > > Add imx95 DTS for SOF usage. > > Signed-off-by: Laurentiu Mihalcea <laurentiu.mihalcea@nxp.com> > --- > arch/arm64/boot/dts/freescale/Makefile | 1 + > .../dts/freescale/imx95-19x19-evk-sof.dts | 85 +++++++++++++++++++ > 2 files changed, 86 insertions(+) > create mode 100644 arch/arm64/boot/dts/freescale/imx95-19x19-evk-sof.dts > > diff --git a/arch/arm64/boot/dts/freescale/Makefile b/arch/arm64/boot/dts/freescale/Makefile > index 839432153cc7..27f64e333e4b 100644 > --- a/arch/arm64/boot/dts/freescale/Makefile > +++ b/arch/arm64/boot/dts/freescale/Makefile > @@ -282,6 +282,7 @@ dtb-$(CONFIG_ARCH_MXC) += imx93-tqma9352-mba93xxca.dtb > dtb-$(CONFIG_ARCH_MXC) += imx93-tqma9352-mba93xxla.dtb > dtb-$(CONFIG_ARCH_MXC) += imx93-var-som-symphony.dtb > dtb-$(CONFIG_ARCH_MXC) += imx95-19x19-evk.dtb > +dtb-$(CONFIG_ARCH_MXC) += imx95-19x19-evk-sof.dtb look like should use dt overlay ? > > imx8mm-kontron-dl-dtbs := imx8mm-kontron-bl.dtb imx8mm-kontron-dl.dtbo > > diff --git a/arch/arm64/boot/dts/freescale/imx95-19x19-evk-sof.dts b/arch/arm64/boot/dts/freescale/imx95-19x19-evk-sof.dts > new file mode 100644 > index 000000000000..ce7b2384e459 > --- /dev/null > +++ b/arch/arm64/boot/dts/freescale/imx95-19x19-evk-sof.dts > @@ -0,0 +1,85 @@ > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) > +/* > + * Copyright 2025 NXP > + */ > + > +/dts-v1/; > + > +#include "imx95-19x19-evk.dts" > + > +/ { > + sof_cpu: cm7-cpu@80000000 { > + compatible = "fsl,imx95-cm7-sof"; > + reg = <0x0 0x80000000 0x0 0x6100000>; > + reg-names = "sram"; > + memory-region = <&adma_res>; > + memory-region-names = "dma"; > + mboxes = <&mu7 2 0>, <&mu7 2 1>, <&mu7 3 0>, <&mu7 3 1>; > + mbox-names = "txdb0", "txdb1", "rxdb0", "rxdb1"; > + > + cpu: port { > + cpu_ep: endpoint { > + remote-endpoint = <&codec_ep>; > + }; > + }; > + }; > + > + reserved-memory { > + adma_res: memory@86100000 { > + compatible = "shared-dma-pool"; > + reg = <0x0 0x86100000 0x0 0x100000>; > + no-map; > + }; > + }; > + > + sof-sound-wm8962 { > + compatible = "audio-graph-card2"; > + links = <&cpu>; > + label = "wm8962-audio"; > + hp-det-gpios = <&gpio2 11 GPIO_ACTIVE_HIGH>; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_hp>; > + widgets = > + "Headphone", "Headphones", > + "Microphone", "Headset Mic"; Generally, align to = widgets = "Headphone", "Headphones", "Microphone", "Headset Mic"; > + routing = > + "Headphones", "HPOUTL", > + "Headphones", "HPOUTR", > + "Headset Mic", "MICBIAS", > + "IN3R", "Headset Mic", > + "IN1R", "Headset Mic"; > + }; > + > + sound-wm8962 { > + status = "disabled"; > + }; > + > +}; > + > +&edma2 { > + dma-channel-mask = <0xc0000000>, <0x0>; > +}; Not sure why need mask edma2's some channel, can you add comments for it Frank > + > +&sai3 { > + status = "disabled"; > +}; > + > +&wm8962 { > + assigned-clocks = <&scmi_clk IMX95_CLK_AUDIOPLL1_VCO>, > + <&scmi_clk IMX95_CLK_AUDIOPLL2_VCO>, > + <&scmi_clk IMX95_CLK_AUDIOPLL1>, > + <&scmi_clk IMX95_CLK_AUDIOPLL2>, > + <&scmi_clk IMX95_CLK_SAI3>; > + assigned-clock-parents = <0>, <0>, <0>, <0>, <&scmi_clk IMX95_CLK_AUDIOPLL1>; > + assigned-clock-rates = <3932160000>, <3612672000>, > + <393216000>, <361267200>, > + <12288000>; > + > + port { > + codec_ep: endpoint { > + bitclock-master; > + frame-master; > + remote-endpoint = <&cpu_ep>; > + }; > + }; > +}; > -- > 2.34.1 >
On 12.02.2025 01:23, Frank Li wrote: > On Tue, Feb 11, 2025 at 05:58:08PM -0500, Laurentiu Mihalcea wrote: >> From: Laurentiu Mihalcea <laurentiu.mihalcea@nxp.com> >> >> Add imx95 DTS for SOF usage. >> >> Signed-off-by: Laurentiu Mihalcea <laurentiu.mihalcea@nxp.com> >> --- >> arch/arm64/boot/dts/freescale/Makefile | 1 + >> .../dts/freescale/imx95-19x19-evk-sof.dts | 85 +++++++++++++++++++ >> 2 files changed, 86 insertions(+) >> create mode 100644 arch/arm64/boot/dts/freescale/imx95-19x19-evk-sof.dts >> >> diff --git a/arch/arm64/boot/dts/freescale/Makefile b/arch/arm64/boot/dts/freescale/Makefile >> index 839432153cc7..27f64e333e4b 100644 >> --- a/arch/arm64/boot/dts/freescale/Makefile >> +++ b/arch/arm64/boot/dts/freescale/Makefile >> @@ -282,6 +282,7 @@ dtb-$(CONFIG_ARCH_MXC) += imx93-tqma9352-mba93xxca.dtb >> dtb-$(CONFIG_ARCH_MXC) += imx93-tqma9352-mba93xxla.dtb >> dtb-$(CONFIG_ARCH_MXC) += imx93-var-som-symphony.dtb >> dtb-$(CONFIG_ARCH_MXC) += imx95-19x19-evk.dtb >> +dtb-$(CONFIG_ARCH_MXC) += imx95-19x19-evk-sof.dtb > look like should use dt overlay ? can you pls explain why you'd see this as an overlay? (snip) >> + >> + sof-sound-wm8962 { >> + compatible = "audio-graph-card2"; >> + links = <&cpu>; >> + label = "wm8962-audio"; >> + hp-det-gpios = <&gpio2 11 GPIO_ACTIVE_HIGH>; >> + pinctrl-names = "default"; >> + pinctrl-0 = <&pinctrl_hp>; >> + widgets = >> + "Headphone", "Headphones", >> + "Microphone", "Headset Mic"; > Generally, align to = > widgets = "Headphone", "Headphones", > "Microphone", "Headset Mic"; sure >> + routing = >> + "Headphones", "HPOUTL", >> + "Headphones", "HPOUTR", >> + "Headset Mic", "MICBIAS", >> + "IN3R", "Headset Mic", >> + "IN1R", "Headset Mic"; >> + }; >> + >> + sound-wm8962 { >> + status = "disabled"; >> + }; >> + >> +}; >> + >> +&edma2 { >> + dma-channel-mask = <0xc0000000>, <0x0>; >> +}; > Not sure why need mask edma2's some channel, can you add comments for it > > Frank sure, can add comment in commit msg
On Mon, Feb 24, 2025 at 09:17:03PM +0200, Mihalcea Laurentiu wrote: > > On 12.02.2025 01:23, Frank Li wrote: > > On Tue, Feb 11, 2025 at 05:58:08PM -0500, Laurentiu Mihalcea wrote: > >> From: Laurentiu Mihalcea <laurentiu.mihalcea@nxp.com> > >> > >> Add imx95 DTS for SOF usage. > >> > >> Signed-off-by: Laurentiu Mihalcea <laurentiu.mihalcea@nxp.com> > >> --- > >> arch/arm64/boot/dts/freescale/Makefile | 1 + > >> .../dts/freescale/imx95-19x19-evk-sof.dts | 85 +++++++++++++++++++ > >> 2 files changed, 86 insertions(+) > >> create mode 100644 arch/arm64/boot/dts/freescale/imx95-19x19-evk-sof.dts > >> > >> diff --git a/arch/arm64/boot/dts/freescale/Makefile b/arch/arm64/boot/dts/freescale/Makefile > >> index 839432153cc7..27f64e333e4b 100644 > >> --- a/arch/arm64/boot/dts/freescale/Makefile > >> +++ b/arch/arm64/boot/dts/freescale/Makefile > >> @@ -282,6 +282,7 @@ dtb-$(CONFIG_ARCH_MXC) += imx93-tqma9352-mba93xxca.dtb > >> dtb-$(CONFIG_ARCH_MXC) += imx93-tqma9352-mba93xxla.dtb > >> dtb-$(CONFIG_ARCH_MXC) += imx93-var-som-symphony.dtb > >> dtb-$(CONFIG_ARCH_MXC) += imx95-19x19-evk.dtb > >> +dtb-$(CONFIG_ARCH_MXC) += imx95-19x19-evk-sof.dtb > > look like should use dt overlay ? > > > can you pls explain why you'd see this as an overlay? It is addtional option, which base on imx95-19x19-evk.dtb. Default wm8962 is used for built-in dai, this provide option to move it dsp. Ideally this option should work for all boards, which use wm8962. We try to move MxN problem to M + N. otherwise, there are huge numbers of dtb files. Frank > > (snip) > > >> + > >> + sof-sound-wm8962 { > >> + compatible = "audio-graph-card2"; > >> + links = <&cpu>; > >> + label = "wm8962-audio"; > >> + hp-det-gpios = <&gpio2 11 GPIO_ACTIVE_HIGH>; > >> + pinctrl-names = "default"; > >> + pinctrl-0 = <&pinctrl_hp>; > >> + widgets = > >> + "Headphone", "Headphones", > >> + "Microphone", "Headset Mic"; > > Generally, align to = > > widgets = "Headphone", "Headphones", > > "Microphone", "Headset Mic"; > > > sure > > > >> + routing = > >> + "Headphones", "HPOUTL", > >> + "Headphones", "HPOUTR", > >> + "Headset Mic", "MICBIAS", > >> + "IN3R", "Headset Mic", > >> + "IN1R", "Headset Mic"; > >> + }; > >> + > >> + sound-wm8962 { > >> + status = "disabled"; > >> + }; > >> + > >> +}; > >> + > >> +&edma2 { > >> + dma-channel-mask = <0xc0000000>, <0x0>; > >> +}; > > Not sure why need mask edma2's some channel, can you add comments for it > > > > Frank > > > sure, can add comment in commit msg >
On 2/24/2025 9:51 PM, Frank Li wrote: > On Mon, Feb 24, 2025 at 09:17:03PM +0200, Mihalcea Laurentiu wrote: >> On 12.02.2025 01:23, Frank Li wrote: >>> On Tue, Feb 11, 2025 at 05:58:08PM -0500, Laurentiu Mihalcea wrote: >>>> From: Laurentiu Mihalcea <laurentiu.mihalcea@nxp.com> >>>> >>>> Add imx95 DTS for SOF usage. >>>> >>>> Signed-off-by: Laurentiu Mihalcea <laurentiu.mihalcea@nxp.com> >>>> --- >>>> arch/arm64/boot/dts/freescale/Makefile | 1 + >>>> .../dts/freescale/imx95-19x19-evk-sof.dts | 85 +++++++++++++++++++ >>>> 2 files changed, 86 insertions(+) >>>> create mode 100644 arch/arm64/boot/dts/freescale/imx95-19x19-evk-sof.dts >>>> >>>> diff --git a/arch/arm64/boot/dts/freescale/Makefile b/arch/arm64/boot/dts/freescale/Makefile >>>> index 839432153cc7..27f64e333e4b 100644 >>>> --- a/arch/arm64/boot/dts/freescale/Makefile >>>> +++ b/arch/arm64/boot/dts/freescale/Makefile >>>> @@ -282,6 +282,7 @@ dtb-$(CONFIG_ARCH_MXC) += imx93-tqma9352-mba93xxca.dtb >>>> dtb-$(CONFIG_ARCH_MXC) += imx93-tqma9352-mba93xxla.dtb >>>> dtb-$(CONFIG_ARCH_MXC) += imx93-var-som-symphony.dtb >>>> dtb-$(CONFIG_ARCH_MXC) += imx95-19x19-evk.dtb >>>> +dtb-$(CONFIG_ARCH_MXC) += imx95-19x19-evk-sof.dtb >>> look like should use dt overlay ? >> >> can you pls explain why you'd see this as an overlay? > It is addtional option, which base on imx95-19x19-evk.dtb. Default wm8962 > is used for built-in dai, this provide option to move it dsp. > > Ideally this option should work for all boards, which use wm8962. > > We try to move MxN problem to M + N. otherwise, there are huge numbers of > dtb files. > > Frank Yeah but these are not cameras/sensors (for which there's a lot of possible combinations) we're dealing with. Unless your board has the same codec, same GPIO for headphone detection, and uses the same SAI instance this overlay will not work. For instance, this wouldn't work for the imx95 15x15 EVK board as that uses a different GPIO for headphone detection. As such, you'll most likely end up with a different DT overlay for each board instead of a DTB. Also, from the experience with the IMX8 series, we really don't have many DTBs. Usually, it's been 1 for the base board and 1 for the audio board if applicable (which can probably be turned into DT overlays. It would certainly make more sense this way). Given all this, I'm still not convinced that DT overlays are the way to go.
diff --git a/arch/arm64/boot/dts/freescale/Makefile b/arch/arm64/boot/dts/freescale/Makefile index 839432153cc7..27f64e333e4b 100644 --- a/arch/arm64/boot/dts/freescale/Makefile +++ b/arch/arm64/boot/dts/freescale/Makefile @@ -282,6 +282,7 @@ dtb-$(CONFIG_ARCH_MXC) += imx93-tqma9352-mba93xxca.dtb dtb-$(CONFIG_ARCH_MXC) += imx93-tqma9352-mba93xxla.dtb dtb-$(CONFIG_ARCH_MXC) += imx93-var-som-symphony.dtb dtb-$(CONFIG_ARCH_MXC) += imx95-19x19-evk.dtb +dtb-$(CONFIG_ARCH_MXC) += imx95-19x19-evk-sof.dtb imx8mm-kontron-dl-dtbs := imx8mm-kontron-bl.dtb imx8mm-kontron-dl.dtbo diff --git a/arch/arm64/boot/dts/freescale/imx95-19x19-evk-sof.dts b/arch/arm64/boot/dts/freescale/imx95-19x19-evk-sof.dts new file mode 100644 index 000000000000..ce7b2384e459 --- /dev/null +++ b/arch/arm64/boot/dts/freescale/imx95-19x19-evk-sof.dts @@ -0,0 +1,85 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright 2025 NXP + */ + +/dts-v1/; + +#include "imx95-19x19-evk.dts" + +/ { + sof_cpu: cm7-cpu@80000000 { + compatible = "fsl,imx95-cm7-sof"; + reg = <0x0 0x80000000 0x0 0x6100000>; + reg-names = "sram"; + memory-region = <&adma_res>; + memory-region-names = "dma"; + mboxes = <&mu7 2 0>, <&mu7 2 1>, <&mu7 3 0>, <&mu7 3 1>; + mbox-names = "txdb0", "txdb1", "rxdb0", "rxdb1"; + + cpu: port { + cpu_ep: endpoint { + remote-endpoint = <&codec_ep>; + }; + }; + }; + + reserved-memory { + adma_res: memory@86100000 { + compatible = "shared-dma-pool"; + reg = <0x0 0x86100000 0x0 0x100000>; + no-map; + }; + }; + + sof-sound-wm8962 { + compatible = "audio-graph-card2"; + links = <&cpu>; + label = "wm8962-audio"; + hp-det-gpios = <&gpio2 11 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_hp>; + widgets = + "Headphone", "Headphones", + "Microphone", "Headset Mic"; + routing = + "Headphones", "HPOUTL", + "Headphones", "HPOUTR", + "Headset Mic", "MICBIAS", + "IN3R", "Headset Mic", + "IN1R", "Headset Mic"; + }; + + sound-wm8962 { + status = "disabled"; + }; + +}; + +&edma2 { + dma-channel-mask = <0xc0000000>, <0x0>; +}; + +&sai3 { + status = "disabled"; +}; + +&wm8962 { + assigned-clocks = <&scmi_clk IMX95_CLK_AUDIOPLL1_VCO>, + <&scmi_clk IMX95_CLK_AUDIOPLL2_VCO>, + <&scmi_clk IMX95_CLK_AUDIOPLL1>, + <&scmi_clk IMX95_CLK_AUDIOPLL2>, + <&scmi_clk IMX95_CLK_SAI3>; + assigned-clock-parents = <0>, <0>, <0>, <0>, <&scmi_clk IMX95_CLK_AUDIOPLL1>; + assigned-clock-rates = <3932160000>, <3612672000>, + <393216000>, <361267200>, + <12288000>; + + port { + codec_ep: endpoint { + bitclock-master; + frame-master; + remote-endpoint = <&cpu_ep>; + }; + }; +};