* [PATCH V2 0/5] Enable Audio functions on i.MX8M Nano
@ 2020-10-31 13:23 Adam Ford
2020-10-31 13:23 ` [PATCH V2 1/5] arm64: dts: imx8mn: Enable Asynchronous Sample Rate Converter Adam Ford
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Adam Ford @ 2020-10-31 13:23 UTC (permalink / raw)
To: linux-arm-kernel
Cc: aford, marex, Adam Ford, Rob Herring, Shawn Guo, Sascha Hauer,
Pengutronix Kernel Team, Fabio Estevam, NXP Linux Team,
Catalin Marinas, Will Deacon, devicetree, linux-kernel
The i.MX8M Nano uses similar blocks of audio IP as the iMX8M Mini
This series adds those functions.
V2: Mostly corrects some minor typos and rebased on Shawn Guo's
branch imx/dt64. The added cover letter with stats was per request
to show what's changed at a high level.
Adam Ford (5):
arm64: dts: imx8mn: Enable Asynchronous Sample Rate Converter
arm64: defconfig: Enable ASRC and EASRC
arm64: dts: imx8mn: Add SAI nodes
arm64: dts: imx8mn: Add support for micfil
arm64: dts: imx8mn: Add node for SPDIF
arch/arm64/boot/dts/freescale/imx8mn.dtsi | 143 ++++++++++++++++++++++
arch/arm64/configs/defconfig | 2 +
2 files changed, 145 insertions(+)
--
2.25.1
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH V2 1/5] arm64: dts: imx8mn: Enable Asynchronous Sample Rate Converter
2020-10-31 13:23 [PATCH V2 0/5] Enable Audio functions on i.MX8M Nano Adam Ford
@ 2020-10-31 13:23 ` Adam Ford
2020-10-31 13:23 ` [PATCH V2 2/5] arm64: defconfig: Enable ASRC and EASRC Adam Ford
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Adam Ford @ 2020-10-31 13:23 UTC (permalink / raw)
To: linux-arm-kernel
Cc: aford, marex, Adam Ford, Rob Herring, Shawn Guo, Sascha Hauer,
Pengutronix Kernel Team, Fabio Estevam, NXP Linux Team,
Catalin Marinas, Will Deacon, devicetree, linux-kernel
The driver exists for the Enhanced Asynchronous Sample Rate Converter
(EASRC) Controller, but there isn't a device tree entry for it.
On the vendor kernel, they put this on a spba-bus for SDMA support.
Add the the node for the spba-bus with the easrc node inside.
Signed-off-by: Adam Ford <aford173@gmail.com>
---
V2: Make the DT node more in-line with the dt binding and remove
vendor customizations that are not applicable.
---
arch/arm64/boot/dts/freescale/imx8mn.dtsi | 28 +++++++++++++++++++++++
1 file changed, 28 insertions(+)
diff --git a/arch/arm64/boot/dts/freescale/imx8mn.dtsi b/arch/arm64/boot/dts/freescale/imx8mn.dtsi
index d5cb8abb13e8..a2e1e92f2e84 100644
--- a/arch/arm64/boot/dts/freescale/imx8mn.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mn.dtsi
@@ -253,6 +253,34 @@ aips1: bus@30000000 {
#size-cells = <1>;
ranges;
+ spba-bus@30000000 {
+ compatible = "fsl,spba-bus", "simple-bus";
+ #address-cells = <1>;
+ #size-cells = <1>;
+ reg = <0x30000000 0x100000>;
+ ranges;
+
+ easrc: easrc@300c0000 {
+ compatible = "fsl,imx8mn-easrc";
+ reg = <0x300c0000 0x10000>;
+ interrupts = <GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&clk IMX8MN_CLK_ASRC_ROOT>;
+ clock-names = "mem";
+ dmas = <&sdma2 16 23 0> , <&sdma2 17 23 0>,
+ <&sdma2 18 23 0> , <&sdma2 19 23 0>,
+ <&sdma2 20 23 0> , <&sdma2 21 23 0>,
+ <&sdma2 22 23 0> , <&sdma2 23 23 0>;
+ dma-names = "ctx0_rx", "ctx0_tx",
+ "ctx1_rx", "ctx1_tx",
+ "ctx2_rx", "ctx2_tx",
+ "ctx3_rx", "ctx3_tx";
+ firmware-name = "imx/easrc/easrc-imx8mn.bin";
+ fsl,asrc-rate = <8000>;
+ fsl,asrc-format = <2>;
+ status = "disabled";
+ };
+ };
+
gpio1: gpio@30200000 {
compatible = "fsl,imx8mn-gpio", "fsl,imx35-gpio";
reg = <0x30200000 0x10000>;
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH V2 2/5] arm64: defconfig: Enable ASRC and EASRC
2020-10-31 13:23 [PATCH V2 0/5] Enable Audio functions on i.MX8M Nano Adam Ford
2020-10-31 13:23 ` [PATCH V2 1/5] arm64: dts: imx8mn: Enable Asynchronous Sample Rate Converter Adam Ford
@ 2020-10-31 13:23 ` Adam Ford
2020-10-31 13:23 ` [PATCH V2 3/5] arm64: dts: imx8mn: Add SAI nodes Adam Ford
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Adam Ford @ 2020-10-31 13:23 UTC (permalink / raw)
To: linux-arm-kernel
Cc: aford, marex, Adam Ford, Rob Herring, Shawn Guo, Sascha Hauer,
Pengutronix Kernel Team, Fabio Estevam, NXP Linux Team,
Catalin Marinas, Will Deacon, devicetree, linux-kernel
The i.MX8M Nano supports the EASRC driver, and it requires ASRC.
Enable both of them as modules.
Signed-off-by: Adam Ford <aford173@gmail.com>
---
arch/arm64/configs/defconfig | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 844d8817e6f4..270d326d5f28 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -694,7 +694,9 @@ CONFIG_SND_HDA_CODEC_HDMI=m
CONFIG_SND_SOC=y
CONFIG_SND_BCM2835_SOC_I2S=m
CONFIG_SND_SOC_FSL_SAI=m
+CONFIG_SND_SOC_FSL_ASRC=m
CONFIG_SND_SOC_FSL_MICFIL=m
+CONFIG_SND_SOC_FSL_EASRC=m
CONFIG_SND_IMX_SOC=m
CONFIG_SND_SOC_IMX_SPDIF=m
CONFIG_SND_SOC_IMX_AUDMIX=m
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH V2 3/5] arm64: dts: imx8mn: Add SAI nodes
2020-10-31 13:23 [PATCH V2 0/5] Enable Audio functions on i.MX8M Nano Adam Ford
2020-10-31 13:23 ` [PATCH V2 1/5] arm64: dts: imx8mn: Enable Asynchronous Sample Rate Converter Adam Ford
2020-10-31 13:23 ` [PATCH V2 2/5] arm64: defconfig: Enable ASRC and EASRC Adam Ford
@ 2020-10-31 13:23 ` Adam Ford
2020-10-31 13:23 ` [PATCH V2 4/5] arm64: dts: imx8mn: Add support for micfil Adam Ford
2020-10-31 13:23 ` [PATCH V2 5/5] arm64: dts: imx8mn: Add node for SPDIF Adam Ford
4 siblings, 0 replies; 6+ messages in thread
From: Adam Ford @ 2020-10-31 13:23 UTC (permalink / raw)
To: linux-arm-kernel
Cc: aford, marex, Adam Ford, Rob Herring, Shawn Guo, Sascha Hauer,
Pengutronix Kernel Team, Fabio Estevam, NXP Linux Team,
Catalin Marinas, Will Deacon, devicetree, linux-kernel
The i.MX8M Nano has several SAI nodes available to it.
Enable them.
Signed-off-by: Adam Ford <aford173@gmail.com>
---
arch/arm64/boot/dts/freescale/imx8mn.dtsi | 72 +++++++++++++++++++++++
1 file changed, 72 insertions(+)
diff --git a/arch/arm64/boot/dts/freescale/imx8mn.dtsi b/arch/arm64/boot/dts/freescale/imx8mn.dtsi
index a2e1e92f2e84..dab246e5abea 100644
--- a/arch/arm64/boot/dts/freescale/imx8mn.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mn.dtsi
@@ -260,6 +260,78 @@ spba-bus@30000000 {
reg = <0x30000000 0x100000>;
ranges;
+ sai2: sai@30020000 {
+ compatible = "fsl,imx8mm-sai", "fsl,imx8mq-sai";
+ reg = <0x30020000 0x10000>;
+ interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&clk IMX8MN_CLK_SAI2_IPG>,
+ <&clk IMX8MN_CLK_DUMMY>,
+ <&clk IMX8MN_CLK_SAI2_ROOT>,
+ <&clk IMX8MN_CLK_DUMMY>, <&clk IMX8MN_CLK_DUMMY>;
+ clock-names = "bus", "mclk0", "mclk1", "mclk2", "mclk3";
+ dmas = <&sdma2 2 2 0>, <&sdma2 3 2 0>;
+ dma-names = "rx", "tx";
+ status = "disabled";
+ };
+
+ sai3: sai@30030000 {
+ compatible = "fsl,imx8mm-sai", "fsl,imx8mq-sai";
+ reg = <0x30030000 0x10000>;
+ interrupts = <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&clk IMX8MN_CLK_SAI3_IPG>,
+ <&clk IMX8MN_CLK_DUMMY>,
+ <&clk IMX8MN_CLK_SAI3_ROOT>,
+ <&clk IMX8MN_CLK_DUMMY>, <&clk IMX8MN_CLK_DUMMY>;
+ clock-names = "bus", "mclk0", "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 IMX8MN_CLK_SAI5_IPG>,
+ <&clk IMX8MN_CLK_DUMMY>,
+ <&clk IMX8MN_CLK_SAI5_ROOT>,
+ <&clk IMX8MN_CLK_DUMMY>, <&clk IMX8MN_CLK_DUMMY>;
+ clock-names = "bus", "mclk0", "mclk1", "mclk2", "mclk3";
+ dmas = <&sdma2 8 2 0>, <&sdma2 9 2 0>;
+ dma-names = "rx", "tx";
+ fsl,shared-interrupt;
+ fsl,dataline = <0 0xf 0xf>;
+ 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 IMX8MN_CLK_SAI6_IPG>,
+ <&clk IMX8MN_CLK_DUMMY>,
+ <&clk IMX8MN_CLK_SAI6_ROOT>,
+ <&clk IMX8MN_CLK_DUMMY>, <&clk IMX8MN_CLK_DUMMY>;
+ clock-names = "bus", "mclk0", "mclk1", "mclk2", "mclk3";
+ dmas = <&sdma2 10 2 0>, <&sdma2 11 2 0>;
+ dma-names = "rx", "tx";
+ status = "disabled";
+ };
+
+ sai7: sai@300b0000 {
+ compatible = "fsl,imx8mm-sai", "fsl,imx8mq-sai";
+ reg = <0x300b0000 0x10000>;
+ interrupts = <GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&clk IMX8MN_CLK_SAI7_IPG>,
+ <&clk IMX8MN_CLK_DUMMY>,
+ <&clk IMX8MN_CLK_SAI7_ROOT>,
+ <&clk IMX8MN_CLK_DUMMY>, <&clk IMX8MN_CLK_DUMMY>;
+ clock-names = "bus", "mclk0", "mclk1", "mclk2", "mclk3";
+ dmas = <&sdma2 12 2 0>, <&sdma2 13 2 0>;
+ dma-names = "rx", "tx";
+ status = "disabled";
+ };
+
easrc: easrc@300c0000 {
compatible = "fsl,imx8mn-easrc";
reg = <0x300c0000 0x10000>;
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH V2 4/5] arm64: dts: imx8mn: Add support for micfil
2020-10-31 13:23 [PATCH V2 0/5] Enable Audio functions on i.MX8M Nano Adam Ford
` (2 preceding siblings ...)
2020-10-31 13:23 ` [PATCH V2 3/5] arm64: dts: imx8mn: Add SAI nodes Adam Ford
@ 2020-10-31 13:23 ` Adam Ford
2020-10-31 13:23 ` [PATCH V2 5/5] arm64: dts: imx8mn: Add node for SPDIF Adam Ford
4 siblings, 0 replies; 6+ messages in thread
From: Adam Ford @ 2020-10-31 13:23 UTC (permalink / raw)
To: linux-arm-kernel
Cc: aford, marex, Adam Ford, Rob Herring, Shawn Guo, Sascha Hauer,
Pengutronix Kernel Team, Fabio Estevam, NXP Linux Team,
Catalin Marinas, Will Deacon, devicetree, linux-kernel
The i.MX8M Nano has supports the MICFIL digital interface.
It's a 16-bit audio signal from a PDM microphone bitstream.
The driver is already in the kernel, but the node is missing.
Add the micfil node.
Signed-off-by: Adam Ford <aford173@gmail.com>
---
V2: Rebase and use generic term audio-controller instead of micfil.
---
arch/arm64/boot/dts/freescale/imx8mn.dtsi | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/arch/arm64/boot/dts/freescale/imx8mn.dtsi b/arch/arm64/boot/dts/freescale/imx8mn.dtsi
index dab246e5abea..a83e87cac96d 100644
--- a/arch/arm64/boot/dts/freescale/imx8mn.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mn.dtsi
@@ -318,6 +318,25 @@ sai6: sai@30060000 {
status = "disabled";
};
+ micfil: audio-controller@30080000 {
+ compatible = "fsl,imx8mm-micfil";
+ reg = <0x30080000 0x10000>;
+ interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&clk IMX8MN_CLK_PDM_IPG>,
+ <&clk IMX8MN_CLK_PDM_ROOT>,
+ <&clk IMX8MN_AUDIO_PLL1_OUT>,
+ <&clk IMX8MN_AUDIO_PLL2_OUT>,
+ <&clk IMX8MN_CLK_EXT3>;
+ clock-names = "ipg_clk", "ipg_clk_app",
+ "pll8k", "pll11k", "clkext3";
+ dmas = <&sdma2 24 25 0x80000000>;
+ dma-names = "rx";
+ status = "disabled";
+ };
+
sai7: sai@300b0000 {
compatible = "fsl,imx8mm-sai", "fsl,imx8mq-sai";
reg = <0x300b0000 0x10000>;
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH V2 5/5] arm64: dts: imx8mn: Add node for SPDIF
2020-10-31 13:23 [PATCH V2 0/5] Enable Audio functions on i.MX8M Nano Adam Ford
` (3 preceding siblings ...)
2020-10-31 13:23 ` [PATCH V2 4/5] arm64: dts: imx8mn: Add support for micfil Adam Ford
@ 2020-10-31 13:23 ` Adam Ford
4 siblings, 0 replies; 6+ messages in thread
From: Adam Ford @ 2020-10-31 13:23 UTC (permalink / raw)
To: linux-arm-kernel
Cc: aford, marex, Adam Ford, Rob Herring, Shawn Guo, Sascha Hauer,
Pengutronix Kernel Team, Fabio Estevam, NXP Linux Team,
Catalin Marinas, Will Deacon, devicetree, linux-kernel
The i.MX8M Nano can support SPDIF which is compatible to the
IP used on the i.MX35.
Add the node.
Signed-off-by: Adam Ford <aford173@gmail.com>
---
arch/arm64/boot/dts/freescale/imx8mn.dtsi | 24 +++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/arch/arm64/boot/dts/freescale/imx8mn.dtsi b/arch/arm64/boot/dts/freescale/imx8mn.dtsi
index a83e87cac96d..e508db232bcf 100644
--- a/arch/arm64/boot/dts/freescale/imx8mn.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mn.dtsi
@@ -337,6 +337,30 @@ micfil: audio-controller@30080000 {
status = "disabled";
};
+ spdif1: spdif@30090000 {
+ compatible = "fsl,imx35-spdif";
+ reg = <0x30090000 0x10000>;
+ interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&clk IMX8MN_CLK_AUDIO_AHB>, /* core */
+ <&clk IMX8MN_CLK_24M>, /* rxtx0 */
+ <&clk IMX8MN_CLK_SPDIF1>, /* rxtx1 */
+ <&clk IMX8MN_CLK_DUMMY>, /* rxtx2 */
+ <&clk IMX8MN_CLK_DUMMY>, /* rxtx3 */
+ <&clk IMX8MN_CLK_DUMMY>, /* rxtx4 */
+ <&clk IMX8MN_CLK_AUDIO_AHB>, /* rxtx5 */
+ <&clk IMX8MN_CLK_DUMMY>, /* rxtx6 */
+ <&clk IMX8MN_CLK_DUMMY>, /* rxtx7 */
+ <&clk IMX8MN_CLK_DUMMY>; /* spba */
+ clock-names = "core", "rxtx0",
+ "rxtx1", "rxtx2",
+ "rxtx3", "rxtx4",
+ "rxtx5", "rxtx6",
+ "rxtx7", "spba";
+ dmas = <&sdma2 28 18 0>, <&sdma2 29 18 0>;
+ dma-names = "rx", "tx";
+ status = "disabled";
+ };
+
sai7: sai@300b0000 {
compatible = "fsl,imx8mm-sai", "fsl,imx8mq-sai";
reg = <0x300b0000 0x10000>;
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-10-31 13:24 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-31 13:23 [PATCH V2 0/5] Enable Audio functions on i.MX8M Nano Adam Ford
2020-10-31 13:23 ` [PATCH V2 1/5] arm64: dts: imx8mn: Enable Asynchronous Sample Rate Converter Adam Ford
2020-10-31 13:23 ` [PATCH V2 2/5] arm64: defconfig: Enable ASRC and EASRC Adam Ford
2020-10-31 13:23 ` [PATCH V2 3/5] arm64: dts: imx8mn: Add SAI nodes Adam Ford
2020-10-31 13:23 ` [PATCH V2 4/5] arm64: dts: imx8mn: Add support for micfil Adam Ford
2020-10-31 13:23 ` [PATCH V2 5/5] arm64: dts: imx8mn: Add node for SPDIF Adam Ford
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).