* [PATCH 0/2] Enable wm8524 codec on i.MX8MM EVK @ 2019-04-19 20:20 Daniel Baluta 2019-04-19 20:20 ` [PATCH 1/2] arm64: dts: imx8mm: Add SAI nodes Daniel Baluta 2019-04-19 20:20 ` [PATCH 2/2] arm64: dts: imx8mm-evk: Enable audio codec wm8524 Daniel Baluta 0 siblings, 2 replies; 6+ messages in thread From: Daniel Baluta @ 2019-04-19 20:20 UTC (permalink / raw) To: shawnguo Cc: mark.rutland, robh+dt, s.hauer, kernel, festevam, dl-linux-imx, Aisheng Dong, Anson Huang, Daniel Baluta, Peng Fan, devicetree, linux-arm-kernel, linux-kernel, S.j. Wang This patch series introduces the SAI nodes on i.MX8MM EVK then creates the wm8524 codec node and finally uses simple card machine driver to create a sound card. Daniel Baluta (2): arm64: dts: imx8mm: Add SAI nodes arm64: dts: imx8mm-evk: Enable audio codec wm8524 arch/arm64/boot/dts/freescale/imx8mm-evk.dts | 48 ++++++++++++++ arch/arm64/boot/dts/freescale/imx8mm.dtsi | 68 ++++++++++++++++++++ 2 files changed, 116 insertions(+) -- 2.17.1 ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/2] arm64: dts: imx8mm: Add SAI nodes 2019-04-19 20:20 [PATCH 0/2] Enable wm8524 codec on i.MX8MM EVK Daniel Baluta @ 2019-04-19 20:20 ` Daniel Baluta 2019-04-22 2:44 ` Shawn Guo 2019-04-19 20:20 ` [PATCH 2/2] arm64: dts: imx8mm-evk: Enable audio codec wm8524 Daniel Baluta 1 sibling, 1 reply; 6+ messages in thread From: Daniel Baluta @ 2019-04-19 20:20 UTC (permalink / raw) To: shawnguo Cc: mark.rutland, robh+dt, s.hauer, kernel, festevam, dl-linux-imx, Aisheng Dong, Anson Huang, Daniel Baluta, Peng Fan, devicetree, linux-arm-kernel, linux-kernel, S.j. Wang, Jacky Bai i.MX8MM has 5 SAI instances with the following base addresses according to RM. SAI1 base address: 3001_0000h SAI2 base address: 3002_0000h SAI3 base address: 3003_0000h SAI5 base address: 3005_0000h SAI6 base address: 3006_0000h Signed-off-by: Bai Ping <ping.bai@nxp.com> Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com> --- arch/arm64/boot/dts/freescale/imx8mm.dtsi | 68 +++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/arch/arm64/boot/dts/freescale/imx8mm.dtsi b/arch/arm64/boot/dts/freescale/imx8mm.dtsi index de3498c2dd44..e9a0b2b6063a 100644 --- a/arch/arm64/boot/dts/freescale/imx8mm.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8mm.dtsi @@ -171,6 +171,74 @@ #size-cells = <1>; ranges; + sai1: sai@30010000 { + compatible = "fsl,imx8mq-sai", + "fsl,imx6sx-sai"; + reg = <0x30010000 0x10000>; + interrupts = <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&clk IMX8MM_CLK_SAI1_IPG>, + <&clk IMX8MM_CLK_SAI1_ROOT>, + <&clk IMX8MM_CLK_DUMMY>, <&clk IMX8MM_CLK_DUMMY>; + clock-names = "bus", "mclk1", "mclk2", "mclk3"; + dmas = <&sdma2 0 2 0>, <&sdma2 1 2 0>; + dma-names = "rx", "tx"; + status = "disabled"; + }; + + sai2: sai@30020000 { + compatible = "fsl,imx8mq-sai", + "fsl,imx6sx-sai"; + reg = <0x30020000 0x10000>; + interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&clk IMX8MM_CLK_SAI2_IPG>, + <&clk IMX8MM_CLK_SAI2_ROOT>, + <&clk IMX8MM_CLK_DUMMY>, <&clk IMX8MM_CLK_DUMMY>; + clock-names = "bus", "mclk1", "mclk2", "mclk3"; + dmas = <&sdma2 2 2 0>, <&sdma2 3 2 0>; + dma-names = "rx", "tx"; + status = "disabled"; + }; + + sai3: sai@30030000 { + #sound-dai-cells = <0>; + compatible = "fsl,imx8mm-sai", "fsl,imx8mq-sai", "fsl,imx6sx-sai"; + reg = <0x30030000 0x10000>; + interrupts = <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&clk IMX8MM_CLK_SAI3_IPG>, + <&clk IMX8MM_CLK_SAI3_ROOT>, + <&clk IMX8MM_CLK_DUMMY>, <&clk IMX8MM_CLK_DUMMY>; + clock-names = "bus", "mclk1", "mclk2", "mclk3"; + dmas = <&sdma2 4 2 0>, <&sdma2 5 2 0>; + dma-names = "rx", "tx"; + status = "disabled"; + }; + + sai5: sai@30050000 { + compatible = "fsl,imx8mq-sai", "fsl,imx6sx-sai"; + reg = <0x30050000 0x10000>; + interrupts = <GIC_SPI 90 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&clk IMX8MM_CLK_SAI5_IPG>, + <&clk IMX8MM_CLK_SAI5_ROOT>, + <&clk IMX8MM_CLK_DUMMY>, <&clk IMX8MM_CLK_DUMMY>; + clock-names = "bus", "mclk1", "mclk2", "mclk3"; + dmas = <&sdma2 8 2 0>, <&sdma2 9 2 0>; + dma-names = "rx", "tx"; + status = "disabled"; + }; + + sai6: sai@30060000 { + compatible = "fsl,imx8mq-sai", "fsl,imx6sx-sai"; + reg = <0x30060000 0x10000>; + interrupts = <GIC_SPI 90 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&clk IMX8MM_CLK_SAI6_IPG>, + <&clk IMX8MM_CLK_SAI6_ROOT>, + <&clk IMX8MM_CLK_DUMMY>, <&clk IMX8MM_CLK_DUMMY>; + clock-names = "bus", "mclk1", "mclk2", "mclk3"; + dmas = <&sdma2 10 2 0>, <&sdma2 11 2 0>; + dma-names = "rx", "tx"; + status = "disabled"; + }; + gpio1: gpio@30200000 { compatible = "fsl,imx8mm-gpio", "fsl,imx35-gpio"; reg = <0x30200000 0x10000>; -- 2.17.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] arm64: dts: imx8mm: Add SAI nodes 2019-04-19 20:20 ` [PATCH 1/2] arm64: dts: imx8mm: Add SAI nodes Daniel Baluta @ 2019-04-22 2:44 ` Shawn Guo 2019-04-22 6:51 ` Daniel Baluta 0 siblings, 1 reply; 6+ messages in thread From: Shawn Guo @ 2019-04-22 2:44 UTC (permalink / raw) To: Daniel Baluta Cc: mark.rutland, robh+dt, s.hauer, kernel, festevam, dl-linux-imx, Aisheng Dong, Anson Huang, Peng Fan, devicetree, linux-arm-kernel, linux-kernel, S.j. Wang, Jacky Bai On Fri, Apr 19, 2019 at 08:20:39PM +0000, Daniel Baluta wrote: > i.MX8MM has 5 SAI instances with the following base > addresses according to RM. > > SAI1 base address: 3001_0000h > SAI2 base address: 3002_0000h > SAI3 base address: 3003_0000h > SAI5 base address: 3005_0000h > SAI6 base address: 3006_0000h > > Signed-off-by: Bai Ping <ping.bai@nxp.com> > Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com> > --- > arch/arm64/boot/dts/freescale/imx8mm.dtsi | 68 +++++++++++++++++++++++ > 1 file changed, 68 insertions(+) > > diff --git a/arch/arm64/boot/dts/freescale/imx8mm.dtsi b/arch/arm64/boot/dts/freescale/imx8mm.dtsi > index de3498c2dd44..e9a0b2b6063a 100644 > --- a/arch/arm64/boot/dts/freescale/imx8mm.dtsi > +++ b/arch/arm64/boot/dts/freescale/imx8mm.dtsi > @@ -171,6 +171,74 @@ > #size-cells = <1>; > ranges; > > + sai1: sai@30010000 { > + compatible = "fsl,imx8mq-sai", Should be "fsl,imx8mm-sai"? Shawn > + "fsl,imx6sx-sai"; > + reg = <0x30010000 0x10000>; > + interrupts = <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>; > + clocks = <&clk IMX8MM_CLK_SAI1_IPG>, > + <&clk IMX8MM_CLK_SAI1_ROOT>, > + <&clk IMX8MM_CLK_DUMMY>, <&clk IMX8MM_CLK_DUMMY>; > + clock-names = "bus", "mclk1", "mclk2", "mclk3"; > + dmas = <&sdma2 0 2 0>, <&sdma2 1 2 0>; > + dma-names = "rx", "tx"; > + status = "disabled"; > + }; > + > + sai2: sai@30020000 { > + compatible = "fsl,imx8mq-sai", > + "fsl,imx6sx-sai"; > + reg = <0x30020000 0x10000>; > + interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>; > + clocks = <&clk IMX8MM_CLK_SAI2_IPG>, > + <&clk IMX8MM_CLK_SAI2_ROOT>, > + <&clk IMX8MM_CLK_DUMMY>, <&clk IMX8MM_CLK_DUMMY>; > + clock-names = "bus", "mclk1", "mclk2", "mclk3"; > + dmas = <&sdma2 2 2 0>, <&sdma2 3 2 0>; > + dma-names = "rx", "tx"; > + status = "disabled"; > + }; > + > + sai3: sai@30030000 { > + #sound-dai-cells = <0>; > + compatible = "fsl,imx8mm-sai", "fsl,imx8mq-sai", "fsl,imx6sx-sai"; > + reg = <0x30030000 0x10000>; > + interrupts = <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>; > + clocks = <&clk IMX8MM_CLK_SAI3_IPG>, > + <&clk IMX8MM_CLK_SAI3_ROOT>, > + <&clk IMX8MM_CLK_DUMMY>, <&clk IMX8MM_CLK_DUMMY>; > + clock-names = "bus", "mclk1", "mclk2", "mclk3"; > + dmas = <&sdma2 4 2 0>, <&sdma2 5 2 0>; > + dma-names = "rx", "tx"; > + status = "disabled"; > + }; > + > + sai5: sai@30050000 { > + compatible = "fsl,imx8mq-sai", "fsl,imx6sx-sai"; > + reg = <0x30050000 0x10000>; > + interrupts = <GIC_SPI 90 IRQ_TYPE_LEVEL_HIGH>; > + clocks = <&clk IMX8MM_CLK_SAI5_IPG>, > + <&clk IMX8MM_CLK_SAI5_ROOT>, > + <&clk IMX8MM_CLK_DUMMY>, <&clk IMX8MM_CLK_DUMMY>; > + clock-names = "bus", "mclk1", "mclk2", "mclk3"; > + dmas = <&sdma2 8 2 0>, <&sdma2 9 2 0>; > + dma-names = "rx", "tx"; > + status = "disabled"; > + }; > + > + sai6: sai@30060000 { > + compatible = "fsl,imx8mq-sai", "fsl,imx6sx-sai"; > + reg = <0x30060000 0x10000>; > + interrupts = <GIC_SPI 90 IRQ_TYPE_LEVEL_HIGH>; > + clocks = <&clk IMX8MM_CLK_SAI6_IPG>, > + <&clk IMX8MM_CLK_SAI6_ROOT>, > + <&clk IMX8MM_CLK_DUMMY>, <&clk IMX8MM_CLK_DUMMY>; > + clock-names = "bus", "mclk1", "mclk2", "mclk3"; > + dmas = <&sdma2 10 2 0>, <&sdma2 11 2 0>; > + dma-names = "rx", "tx"; > + status = "disabled"; > + }; > + > gpio1: gpio@30200000 { > compatible = "fsl,imx8mm-gpio", "fsl,imx35-gpio"; > reg = <0x30200000 0x10000>; > -- > 2.17.1 > ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] arm64: dts: imx8mm: Add SAI nodes 2019-04-22 2:44 ` Shawn Guo @ 2019-04-22 6:51 ` Daniel Baluta 2019-04-22 19:09 ` Daniel Baluta 0 siblings, 1 reply; 6+ messages in thread From: Daniel Baluta @ 2019-04-22 6:51 UTC (permalink / raw) To: Shawn Guo Cc: Daniel Baluta, mark.rutland, robh+dt, s.hauer, kernel, festevam, dl-linux-imx, Aisheng Dong, Anson Huang, Peng Fan, devicetree, linux-arm-kernel, linux-kernel, S.j. Wang, Jacky Bai On Mon, Apr 22, 2019 at 5:45 AM Shawn Guo <shawnguo@kernel.org> wrote: > > On Fri, Apr 19, 2019 at 08:20:39PM +0000, Daniel Baluta wrote: > > i.MX8MM has 5 SAI instances with the following base > > addresses according to RM. > > > > SAI1 base address: 3001_0000h > > SAI2 base address: 3002_0000h > > SAI3 base address: 3003_0000h > > SAI5 base address: 3005_0000h > > SAI6 base address: 3006_0000h > > > > Signed-off-by: Bai Ping <ping.bai@nxp.com> > > Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com> > > --- > > arch/arm64/boot/dts/freescale/imx8mm.dtsi | 68 +++++++++++++++++++++++ > > 1 file changed, 68 insertions(+) > > > > diff --git a/arch/arm64/boot/dts/freescale/imx8mm.dtsi b/arch/arm64/boot/dts/freescale/imx8mm.dtsi > > index de3498c2dd44..e9a0b2b6063a 100644 > > --- a/arch/arm64/boot/dts/freescale/imx8mm.dtsi > > +++ b/arch/arm64/boot/dts/freescale/imx8mm.dtsi > > @@ -171,6 +171,74 @@ > > #size-cells = <1>; > > ranges; > > > > + sai1: sai@30010000 { > > + compatible = "fsl,imx8mq-sai", > > Should be "fsl,imx8mm-sai"? SAI IP on imx8mm is identical with the one on imx8mq. There is no need to differentiate with a compatible string. What is the common practice for such cases? ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] arm64: dts: imx8mm: Add SAI nodes 2019-04-22 6:51 ` Daniel Baluta @ 2019-04-22 19:09 ` Daniel Baluta 0 siblings, 0 replies; 6+ messages in thread From: Daniel Baluta @ 2019-04-22 19:09 UTC (permalink / raw) To: Shawn Guo Cc: Daniel Baluta, mark.rutland, robh+dt, s.hauer, kernel, festevam, dl-linux-imx, Aisheng Dong, Anson Huang, Peng Fan, devicetree, linux-arm-kernel, linux-kernel, S.j. Wang, Jacky Bai On Mon, Apr 22, 2019 at 9:51 AM Daniel Baluta <daniel.baluta@gmail.com> wrote: > > On Mon, Apr 22, 2019 at 5:45 AM Shawn Guo <shawnguo@kernel.org> wrote: > > > > On Fri, Apr 19, 2019 at 08:20:39PM +0000, Daniel Baluta wrote: > > > i.MX8MM has 5 SAI instances with the following base > > > addresses according to RM. > > > > > > SAI1 base address: 3001_0000h > > > SAI2 base address: 3002_0000h > > > SAI3 base address: 3003_0000h > > > SAI5 base address: 3005_0000h > > > SAI6 base address: 3006_0000h > > > > > > Signed-off-by: Bai Ping <ping.bai@nxp.com> > > > Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com> > > > --- > > > arch/arm64/boot/dts/freescale/imx8mm.dtsi | 68 +++++++++++++++++++++++ > > > 1 file changed, 68 insertions(+) > > > > > > diff --git a/arch/arm64/boot/dts/freescale/imx8mm.dtsi b/arch/arm64/boot/dts/freescale/imx8mm.dtsi > > > index de3498c2dd44..e9a0b2b6063a 100644 > > > --- a/arch/arm64/boot/dts/freescale/imx8mm.dtsi > > > +++ b/arch/arm64/boot/dts/freescale/imx8mm.dtsi > > > @@ -171,6 +171,74 @@ > > > #size-cells = <1>; > > > ranges; > > > > > > + sai1: sai@30010000 { > > > + compatible = "fsl,imx8mq-sai", > > > > Should be "fsl,imx8mm-sai"? > > SAI IP on imx8mm is identical with the one on imx8mq. There is no need > to differentiate with a compatible string. On a second thought sai on i.MX8M is not compatible with SAI on i.MX6. So, the correct compatbile should be: compatible = "fsl,imx8mm-sai", "fsl,imx8mq-sai"; Will fix this in v2. ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 2/2] arm64: dts: imx8mm-evk: Enable audio codec wm8524 2019-04-19 20:20 [PATCH 0/2] Enable wm8524 codec on i.MX8MM EVK Daniel Baluta 2019-04-19 20:20 ` [PATCH 1/2] arm64: dts: imx8mm: Add SAI nodes Daniel Baluta @ 2019-04-19 20:20 ` Daniel Baluta 1 sibling, 0 replies; 6+ messages in thread From: Daniel Baluta @ 2019-04-19 20:20 UTC (permalink / raw) To: shawnguo Cc: mark.rutland, robh+dt, s.hauer, kernel, festevam, dl-linux-imx, Aisheng Dong, Anson Huang, Daniel Baluta, Peng Fan, devicetree, linux-arm-kernel, linux-kernel, S.j. Wang i.MX8MM EVK has one wm8524 audio codec connected with SAI3 digital audio interface. This patch uses simple-card machine driver in order to enable wm8524 codec. We need to set: * SAI3 pinctrl configuration * clock hierarchy * codec node * simple-card configuration Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com> --- arch/arm64/boot/dts/freescale/imx8mm-evk.dts | 48 ++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/arch/arm64/boot/dts/freescale/imx8mm-evk.dts b/arch/arm64/boot/dts/freescale/imx8mm-evk.dts index 2d5d89475b76..207b13266a96 100644 --- a/arch/arm64/boot/dts/freescale/imx8mm-evk.dts +++ b/arch/arm64/boot/dts/freescale/imx8mm-evk.dts @@ -37,6 +37,35 @@ gpio = <&gpio2 19 GPIO_ACTIVE_HIGH>; enable-active-high; }; + + wm8524: audio-codec { + #sound-dai-cells = <0>; + compatible = "wlf,wm8524"; + wlf,mute-gpios = <&gpio5 21 GPIO_ACTIVE_LOW>; + }; + + sound-wm8524 { + compatible = "simple-audio-card"; + simple-audio-card,name = "wm8524-audio"; + simple-audio-card,format = "i2s"; + simple-audio-card,frame-master = <&cpudai>; + simple-audio-card,bitclock-master = <&cpudai>; + simple-audio-card,widgets = + "Line", "Left Line Out Jack", + "Line", "Right Line Out Jack"; + simple-audio-card,routing = + "Left Line Out Jack", "LINEVOUTL", + "Right Line Out Jack", "LINEVOUTR"; + + cpudai: simple-audio-card,cpu { + sound-dai = <&sai3>; + }; + + link_codec: simple-audio-card,codec { + sound-dai = <&wm8524>; + clocks = <&clk IMX8MM_CLK_SAI3_ROOT>; + }; + }; }; &fec1 { @@ -61,6 +90,15 @@ }; }; +&sai3 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_sai3>; + assigned-clocks = <&clk IMX8MM_CLK_SAI3>; + assigned-clock-parents = <&clk IMX8MM_AUDIO_PLL1_OUT>; + assigned-clock-rates = <24576000>; + status = "okay"; +}; + &uart2 { /* console */ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart2>; @@ -130,6 +168,16 @@ >; }; + pinctrl_sai3: sai3grp { + fsl,pins = < + MX8MM_IOMUXC_SAI3_TXFS_SAI3_TX_SYNC 0xd6 + MX8MM_IOMUXC_SAI3_TXC_SAI3_TX_BCLK 0xd6 + MX8MM_IOMUXC_SAI3_MCLK_SAI3_MCLK 0xd6 + MX8MM_IOMUXC_SAI3_TXD_SAI3_TX_DATA0 0xd6 + MX8MM_IOMUXC_I2C4_SDA_GPIO5_IO21 0xd6 + >; + }; + pinctrl_uart2: uart2grp { fsl,pins = < MX8MM_IOMUXC_UART2_RXD_UART2_DCE_RX 0x140 -- 2.17.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-04-22 19:09 UTC | newest] Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-04-19 20:20 [PATCH 0/2] Enable wm8524 codec on i.MX8MM EVK Daniel Baluta 2019-04-19 20:20 ` [PATCH 1/2] arm64: dts: imx8mm: Add SAI nodes Daniel Baluta 2019-04-22 2:44 ` Shawn Guo 2019-04-22 6:51 ` Daniel Baluta 2019-04-22 19:09 ` Daniel Baluta 2019-04-19 20:20 ` [PATCH 2/2] arm64: dts: imx8mm-evk: Enable audio codec wm8524 Daniel Baluta
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).