linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v4 0/2]  Enable wm8524 codec on i.MX8MM EVK
@ 2019-06-04 12:32 daniel.baluta
  2019-06-04 12:32 ` [PATCH v4 1/2] arm64: dts: imx8mm: Add SAI nodes daniel.baluta
  2019-06-04 12:32 ` [PATCH v4 2/2] arm64: dts: imx8mm-evk: Enable audio codec wm8524 daniel.baluta
  0 siblings, 2 replies; 5+ messages in thread
From: daniel.baluta @ 2019-06-04 12:32 UTC (permalink / raw)
  To: shawnguo
  Cc: mark.rutland, robh+dt, s.hauer, kernel, festevam, linux-imx,
	shengjiu.wang, devicetree, linux-arm-kernel, linux-kernel,
	m.felsch, Daniel Baluta

From: Daniel Baluta <daniel.baluta@nxp.com>

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.

Changes since v3:
	- rebased on latest for-next branch
	- fixed encoding problems

Changes since v2:
       - place compatible strings one a single lines
       - move GPIO pinctrl in a node of its own
       - remove codec phandle

Changes since v1:
        - use "fsl,imx8mm-sai", "fsl,imx8mq-sai" compatbile strings and
          remove "fsl,imx6sx-sai" because SAI module on i.MX8M is not
          compatbile with SAI modules form i.MX6

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 | 55 ++++++++++++++++
 arch/arm64/boot/dts/freescale/imx8mm.dtsi    | 66 ++++++++++++++++++++
 2 files changed, 121 insertions(+)

-- 
2.17.1


^ permalink raw reply	[flat|nested] 5+ messages in thread
* [PATCH v4 1/2] arm64: dts: imx8mm: Add SAI nodes
  2019-06-04 12:32 [PATCH v4 0/2] Enable wm8524 codec on i.MX8MM EVK daniel.baluta
@ 2019-06-04 12:32 ` daniel.baluta
  2019-06-04 12:32 ` [PATCH v4 2/2] arm64: dts: imx8mm-evk: Enable audio codec wm8524 daniel.baluta
  1 sibling, 0 replies; 5+ messages in thread
From: daniel.baluta @ 2019-06-04 12:32 UTC (permalink / raw)
  To: shawnguo
  Cc: mark.rutland, robh+dt, s.hauer, kernel, festevam, linux-imx,
	shengjiu.wang, devicetree, linux-arm-kernel, linux-kernel,
	m.felsch, Daniel Baluta

From: Daniel Baluta <daniel.baluta@nxp.com>

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: Daniel Baluta <daniel.baluta@nxp.com>
Reviewed-by: Fabio Estevam <festevam@gmail.com>
---
 arch/arm64/boot/dts/freescale/imx8mm.dtsi | 66 +++++++++++++++++++++++
 1 file changed, 66 insertions(+)

Shawn, although here https://lkml.org/lkml/2019/5/31/110 you 
say this patch is applied I couldn't find it in any of your
branches.

diff --git a/arch/arm64/boot/dts/freescale/imx8mm.dtsi b/arch/arm64/boot/dts/freescale/imx8mm.dtsi
index 708d3c4c1389..321cd050e6f8 100644
--- a/arch/arm64/boot/dts/freescale/imx8mm.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mm.dtsi
@@ -212,6 +212,72 @@
 			#size-cells = <1>;
 			ranges;
 
+			sai1: sai@30010000 {
+				compatible = "fsl,imx8mm-sai", "fsl,imx8mq-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,imx8mm-sai", "fsl,imx8mq-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";
+				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,imx8mm-sai", "fsl,imx8mq-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,imx8mm-sai", "fsl,imx8mq-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] 5+ messages in thread
* [PATCH v4 2/2] arm64: dts: imx8mm-evk: Enable audio codec wm8524
  2019-06-04 12:32 [PATCH v4 0/2] Enable wm8524 codec on i.MX8MM EVK daniel.baluta
  2019-06-04 12:32 ` [PATCH v4 1/2] arm64: dts: imx8mm: Add SAI nodes daniel.baluta
@ 2019-06-04 12:32 ` daniel.baluta
  2019-06-18 20:18   ` Daniel Baluta
  2019-06-23  7:36   ` Shawn Guo
  1 sibling, 2 replies; 5+ messages in thread
From: daniel.baluta @ 2019-06-04 12:32 UTC (permalink / raw)
  To: shawnguo
  Cc: mark.rutland, robh+dt, s.hauer, kernel, festevam, linux-imx,
	shengjiu.wang, devicetree, linux-arm-kernel, linux-kernel,
	m.felsch, Daniel Baluta

From: Daniel Baluta <daniel.baluta@nxp.com>

i.MX8MM 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
	* codec reset gpio pinctrl configuration
	* clock hierarchy
	* codec node
	* simple-card configuration

Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
Reviewed-by: Fabio Estevam <festevam@gmail.com>
---
 arch/arm64/boot/dts/freescale/imx8mm-evk.dts | 55 ++++++++++++++++++++
 1 file changed, 55 insertions(+)

diff --git a/arch/arm64/boot/dts/freescale/imx8mm-evk.dts b/arch/arm64/boot/dts/freescale/imx8mm-evk.dts
index f8ff0a4b8961..7d2ec0326659 100644
--- a/arch/arm64/boot/dts/freescale/imx8mm-evk.dts
+++ b/arch/arm64/boot/dts/freescale/imx8mm-evk.dts
@@ -37,6 +37,37 @@
 		gpio = <&gpio2 19 GPIO_ACTIVE_HIGH>;
 		enable-active-high;
 	};
+
+	wm8524: audio-codec {
+		#sound-dai-cells = <0>;
+		compatible = "wlf,wm8524";
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_gpio_wlf>;
+		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>;
+		};
+
+		simple-audio-card,codec {
+			sound-dai = <&wm8524>;
+			clocks = <&clk IMX8MM_CLK_SAI3_ROOT>;
+		};
+	};
 };
 
 &A53_0 {
@@ -65,6 +96,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>;
@@ -242,6 +282,12 @@
 		>;
 	};
 
+	pinctrl_gpio_wlf: gpiowlfgrp {
+		fsl,pins = <
+			MX8MM_IOMUXC_I2C4_SDA_GPIO5_IO21	0xd6
+		>;
+	};
+
 	pinctrl_i2c1: i2c1grp {
 		fsl,pins = <
 			MX8MM_IOMUXC_I2C1_SCL_I2C1_SCL			0x400001c3
@@ -261,6 +307,15 @@
 		>;
 	};
 
+	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
+		>;
+	};
+
 	pinctrl_uart2: uart2grp {
 		fsl,pins = <
 			MX8MM_IOMUXC_UART2_RXD_UART2_DCE_RX	0x140
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* Re: [PATCH v4 2/2] arm64: dts: imx8mm-evk: Enable audio codec wm8524
  2019-06-04 12:32 ` [PATCH v4 2/2] arm64: dts: imx8mm-evk: Enable audio codec wm8524 daniel.baluta
@ 2019-06-18 20:18   ` Daniel Baluta
  2019-06-23  7:36   ` Shawn Guo
  1 sibling, 0 replies; 5+ messages in thread
From: Daniel Baluta @ 2019-06-18 20:18 UTC (permalink / raw)
  To: Daniel Baluta
  Cc: Shawn Guo, Mark Rutland, Rob Herring, Sascha Hauer,
	Pengutronix Kernel Team, Fabio Estevam, dl-linux-imx, S.j. Wang,
	Devicetree List, linux-arm-kernel, Linux Kernel Mailing List,
	Marco Felsch

Shawn,

Care to have a look at this? git send-email should correctly work now.

Let me know if you want me to resend

On Tue, Jun 4, 2019 at 3:34 PM <daniel.baluta@nxp.com> wrote:
>
> From: Daniel Baluta <daniel.baluta@nxp.com>
>
> i.MX8MM 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
>         * codec reset gpio pinctrl configuration
>         * clock hierarchy
>         * codec node
>         * simple-card configuration
>
> Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
> Reviewed-by: Fabio Estevam <festevam@gmail.com>
> ---
>  arch/arm64/boot/dts/freescale/imx8mm-evk.dts | 55 ++++++++++++++++++++
>  1 file changed, 55 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/freescale/imx8mm-evk.dts b/arch/arm64/boot/dts/freescale/imx8mm-evk.dts
> index f8ff0a4b8961..7d2ec0326659 100644
> --- a/arch/arm64/boot/dts/freescale/imx8mm-evk.dts
> +++ b/arch/arm64/boot/dts/freescale/imx8mm-evk.dts
> @@ -37,6 +37,37 @@
>                 gpio = <&gpio2 19 GPIO_ACTIVE_HIGH>;
>                 enable-active-high;
>         };
> +
> +       wm8524: audio-codec {
> +               #sound-dai-cells = <0>;
> +               compatible = "wlf,wm8524";
> +               pinctrl-names = "default";
> +               pinctrl-0 = <&pinctrl_gpio_wlf>;
> +               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>;
> +               };
> +
> +               simple-audio-card,codec {
> +                       sound-dai = <&wm8524>;
> +                       clocks = <&clk IMX8MM_CLK_SAI3_ROOT>;
> +               };
> +       };
>  };
>
>  &A53_0 {
> @@ -65,6 +96,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>;
> @@ -242,6 +282,12 @@
>                 >;
>         };
>
> +       pinctrl_gpio_wlf: gpiowlfgrp {
> +               fsl,pins = <
> +                       MX8MM_IOMUXC_I2C4_SDA_GPIO5_IO21        0xd6
> +               >;
> +       };
> +
>         pinctrl_i2c1: i2c1grp {
>                 fsl,pins = <
>                         MX8MM_IOMUXC_I2C1_SCL_I2C1_SCL                  0x400001c3
> @@ -261,6 +307,15 @@
>                 >;
>         };
>
> +       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
> +               >;
> +       };
> +
>         pinctrl_uart2: uart2grp {
>                 fsl,pins = <
>                         MX8MM_IOMUXC_UART2_RXD_UART2_DCE_RX     0x140
> --
> 2.17.1
>

^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [PATCH v4 2/2] arm64: dts: imx8mm-evk: Enable audio codec wm8524
  2019-06-04 12:32 ` [PATCH v4 2/2] arm64: dts: imx8mm-evk: Enable audio codec wm8524 daniel.baluta
  2019-06-18 20:18   ` Daniel Baluta
@ 2019-06-23  7:36   ` Shawn Guo
  1 sibling, 0 replies; 5+ messages in thread
From: Shawn Guo @ 2019-06-23  7:36 UTC (permalink / raw)
  To: daniel.baluta
  Cc: mark.rutland, robh+dt, s.hauer, kernel, festevam, linux-imx,
	shengjiu.wang, devicetree, linux-arm-kernel, linux-kernel,
	m.felsch

On Tue, Jun 04, 2019 at 08:32:57PM +0800, daniel.baluta@nxp.com wrote:
> From: Daniel Baluta <daniel.baluta@nxp.com>
> 
> i.MX8MM 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
> 	* codec reset gpio pinctrl configuration
> 	* clock hierarchy
> 	* codec node
> 	* simple-card configuration
> 
> Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
> Reviewed-by: Fabio Estevam <festevam@gmail.com>

Applied, thanks.

^ permalink raw reply	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-06-23  7:36 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-06-04 12:32 [PATCH v4 0/2] Enable wm8524 codec on i.MX8MM EVK daniel.baluta
2019-06-04 12:32 ` [PATCH v4 1/2] arm64: dts: imx8mm: Add SAI nodes daniel.baluta
2019-06-04 12:32 ` [PATCH v4 2/2] arm64: dts: imx8mm-evk: Enable audio codec wm8524 daniel.baluta
2019-06-18 20:18   ` Daniel Baluta
2019-06-23  7:36   ` Shawn Guo

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).