Skip to contentSkip to conversation

clk: Introduce devm_clk_hw_register_gate_parent_data()

PATCH Superseded Marek Vasut 4 participants 17 messages Feb 27, 2023 – Feb 28, 2023

Subsystems (4)

v5 of 7 Superseded Latest is v7 →

lore
Share & tools
lore
#0 lore raw

PATCH v5 1/5 clk: Introduce devm_clk_hw_register_gate_parent_data()

Add an API for clock gate that uses parent_data for the parent instead of a string parent_name.

---
Cc: Abel Vesa <[email protected]>
Cc: Alexander Stein <[email protected]>
Cc: Fabio Estevam <[email protected]>
Cc: Jacky Bai <[email protected]>
Cc: Krzysztof Kozlowski <[email protected]>
Cc: Laurent Pinchart <[email protected]>
Cc: Luca Ceresoli <[email protected]>
Cc: Lucas Stach <[email protected]>
Cc: Marco Felsch <[email protected]>
Cc: Michael Turquette <[email protected]>
Cc: NXP Linux Team <[email protected]>
Cc: Peng Fan <[email protected]>
Cc: Pengutronix Kernel Team <[email protected]>
Cc: Richard Cochran <[email protected]>
Cc: Rob Herring <[email protected]>
Cc: Sascha Hauer <[email protected]>
Cc: Shawn Guo <[email protected]>
Cc: Stephen Boyd <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
---
V3: New patch
V4: - Rebase on next 20230223
V5: Add TB from Adam and Alexander

---
 include/linux/clk-provider.h | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
include/linux/clk-provider.h +19 -0
index 842e72a5348fa..92b7c794c6272 100644
@@ -608,6 +608,25 @@ struct clk *clk_register_gate(struct device *dev, const char *name,
 	__devm_clk_hw_register_gate((dev), NULL, (name), (parent_name), NULL, \
 			       NULL, (flags), (reg), (bit_idx),		      \
 			       (clk_gate_flags), (lock))
+
+/**
+ * devm_clk_hw_register_gate - register a gate clock with the clock framework
+ * @dev: device that is registering this clock
+ * @name: name of this clock
+ * @parent_data: parent clk data
+ * @flags: framework-specific flags for this clock
+ * @reg: register address to control gating of this clock
+ * @bit_idx: which bit in the register controls gating of this clock
+ * @clk_gate_flags: gate-specific flags for this clock
+ * @lock: shared register lock for this clock
+ */
+#define devm_clk_hw_register_gate_parent_data(dev, name, parent_data, flags,  \
+					      reg, bit_idx, clk_gate_flags,   \
+					      lock)			      \
+	__devm_clk_hw_register_gate((dev), NULL, (name), NULL, NULL,	      \
+				    (parent_data), (flags), (reg), (bit_idx), \
+				    (clk_gate_flags), (lock))
+
 void clk_unregister_gate(struct clk *clk);
 void clk_hw_unregister_gate(struct clk_hw *hw);
 int clk_gate_is_enabled(struct clk_hw *hw);
Signature · 7 lines
2.39.2


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
#1 lore raw

PATCH v5 2/5 clk: imx: imx8mp: Add audiomix block control

Unlike the other block control IPs in i.MX8M, the audiomix is mostly a series of clock gates and muxes. Model it as a large static table of gates and muxes with one exception, which is the PLL14xx . The PLL14xx SAI PLL has to be registered separately.

---
Cc: Abel Vesa <[email protected]>
Cc: Alexander Stein <[email protected]>
Cc: Fabio Estevam <[email protected]>
Cc: Jacky Bai <[email protected]>
Cc: Krzysztof Kozlowski <[email protected]>
Cc: Laurent Pinchart <[email protected]>
Cc: Luca Ceresoli <[email protected]>
Cc: Lucas Stach <[email protected]>
Cc: Marco Felsch <[email protected]>
Cc: Michael Turquette <[email protected]>
Cc: NXP Linux Team <[email protected]>
Cc: Peng Fan <[email protected]>
Cc: Pengutronix Kernel Team <[email protected]>
Cc: Richard Cochran <[email protected]>
Cc: Rob Herring <[email protected]>
Cc: Sascha Hauer <[email protected]>
Cc: Shawn Guo <[email protected]>
Cc: Stephen Boyd <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
---
V2: No change
V3: - Use devm_platform_ioremap_resource
- Use clk_hw_onecell_data instead of clk_imx8mp_audiomix_priv
- Include mod_devicetable.h for of_device_id struct
- Use struct clk_parent_data instead of string parent_name
V4: - Fix SAI_MCLK_SEL offset as pointed out by Marco
- Add TB from Luca
- Use devm_clk_hw_register_mux_parent_data_table() and drop custom devm_clk_hw_register_mux_parent_data() patch, tweak the indent to be less hideous
- Rebase on next 20230223
V5: Add TB from Adam and Alexander

---
 drivers/clk/imx/Makefile              |   2 +-
 drivers/clk/imx/clk-imx8mp-audiomix.c | 277 ++++++++++++++++++++++++++
 2 files changed, 278 insertions(+), 1 deletion(-)
 create mode 100644 drivers/clk/imx/clk-imx8mp-audiomix.c
drivers/clk/imx/Makefile +1 -1
index a75d59f7cb8a6..ae9d84ef046ba 100644
@@ -27,7 +27,7 @@ obj-$(CONFIG_MXC_CLK) += mxc-clk.o
 
 obj-$(CONFIG_CLK_IMX8MM) += clk-imx8mm.o
 obj-$(CONFIG_CLK_IMX8MN) += clk-imx8mn.o
-obj-$(CONFIG_CLK_IMX8MP) += clk-imx8mp.o
+obj-$(CONFIG_CLK_IMX8MP) += clk-imx8mp.o clk-imx8mp-audiomix.o
 obj-$(CONFIG_CLK_IMX8MQ) += clk-imx8mq.o
 
 obj-$(CONFIG_CLK_IMX93) += clk-imx93.o
drivers/clk/imx/clk-imx8mp-audiomix.c new file +277 -0

277 lines not on this page · raw message

Signature · 1 line
2.39.2
reviewer Reviewed-by on v5 2/5
#2 lore raw

Re: [PATCH v5 2/5] clk: imx: imx8mp: Add audiomix block control

Quoted 10 lines · Marek Vasut

Unlike the other block control IPs in i.MX8M, the audiomix is mostly a series of clock gates and muxes. Model it as a large static table of gates and muxes with one exception, which is the PLL14xx . The PLL14xx SAI PLL has to be registered separately.

#3 lore raw

PATCH v5 3/5 dt-bindings: clock: imx8mp: Add audiomix block control

In reply to Marek Vasut

Unlike the other block control IPs in i.MX8M, the audiomix is mostly a series of clock gates and muxes. Add DT bindings for this IP.

---
Cc: Abel Vesa <[email protected]>
Cc: Alexander Stein <[email protected]>
Cc: Fabio Estevam <[email protected]>
Cc: Jacky Bai <[email protected]>
Cc: Krzysztof Kozlowski <[email protected]>
Cc: Laurent Pinchart <[email protected]>
Cc: Luca Ceresoli <[email protected]>
Cc: Lucas Stach <[email protected]>
Cc: Marco Felsch <[email protected]>
Cc: Michael Turquette <[email protected]>
Cc: NXP Linux Team <[email protected]>
Cc: Peng Fan <[email protected]>
Cc: Pengutronix Kernel Team <[email protected]>
Cc: Richard Cochran <[email protected]>
Cc: Rob Herring <[email protected]>
Cc: Sascha Hauer <[email protected]>
Cc: Shawn Guo <[email protected]>
Cc: Stephen Boyd <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
---
V2: No change
V3: - Add missed RB from Rob from V1
- Rename audio_ahb to plain ahb
V4: - Rebase on next 20230223
V5: Add TB from Adam and Alexander

---
 .../bindings/clock/imx8mp-audiomix.yaml       | 84 +++++++++++++++++++
 1 file changed, 84 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/clock/imx8mp-audiomix.yaml
Documentation/devicetree/bindings/clock/imx8mp-audiomix.yaml new file +84 -0
new file mode 100644
index 0000000000000..01b4e1e311cef
@@ -0,0 +1,84 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/clock/imx8mp-audiomix.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: NXP i.MX8MP AudioMIX Block Control Binding
+
+maintainers:
+  - Marek Vasut <[email protected]>
+
+description: |
+  NXP i.MX8M Plus AudioMIX is dedicated clock muxing and gating IP
+  used to control Audio related clock on the SoC.
+
+properties:
+  compatible:
+    const: fsl,imx8mp-audio-blk-ctrl
+
+  reg:
+    maxItems: 1
+
+  power-domains:
+    maxItems: 1
+
+  power-domain-names:
+    const: audio
+
+  clocks:
+    minItems: 7
+    maxItems: 7
+
+  clock-names:
+    items:
+      - const: ahb
+      - const: sai1
+      - const: sai2
+      - const: sai3
+      - const: sai5
+      - const: sai6
+      - const: sai7
+
+  '#clock-cells':
+    const: 1
+    description:
+      The clock consumer should specify the desired clock by having the clock
+      ID in its "clocks" phandle cell. See include/dt-bindings/clock/imx8mp-clock.h
+      for the full list of i.MX8MP IMX8MP_CLK_AUDIOMIX_ clock IDs.
+
+required:
+  - compatible
+  - reg
+  - power-domains
+  - power-domain-names
+  - clocks
+  - clock-names
+  - '#clock-cells'
+
+additionalProperties: false
+
+examples:
+  # Clock Control Module node:
+  - |
+    #include <dt-bindings/clock/imx8mp-clock.h>
+
+    clock-controller@30e20000 {
+        #clock-cells = <1>;
+        compatible = "fsl,imx8mp-audio-blk-ctrl";
+        clocks = <&clk IMX8MP_CLK_AUDIO_ROOT>,
+                 <&clk IMX8MP_CLK_SAI1>,
+                 <&clk IMX8MP_CLK_SAI2>,
+                 <&clk IMX8MP_CLK_SAI3>,
+                 <&clk IMX8MP_CLK_SAI5>,
+                 <&clk IMX8MP_CLK_SAI6>,
+                 <&clk IMX8MP_CLK_SAI7>;
+        clock-names = "ahb",
+                      "sai1", "sai2", "sai3",
+                      "sai5", "sai6", "sai7";
+        power-domains = <&pgc_audio>;
+        power-domain-names = "audio";
+        reg = <0x30e20000 0x10000>;
+    };
+
+...
Signature · 1 line
2.39.2
reviewer Reviewed-by on v5 3/5
#4 lore raw

Re: [PATCH v5 3/5] dt-bindings: clock: imx8mp: Add audiomix block control

Quoted 8 lines · Marek Vasut

Unlike the other block control IPs in i.MX8M, the audiomix is mostly a series of clock gates and muxes. Add DT bindings for this IP.

#5 lore raw

Re: [PATCH v5 3/5] dt-bindings: clock: imx8mp: Add audiomix block control

In reply to Marek Vasut

Hi Marek,

sorry for the late review on this, please see below.

Quoted 63 lines · Marek Vasut

Unlike the other block control IPs in i.MX8M, the audiomix is mostly a series of clock gates and muxes. Add DT bindings for this IP.

---
Cc: Abel Vesa <[email protected]>
Cc: Alexander Stein <[email protected]>
Cc: Fabio Estevam <[email protected]>
Cc: Jacky Bai <[email protected]>
Cc: Krzysztof Kozlowski <[email protected]>
Cc: Laurent Pinchart <[email protected]>
Cc: Luca Ceresoli <[email protected]>
Cc: Lucas Stach <[email protected]>
Cc: Marco Felsch <[email protected]>
Cc: Michael Turquette <[email protected]>
Cc: NXP Linux Team <[email protected]>
Cc: Peng Fan <[email protected]>
Cc: Pengutronix Kernel Team <[email protected]>
Cc: Richard Cochran <[email protected]>
Cc: Rob Herring <[email protected]>
Cc: Sascha Hauer <[email protected]>
Cc: Shawn Guo <[email protected]>
Cc: Stephen Boyd <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
---
V2: No change
V3: - Add missed RB from Rob from V1
- Rename audio_ahb to plain ahb
V4: - Rebase on next 20230223
V5: Add TB from Adam and Alexander

---
 .../bindings/clock/imx8mp-audiomix.yaml       | 84 +++++++++++++++++++
 1 file changed, 84 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/clock/imx8mp-audiomix.yaml
Documentation/devicetree/bindings/clock/imx8mp-audiomix.yaml new file +17 -0
new file mode 100644
index 0000000000000..01b4e1e311cef
@@ -0,0 +1,84 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/clock/imx8mp-audiomix.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: NXP i.MX8MP AudioMIX Block Control Binding
+
+maintainers:
+  - Marek Vasut <[email protected]>
+
+description: |
+  NXP i.MX8M Plus AudioMIX is dedicated clock muxing and gating IP
+  used to control Audio related clock on the SoC.
+
+properties:
+  compatible:

Documentation/devicetree/bindings/clock/imx8mp-audiomix.yaml line 27

Quoted 10 lines
Documentation/devicetree/bindings/clock/imx8mp-audiomix.yaml new file +10 -0
+    const: fsl,imx8mp-audio-blk-ctrl
+
+  reg:
+    maxItems: 1
+
+  power-domains:
+    maxItems: 1
+
+  power-domain-names:
+    const: audio

Why do we need to specify the name here? We have just one power-domain, so there should be no need to distinguish between them, or do I miss something?

Quoted 17 lines
Documentation/devicetree/bindings/clock/imx8mp-audiomix.yaml new file +17 -0
+
+  clocks:
+    minItems: 7
+    maxItems: 7
+
+  clock-names:
+    items:
+      - const: ahb
+      - const: sai1
+      - const: sai2
+      - const: sai3
+      - const: sai5
+      - const: sai6
+      - const: sai7
+
+  '#clock-cells':
+    const: 1

Documentation/devicetree/bindings/clock/imx8mp-audiomix.yaml line 54

Quoted 10 lines
Documentation/devicetree/bindings/clock/imx8mp-audiomix.yaml new file +10 -0
+    description:
+      The clock consumer should specify the desired clock by having the clock
+      ID in its "clocks" phandle cell. See include/dt-bindings/clock/imx8mp-clock.h
+      for the full list of i.MX8MP IMX8MP_CLK_AUDIOMIX_ clock IDs.
+
+required:
+  - compatible
+  - reg
+  - power-domains
+  - power-domain-names

We can drop the power-domain-names here as well.

Quoted 17 lines
Documentation/devicetree/bindings/clock/imx8mp-audiomix.yaml new file +17 -0
+  - clocks
+  - clock-names
+  - '#clock-cells'
+
+additionalProperties: false
+
+examples:
+  # Clock Control Module node:
+  - |
+    #include <dt-bindings/clock/imx8mp-clock.h>
+
+    clock-controller@30e20000 {
+        #clock-cells = <1>;
+        compatible = "fsl,imx8mp-audio-blk-ctrl";
+        clocks = <&clk IMX8MP_CLK_AUDIO_ROOT>,
+                 <&clk IMX8MP_CLK_SAI1>,
+                 <&clk IMX8MP_CLK_SAI2>,

Documentation/devicetree/bindings/clock/imx8mp-audiomix.yaml line 81

Quoted 10 lines
Documentation/devicetree/bindings/clock/imx8mp-audiomix.yaml new file +10 -0
+                 <&clk IMX8MP_CLK_SAI3>,
+                 <&clk IMX8MP_CLK_SAI5>,
+                 <&clk IMX8MP_CLK_SAI6>,
+                 <&clk IMX8MP_CLK_SAI7>;
+        clock-names = "ahb",
+                      "sai1", "sai2", "sai3",
+                      "sai5", "sai6", "sai7";
+        power-domains = <&pgc_audio>;
+        power-domain-names = "audio";
+        reg = <0x30e20000 0x10000>;

It is common to have have the compatible as the first property followed by the reg property. We should change this here as well as in the 8mp.dtsi patch.

Regards,
Marco

Quoted 7 lines
Documentation/devicetree/bindings/clock/imx8mp-audiomix.yaml new file +3 -0
+    };
+
+...
Signature · 1 line
2.39.2
#6 lore raw

PATCH v5 4/5 arm64: dts: imx8mp: Add SAI, SDMA, AudioMIX

In reply to Marek Vasut

Add all SAI nodes, SDMA2 and SDMA3 nodes, and AudioMIX node. This is needed to get audio operational on i.MX8MP .

---
Cc: Abel Vesa <[email protected]>
Cc: Alexander Stein <[email protected]>
Cc: Fabio Estevam <[email protected]>
Cc: Jacky Bai <[email protected]>
Cc: Krzysztof Kozlowski <[email protected]>
Cc: Laurent Pinchart <[email protected]>
Cc: Luca Ceresoli <[email protected]>
Cc: Lucas Stach <[email protected]>
Cc: Marco Felsch <[email protected]>
Cc: Michael Turquette <[email protected]>
Cc: NXP Linux Team <[email protected]>
Cc: Peng Fan <[email protected]>
Cc: Pengutronix Kernel Team <[email protected]>
Cc: Richard Cochran <[email protected]>
Cc: Rob Herring <[email protected]>
Cc: Sascha Hauer <[email protected]>
Cc: Shawn Guo <[email protected]>
Cc: Stephen Boyd <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
---
V2: - Add AUDIO_AXI clock to audio gpc
- Use IMX8MP_CLK_AUDIOMIX_SDMA2_ROOT for SDMA2 IPG clock
V3: Rename audio_ahb to plain ahb
V4: - Add RB/TB from Luca
- Rebase on next 20230223
V5: - Add TB from Adam and Alexander
- Replace blk-ctrl@ with clock-controller@
- Specify sound-dai-cells in sai nodes

---
 arch/arm64/boot/dts/freescale/imx8mp.dtsi | 159 ++++++++++++++++++++++
 1 file changed, 159 insertions(+)
arch/arm64/boot/dts/freescale/imx8mp.dtsi +159 -0
index 524b4ccfcc553..9d176f3181931 100644
@@ -571,6 +571,13 @@ pgc_usb2_phy: power-domain@3 {
 						reg = <IMX8MP_POWER_DOMAIN_USB2_PHY>;
 					};
 
+					pgc_audio: power-domain@5 {
+						#power-domain-cells = <0>;
+						reg = <IMX8MP_POWER_DOMAIN_AUDIOMIX>;
+						clocks = <&clk IMX8MP_CLK_AUDIO_ROOT>,
+							 <&clk IMX8MP_CLK_AUDIO_AXI>;
+					};
+
 					pgc_gpu2d: power-domain@6 {
 						#power-domain-cells = <0>;
 						reg = <IMX8MP_POWER_DOMAIN_GPU2D>;
@@ -1119,6 +1126,158 @@ opp-1000000000 {
 			};
 		};
 
+		aips5: bus@30c00000 {
+			compatible = "fsl,aips-bus", "simple-bus";
+			reg = <0x30c00000 0x400000>;
+			#address-cells = <1>;
+			#size-cells = <1>;
+			ranges;
+
+			spba-bus@30c00000 {
+				compatible = "fsl,spba-bus", "simple-bus";
+				reg = <0x30c00000 0x100000>;
+				#address-cells = <1>;
+				#size-cells = <1>;
+				ranges;
+
+				sai1: sai@30c10000 {
+					#sound-dai-cells = <0>;
+					compatible = "fsl,imx8mp-sai", "fsl,imx8mq-sai";
+					reg = <0x30c10000 0x10000>;
+					interrupts = <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>;
+					clocks = <&audio_blk_ctrl IMX8MP_CLK_AUDIOMIX_SAI1_IPG>,
+						 <&clk IMX8MP_CLK_DUMMY>,
+						 <&audio_blk_ctrl IMX8MP_CLK_AUDIOMIX_SAI1_MCLK1>,
+						 <&audio_blk_ctrl IMX8MP_CLK_AUDIOMIX_SAI1_MCLK2>,
+						 <&audio_blk_ctrl IMX8MP_CLK_AUDIOMIX_SAI1_MCLK3>;
+					clock-names = "bus", "mclk0", "mclk1", "mclk2", "mclk3";
+					dmas = <&sdma2 0 2 0>, <&sdma2 1 2 0>;
+					dma-names = "rx", "tx";
+					status = "disabled";
+				};
+
+				sai2: sai@30c20000 {
+					#sound-dai-cells = <0>;
+					compatible = "fsl,imx8mp-sai", "fsl,imx8mq-sai";
+					reg = <0x30c20000 0x10000>;
+					interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;
+					clocks = <&audio_blk_ctrl IMX8MP_CLK_AUDIOMIX_SAI2_IPG>,
+						 <&clk IMX8MP_CLK_DUMMY>,
+						 <&audio_blk_ctrl IMX8MP_CLK_AUDIOMIX_SAI2_MCLK1>,
+						 <&audio_blk_ctrl IMX8MP_CLK_AUDIOMIX_SAI2_MCLK2>,
+						 <&audio_blk_ctrl IMX8MP_CLK_AUDIOMIX_SAI2_MCLK3>;
+					clock-names = "bus", "mclk0", "mclk1", "mclk2", "mclk3";
+					dmas = <&sdma2 2 2 0>, <&sdma2 3 2 0>;
+					dma-names = "rx", "tx";
+					status = "disabled";
+				};
+
+				sai3: sai@30c30000 {
+					#sound-dai-cells = <0>;
+					compatible = "fsl,imx8mp-sai", "fsl,imx8mq-sai";
+					reg = <0x30c30000 0x10000>;
+					interrupts = <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>;
+					clocks = <&audio_blk_ctrl IMX8MP_CLK_AUDIOMIX_SAI3_IPG>,
+						 <&clk IMX8MP_CLK_DUMMY>,
+						 <&audio_blk_ctrl IMX8MP_CLK_AUDIOMIX_SAI3_MCLK1>,
+						 <&audio_blk_ctrl IMX8MP_CLK_AUDIOMIX_SAI3_MCLK2>,
+						 <&audio_blk_ctrl IMX8MP_CLK_AUDIOMIX_SAI3_MCLK3>;
+					clock-names = "bus", "mclk0", "mclk1", "mclk2", "mclk3";
+					dmas = <&sdma2 4 2 0>, <&sdma2 5 2 0>;
+					dma-names = "rx", "tx";
+					status = "disabled";
+				};
+
+				sai5: sai@30c50000 {
+					#sound-dai-cells = <0>;
+					compatible = "fsl,imx8mp-sai", "fsl,imx8mq-sai";
+					reg = <0x30c50000 0x10000>;
+					interrupts = <GIC_SPI 90 IRQ_TYPE_LEVEL_HIGH>;
+					clocks = <&audio_blk_ctrl IMX8MP_CLK_AUDIOMIX_SAI5_IPG>,
+						 <&clk IMX8MP_CLK_DUMMY>,
+						 <&audio_blk_ctrl IMX8MP_CLK_AUDIOMIX_SAI5_MCLK1>,
+						 <&audio_blk_ctrl IMX8MP_CLK_AUDIOMIX_SAI5_MCLK2>,
+						 <&audio_blk_ctrl IMX8MP_CLK_AUDIOMIX_SAI5_MCLK3>;
+					clock-names = "bus", "mclk0", "mclk1", "mclk2", "mclk3";
+					dmas = <&sdma2 8 2 0>, <&sdma2 9 2 0>;
+					dma-names = "rx", "tx";
+					status = "disabled";
+				};
+
+				sai6: sai@30c60000 {
+					#sound-dai-cells = <0>;
+					compatible = "fsl,imx8mp-sai", "fsl,imx8mq-sai";
+					reg = <0x30c60000 0x10000>;
+					interrupts = <GIC_SPI 90 IRQ_TYPE_LEVEL_HIGH>;
+					clocks = <&audio_blk_ctrl IMX8MP_CLK_AUDIOMIX_SAI6_IPG>,
+						 <&clk IMX8MP_CLK_DUMMY>,
+						 <&audio_blk_ctrl IMX8MP_CLK_AUDIOMIX_SAI6_MCLK1>,
+						 <&audio_blk_ctrl IMX8MP_CLK_AUDIOMIX_SAI6_MCLK2>,
+						 <&audio_blk_ctrl IMX8MP_CLK_AUDIOMIX_SAI6_MCLK3>;
+					clock-names = "bus", "mclk0", "mclk1", "mclk2", "mclk3";
+					dmas = <&sdma2 10 2 0>, <&sdma2 11 2 0>;
+					dma-names = "rx", "tx";
+					status = "disabled";
+				};
+
+				sai7: sai@30c80000 {
+					#sound-dai-cells = <0>;
+					compatible = "fsl,imx8mp-sai", "fsl,imx8mq-sai";
+					reg = <0x30c80000 0x10000>;
+					interrupts = <GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH>;
+					clocks = <&audio_blk_ctrl IMX8MP_CLK_AUDIOMIX_SAI7_IPG>,
+						 <&clk IMX8MP_CLK_DUMMY>,
+						 <&audio_blk_ctrl IMX8MP_CLK_AUDIOMIX_SAI7_MCLK1>,
+						 <&audio_blk_ctrl IMX8MP_CLK_AUDIOMIX_SAI7_MCLK2>,
+						 <&audio_blk_ctrl IMX8MP_CLK_AUDIOMIX_SAI7_MCLK3>;
+					clock-names = "bus", "mclk0", "mclk1", "mclk2", "mclk3";
+					dmas = <&sdma2 12 2 0>, <&sdma2 13 2 0>;
+					dma-names = "rx", "tx";
+					status = "disabled";
+				};
+			};
+
+			sdma3: dma-controller@30e00000 {
+				compatible = "fsl,imx8mp-sdma", "fsl,imx8mq-sdma";
+				reg = <0x30e00000 0x10000>;
+				interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;
+				clocks = <&audio_blk_ctrl IMX8MP_CLK_AUDIOMIX_SDMA3_ROOT>,
+					 <&clk IMX8MP_CLK_AUDIO_ROOT>;
+				clock-names = "ipg", "ahb";
+				#dma-cells = <3>;
+				fsl,sdma-ram-script-name = "imx/sdma/sdma-imx7d.bin";
+			};
+
+			sdma2: dma-controller@30e10000 {
+				compatible = "fsl,imx8mp-sdma", "fsl,imx8mq-sdma";
+				reg = <0x30e10000 0x10000>;
+				interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>;
+				clocks = <&audio_blk_ctrl IMX8MP_CLK_AUDIOMIX_SDMA2_ROOT>,
+					 <&clk IMX8MP_CLK_AUDIO_ROOT>;
+				clock-names = "ipg", "ahb";
+				#dma-cells = <3>;
+				fsl,sdma-ram-script-name = "imx/sdma/sdma-imx7d.bin";
+			};
+
+			audio_blk_ctrl: clock-controller@30e20000 {
+				#clock-cells = <1>;
+				compatible = "fsl,imx8mp-audio-blk-ctrl";
+				clocks = <&clk IMX8MP_CLK_AUDIO_ROOT>,
+					 <&clk IMX8MP_CLK_SAI1>,
+					 <&clk IMX8MP_CLK_SAI2>,
+					 <&clk IMX8MP_CLK_SAI3>,
+					 <&clk IMX8MP_CLK_SAI5>,
+					 <&clk IMX8MP_CLK_SAI6>,
+					 <&clk IMX8MP_CLK_SAI7>;
+				clock-names = "ahb",
+					      "sai1", "sai2", "sai3",
+					      "sai5", "sai6", "sai7";
+				power-domains = <&pgc_audio>;
+				power-domain-names = "audio";
+				reg = <0x30e20000 0x10000>;
+			};
+		};
+
 		aips4: bus@32c00000 {
 			compatible = "fsl,aips-bus", "simple-bus";
 			reg = <0x32c00000 0x400000>;
Signature · 1 line
2.39.2
reviewer Reviewed-by on v5 4/5
#7 lore raw

Re: [PATCH v5 4/5] arm64: dts: imx8mp: Add SAI, SDMA, AudioMIX

Quoted 9 lines · Marek Vasut

Add all SAI nodes, SDMA2 and SDMA3 nodes, and AudioMIX node. This is needed to get audio operational on i.MX8MP .

#8 lore raw

PATCH v5 5/5 arm64: dts: imx8mp: Add analog audio output on i.MX8MP EVK

In reply to Marek Vasut

Enable SAI3 on i.MX8MP EVK, add WM8960 codec binding and regulator. This is all that is needed to get analog audio output operational on i.MX8MP EVK.

---
Cc: Abel Vesa <[email protected]>
Cc: Alexander Stein <[email protected]>
Cc: Fabio Estevam <[email protected]>
Cc: Jacky Bai <[email protected]>
Cc: Krzysztof Kozlowski <[email protected]>
Cc: Laurent Pinchart <[email protected]>
Cc: Luca Ceresoli <[email protected]>
Cc: Lucas Stach <[email protected]>
Cc: Marco Felsch <[email protected]>
Cc: Michael Turquette <[email protected]>
Cc: NXP Linux Team <[email protected]>
Cc: Peng Fan <[email protected]>
Cc: Pengutronix Kernel Team <[email protected]>
Cc: Richard Cochran <[email protected]>
Cc: Rob Herring <[email protected]>
Cc: Sascha Hauer <[email protected]>
Cc: Shawn Guo <[email protected]>
Cc: Stephen Boyd <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
---
V2: No change
V3: No change
V4: - Update codec node name and phandle label
- Use just sound for the sound node name
- Rebase on next 20230223
V5: - Drop regulator-always-on from codec regulator
- Add RB from Fabio
- TB by Alexander added and removed again, since the patch was reworked
- Switch to simple-audio-card
- Add sound-dai-cells to codec node

---
 arch/arm64/boot/dts/freescale/imx8mp-evk.dts | 74 ++++++++++++++++++++
 1 file changed, 74 insertions(+)
arch/arm64/boot/dts/freescale/imx8mp-evk.dts +74 -0
index 7816853162b3f..f2285ed9f70b1 100644
@@ -40,6 +40,15 @@ pcie0_refclk: pcie0-refclk {
 		clock-frequency = <100000000>;
 	};
 
+	reg_audio_pwr: regulator-audio-pwr {
+		compatible = "regulator-fixed";
+		regulator-name = "audio-pwr";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		gpio = <&gpio4 29 GPIO_ACTIVE_HIGH>;
+		enable-active-high;
+	};
+
 	reg_can1_stby: regulator-can1-stby {
 		compatible = "regulator-fixed";
 		regulator-name = "can1-stby";
@@ -83,6 +92,37 @@ reg_usdhc2_vmmc: regulator-usdhc2 {
 		gpio = <&gpio2 19 GPIO_ACTIVE_HIGH>;
 		enable-active-high;
 	};
+
+	sound {
+		compatible = "simple-audio-card";
+		simple-audio-card,name = "wm8960-audio";
+		simple-audio-card,format = "i2s";
+		simple-audio-card,frame-master = <&cpudai>;
+		simple-audio-card,bitclock-master = <&cpudai>;
+		simple-audio-card,widgets =
+			"Headphone", "Headphone Jack",
+			"Speaker", "External Speaker",
+			"Microphone", "Mic Jack";
+		simple-audio-card,routing =
+			"Headphone Jack", "HP_L",
+			"Headphone Jack", "HP_R",
+			"External Speaker", "SPK_LP",
+			"External Speaker", "SPK_LN",
+			"External Speaker", "SPK_RP",
+			"External Speaker", "SPK_RN",
+			"LINPUT1", "Mic Jack",
+			"LINPUT3", "Mic Jack",
+			"Mic Jack", "MICB";
+
+		cpudai: simple-audio-card,cpu {
+			sound-dai = <&sai3>;
+		};
+
+		simple-audio-card,codec {
+			sound-dai = <&wm8960>;
+		};
+
+	};
 };
 
 &flexspi {
@@ -344,6 +384,18 @@ &i2c3 {
 	pinctrl-0 = <&pinctrl_i2c3>;
 	status = "okay";
 
+	wm8960: codec@1a {
+		#sound-dai-cells = <0>;
+		compatible = "wlf,wm8960";
+		reg = <0x1a>;
+		clocks = <&audio_blk_ctrl IMX8MP_CLK_AUDIOMIX_SAI3_MCLK1>;
+		clock-names = "mclk";
+		wlf,shared-lrclk;
+		wlf,hp-cfg = <3 2 3>;
+		wlf,gpio-cfg = <1 3>;
+		SPKVDD1-supply = <&reg_audio_pwr>;
+	};
+
 	pca6416: gpio@20 {
 		compatible = "ti,tca6416";
 		reg = <0x20>;
@@ -422,6 +474,16 @@ &pwm4 {
 	status = "okay";
 };
 
+&sai3 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_sai3>;
+	assigned-clocks = <&clk IMX8MP_CLK_SAI3>;
+	assigned-clock-parents = <&clk IMX8MP_AUDIO_PLL1_OUT>;
+	assigned-clock-rates = <12288000>;
+	fsl,sai-mclk-direction-output;
+	status = "okay";
+};
+
 &snvs_pwrkey {
 	status = "okay";
 };
@@ -668,6 +730,18 @@ MX8MP_IOMUXC_UART3_TXD__UART1_DCE_RTS	0x140
 		>;
 	};
 
+	pinctrl_sai3: sai3grp {
+		fsl,pins = <
+			MX8MP_IOMUXC_SAI3_TXFS__AUDIOMIX_SAI3_TX_SYNC	0xd6
+			MX8MP_IOMUXC_SAI3_TXC__AUDIOMIX_SAI3_TX_BCLK	0xd6
+			MX8MP_IOMUXC_SAI3_RXD__AUDIOMIX_SAI3_RX_DATA00	0xd6
+			MX8MP_IOMUXC_SAI3_TXD__AUDIOMIX_SAI3_TX_DATA00	0xd6
+			MX8MP_IOMUXC_SAI3_MCLK__AUDIOMIX_SAI3_MCLK	0xd6
+			MX8MP_IOMUXC_SAI3_RXFS__GPIO4_IO28		0xd6
+			MX8MP_IOMUXC_SAI3_RXC__GPIO4_IO29		0xd6
+		>;
+	};
+
 	pinctrl_uart2: uart2grp {
 		fsl,pins = <
 			MX8MP_IOMUXC_UART2_RXD__UART2_DCE_RX	0x140
Signature · 1 line
2.39.2
#9 lore raw

Re: [PATCH v5 5/5] arm64: dts: imx8mp: Add analog audio output on i.MX8MP EVK

Hi Marek,

thanks for switching to simple-audio-card :)

Quoted 48 lines · Marek Vasut

Enable SAI3 on i.MX8MP EVK, add WM8960 codec binding and regulator. This is all that is needed to get analog audio output operational on i.MX8MP EVK.

---
Cc: Abel Vesa <[email protected]>
Cc: Alexander Stein <[email protected]>
Cc: Fabio Estevam <[email protected]>
Cc: Jacky Bai <[email protected]>
Cc: Krzysztof Kozlowski <[email protected]>
Cc: Laurent Pinchart <[email protected]>
Cc: Luca Ceresoli <[email protected]>
Cc: Lucas Stach <[email protected]>
Cc: Marco Felsch <[email protected]>
Cc: Michael Turquette <[email protected]>
Cc: NXP Linux Team <[email protected]>
Cc: Peng Fan <[email protected]>
Cc: Pengutronix Kernel Team <[email protected]>
Cc: Richard Cochran <[email protected]>
Cc: Rob Herring <[email protected]>
Cc: Sascha Hauer <[email protected]>
Cc: Shawn Guo <[email protected]>
Cc: Stephen Boyd <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
---
V2: No change
V3: No change
V4: - Update codec node name and phandle label
- Use just sound for the sound node name
- Rebase on next 20230223
V5: - Drop regulator-always-on from codec regulator
- Add RB from Fabio
- TB by Alexander added and removed again, since the patch was reworked
- Switch to simple-audio-card
- Add sound-dai-cells to codec node

---
 arch/arm64/boot/dts/freescale/imx8mp-evk.dts | 74 ++++++++++++++++++++
 1 file changed, 74 insertions(+)
arch/arm64/boot/dts/freescale/imx8mp-evk.dts +0 -0
index 7816853162b3f..f2285ed9f70b1 100644

arch/arm64/boot/dts/freescale/imx8mp-evk.dts pcie0_refclk: pcie0-refclk { · line 49

Quoted 10 lines
arch/arm64/boot/dts/freescale/imx8mp-evk.dts +7 -0
@@ -40,6 +40,15 @@ pcie0_refclk: pcie0-refclk {
 		clock-frequency = <100000000>;
 	};
 
+	reg_audio_pwr: regulator-audio-pwr {
+		compatible = "regulator-fixed";
+		regulator-name = "audio-pwr";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		gpio = <&gpio4 29 GPIO_ACTIVE_HIGH>;
+		enable-active-high;

We should have a proper pinctrl setup for the regulator device.

Quoted 44 lines
arch/arm64/boot/dts/freescale/imx8mp-evk.dts +33 -0
+	};
+
 	reg_can1_stby: regulator-can1-stby {
 		compatible = "regulator-fixed";
 		regulator-name = "can1-stby";
@@ -83,6 +92,37 @@ reg_usdhc2_vmmc: regulator-usdhc2 {
 		gpio = <&gpio2 19 GPIO_ACTIVE_HIGH>;
 		enable-active-high;
 	};
+
+	sound {
+		compatible = "simple-audio-card";
+		simple-audio-card,name = "wm8960-audio";
+		simple-audio-card,format = "i2s";
+		simple-audio-card,frame-master = <&cpudai>;
+		simple-audio-card,bitclock-master = <&cpudai>;
+		simple-audio-card,widgets =
+			"Headphone", "Headphone Jack",
+			"Speaker", "External Speaker",
+			"Microphone", "Mic Jack";
+		simple-audio-card,routing =
+			"Headphone Jack", "HP_L",
+			"Headphone Jack", "HP_R",
+			"External Speaker", "SPK_LP",
+			"External Speaker", "SPK_LN",
+			"External Speaker", "SPK_RP",
+			"External Speaker", "SPK_RN",
+			"LINPUT1", "Mic Jack",
+			"LINPUT3", "Mic Jack",
+			"Mic Jack", "MICB";
+
+		cpudai: simple-audio-card,cpu {
+			sound-dai = <&sai3>;
+		};
+
+		simple-audio-card,codec {
+			sound-dai = <&wm8960>;
+		};
+
+	};
 };
 
 &flexspi {

arch/arm64/boot/dts/freescale/imx8mp-evk.dts &i2c3 { · line 390

Quoted 7 lines
arch/arm64/boot/dts/freescale/imx8mp-evk.dts +4 -0
@@ -344,6 +384,18 @@ &i2c3 {
 	pinctrl-0 = <&pinctrl_i2c3>;
 	status = "okay";
 
+	wm8960: codec@1a {
+		#sound-dai-cells = <0>;
+		compatible = "wlf,wm8960";
+		reg = <0x1a>;

The compatible should be the first property followed by the reg property.

Quoted 30 lines
arch/arm64/boot/dts/freescale/imx8mp-evk.dts +18 -0
+		clocks = <&audio_blk_ctrl IMX8MP_CLK_AUDIOMIX_SAI3_MCLK1>;
+		clock-names = "mclk";
+		wlf,shared-lrclk;
+		wlf,hp-cfg = <3 2 3>;
+		wlf,gpio-cfg = <1 3>;
+		SPKVDD1-supply = <&reg_audio_pwr>;
+	};
+
 	pca6416: gpio@20 {
 		compatible = "ti,tca6416";
 		reg = <0x20>;
@@ -422,6 +474,16 @@ &pwm4 {
 	status = "okay";
 };
 
+&sai3 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_sai3>;
+	assigned-clocks = <&clk IMX8MP_CLK_SAI3>;
+	assigned-clock-parents = <&clk IMX8MP_AUDIO_PLL1_OUT>;
+	assigned-clock-rates = <12288000>;
+	fsl,sai-mclk-direction-output;
+	status = "okay";
+};
+
 &snvs_pwrkey {
 	status = "okay";
 };
@@ -668,6 +730,18 @@ MX8MP_IOMUXC_UART3_TXD__UART1_DCE_RTS	0x140
 		>;

arch/arm64/boot/dts/freescale/imx8mp-evk.dts MX8MP_IOMUXC_UART3_TXD__UART1_DCE_RTS 0x140 · line 740

Quoted 10 lines
arch/arm64/boot/dts/freescale/imx8mp-evk.dts +8 -0
 	};
 
+	pinctrl_sai3: sai3grp {
+		fsl,pins = <
+			MX8MP_IOMUXC_SAI3_TXFS__AUDIOMIX_SAI3_TX_SYNC	0xd6
+			MX8MP_IOMUXC_SAI3_TXC__AUDIOMIX_SAI3_TX_BCLK	0xd6
+			MX8MP_IOMUXC_SAI3_RXD__AUDIOMIX_SAI3_RX_DATA00	0xd6
+			MX8MP_IOMUXC_SAI3_TXD__AUDIOMIX_SAI3_TX_DATA00	0xd6
+			MX8MP_IOMUXC_SAI3_MCLK__AUDIOMIX_SAI3_MCLK	0xd6
+			MX8MP_IOMUXC_SAI3_RXFS__GPIO4_IO28		0xd6

What is gpio04-io28 used for?

arch/arm64/boot/dts/freescale/imx8mp-evk.dts MX8MP_IOMUXC_UART3_TXD__UART1_DCE_RTS 0x140 · line 743

Quoted 3 lines
arch/arm64/boot/dts/freescale/imx8mp-evk.dts +3 -0
+			MX8MP_IOMUXC_SAI3_RXC__GPIO4_IO29		0xd6
+		>;
+	};

Regards,
Marco

#10 lore raw

Re: [PATCH v5 5/5] arm64: dts: imx8mp: Add analog audio output on i.MX8MP EVK

On 2/27/23 19:59, Marco Felsch wrote:
[...]

Quoted 11 lines

arch/arm64/boot/dts/freescale/imx8mp-evk.dts &i2c3 { · line 390

Quoted 8 lines
arch/arm64/boot/dts/freescale/imx8mp-evk.dts +4 -0
@@ -344,6 +384,18 @@ &i2c3 {
  	pinctrl-0 = <&pinctrl_i2c3>;
  	status = "okay";
 
+	wm8960: codec@1a {
+		#sound-dai-cells = <0>;
+		compatible = "wlf,wm8960";
+		reg = <0x1a>;

The compatible should be the first property followed by the reg property.

See my reply to the mx8mn sound-sai-cells patch , I am not sure here. The rest is fixed in V6.

Quoted 11 lines
Quoted 11 lines
arch/arm64/boot/dts/freescale/imx8mp-evk.dts +8 -0
+		clocks = <&audio_blk_ctrl IMX8MP_CLK_AUDIOMIX_SAI3_MCLK1>;
+		clock-names = "mclk";
+		wlf,shared-lrclk;
+		wlf,hp-cfg = <3 2 3>;
+		wlf,gpio-cfg = <1 3>;
+		SPKVDD1-supply = <&reg_audio_pwr>;
+	};
+
  	pca6416: gpio@20 {
  		compatible = "ti,tca6416";
  		reg = <0x20>;

[...]

Quoted 4 lines
Quoted 4 lines
(quoted diff) +0 -0
@@ -668,6 +730,18 @@ MX8MP_IOMUXC_UART3_TXD__UART1_DCE_RTS	0x140
  		>;
  	};
 
Quoted 10 lines

arch/arm64/boot/dts/freescale/imx8mp-evk.dts MX8MP_IOMUXC_UART3_TXD__UART1_DCE_RTS 0x140 · line 740

Quoted 8 lines
arch/arm64/boot/dts/freescale/imx8mp-evk.dts +8 -0
+	pinctrl_sai3: sai3grp {
+		fsl,pins = <
+			MX8MP_IOMUXC_SAI3_TXFS__AUDIOMIX_SAI3_TX_SYNC	0xd6
+			MX8MP_IOMUXC_SAI3_TXC__AUDIOMIX_SAI3_TX_BCLK	0xd6
+			MX8MP_IOMUXC_SAI3_RXD__AUDIOMIX_SAI3_RX_DATA00	0xd6
+			MX8MP_IOMUXC_SAI3_TXD__AUDIOMIX_SAI3_TX_DATA00	0xd6
+			MX8MP_IOMUXC_SAI3_MCLK__AUDIOMIX_SAI3_MCLK	0xd6
+			MX8MP_IOMUXC_SAI3_RXFS__GPIO4_IO28		0xd6

What is gpio04-io28 used for?

Apparently unused, dropped.

#11 lore raw

Re: [PATCH v5 5/5] arm64: dts: imx8mp: Add analog audio output on i.MX8MP EVK

Quoted 48 lines · Marek Vasut

On 2/27/23 19:59, Marco Felsch wrote:
[...]

Quoted 11 lines

arch/arm64/boot/dts/freescale/imx8mp-evk.dts &i2c3 { · line 390

Quoted 8 lines
arch/arm64/boot/dts/freescale/imx8mp-evk.dts +4 -0
@@ -344,6 +384,18 @@ &i2c3 {
     pinctrl-0 = <&pinctrl_i2c3>;
     status = "okay";
 
+    wm8960: codec@1a {
+            #sound-dai-cells = <0>;
+            compatible = "wlf,wm8960";
+            reg = <0x1a>;

The compatible should be the first property followed by the reg property.

See my reply to the mx8mn sound-sai-cells patch , I am not sure here. The rest is fixed in V6.

Quoted 11 lines
Quoted 11 lines
arch/arm64/boot/dts/freescale/imx8mp-evk.dts +8 -0
+            clocks = <&audio_blk_ctrl IMX8MP_CLK_AUDIOMIX_SAI3_MCLK1>;
+            clock-names = "mclk";
+            wlf,shared-lrclk;
+            wlf,hp-cfg = <3 2 3>;
+            wlf,gpio-cfg = <1 3>;
+            SPKVDD1-supply = <&reg_audio_pwr>;
+    };
+
     pca6416: gpio@20 {
             compatible = "ti,tca6416";
             reg = <0x20>;

[...]

Quoted 4 lines
Quoted 4 lines
(quoted diff) +0 -0
@@ -668,6 +730,18 @@ MX8MP_IOMUXC_UART3_TXD__UART1_DCE_RTS   0x140
             >;
     };
 
Quoted 10 lines

arch/arm64/boot/dts/freescale/imx8mp-evk.dts MX8MP_IOMUXC_UART3_TXD__UART1_DCE_RTS 0x140 · line 740

Quoted 8 lines
arch/arm64/boot/dts/freescale/imx8mp-evk.dts +8 -0
+    pinctrl_sai3: sai3grp {
+            fsl,pins = <
+                    MX8MP_IOMUXC_SAI3_TXFS__AUDIOMIX_SAI3_TX_SYNC   0xd6
+                    MX8MP_IOMUXC_SAI3_TXC__AUDIOMIX_SAI3_TX_BCLK    0xd6
+                    MX8MP_IOMUXC_SAI3_RXD__AUDIOMIX_SAI3_RX_DATA00  0xd6
+                    MX8MP_IOMUXC_SAI3_TXD__AUDIOMIX_SAI3_TX_DATA00  0xd6
+                    MX8MP_IOMUXC_SAI3_MCLK__AUDIOMIX_SAI3_MCLK      0xd6
+                    MX8MP_IOMUXC_SAI3_RXFS__GPIO4_IO28              0xd6

What is gpio04-io28 used for?

Quoted 1 line

Apparently unused, dropped.

Isn't that the headphone detect GPIO?

I think simple-audio-card,hp-det-gpio can reference it.

adam

#12 lore raw

Re: [PATCH v5 5/5] arm64: dts: imx8mp: Add analog audio output on i.MX8MP EVK

Quoted 49 lines · Adam Ford
Quoted 48 lines · Marek Vasut

On 2/27/23 19:59, Marco Felsch wrote:
[...]

Quoted 11 lines

arch/arm64/boot/dts/freescale/imx8mp-evk.dts &i2c3 { · line 390

Quoted 8 lines
arch/arm64/boot/dts/freescale/imx8mp-evk.dts +4 -0
@@ -344,6 +384,18 @@ &i2c3 {
      pinctrl-0 = <&pinctrl_i2c3>;
      status = "okay";
 
+    wm8960: codec@1a {
+            #sound-dai-cells = <0>;
+            compatible = "wlf,wm8960";
+            reg = <0x1a>;

The compatible should be the first property followed by the reg property.

See my reply to the mx8mn sound-sai-cells patch , I am not sure here. The rest is fixed in V6.

Quoted 11 lines
Quoted 11 lines
arch/arm64/boot/dts/freescale/imx8mp-evk.dts +8 -0
+            clocks = <&audio_blk_ctrl IMX8MP_CLK_AUDIOMIX_SAI3_MCLK1>;
+            clock-names = "mclk";
+            wlf,shared-lrclk;
+            wlf,hp-cfg = <3 2 3>;
+            wlf,gpio-cfg = <1 3>;
+            SPKVDD1-supply = <&reg_audio_pwr>;
+    };
+
      pca6416: gpio@20 {
              compatible = "ti,tca6416";
              reg = <0x20>;

[...]

Quoted 14 lines

arch/arm64/boot/dts/freescale/imx8mp-evk.dts MX8MP_IOMUXC_UART3_TXD__UART1_DCE_RTS 0x140 · line 740

Quoted 12 lines
arch/arm64/boot/dts/freescale/imx8mp-evk.dts +8 -0
@@ -668,6 +730,18 @@ MX8MP_IOMUXC_UART3_TXD__UART1_DCE_RTS   0x140
              >;
      };
 
+    pinctrl_sai3: sai3grp {
+            fsl,pins = <
+                    MX8MP_IOMUXC_SAI3_TXFS__AUDIOMIX_SAI3_TX_SYNC   0xd6
+                    MX8MP_IOMUXC_SAI3_TXC__AUDIOMIX_SAI3_TX_BCLK    0xd6
+                    MX8MP_IOMUXC_SAI3_RXD__AUDIOMIX_SAI3_RX_DATA00  0xd6
+                    MX8MP_IOMUXC_SAI3_TXD__AUDIOMIX_SAI3_TX_DATA00  0xd6
+                    MX8MP_IOMUXC_SAI3_MCLK__AUDIOMIX_SAI3_MCLK      0xd6
+                    MX8MP_IOMUXC_SAI3_RXFS__GPIO4_IO28              0xd6

What is gpio04-io28 used for?

Quoted 5 lines
Quoted 1 line

Apparently unused, dropped.

Isn't that the headphone detect GPIO?

I think simple-audio-card,hp-det-gpio can reference it.

Per the schematics of the MX8MP EVK, the pin is not connected on the board-to-board connector EVK side, right ?

#13 lore raw

Re: [PATCH v5 5/5] arm64: dts: imx8mp: Add analog audio output on i.MX8MP EVK

Quoted 57 lines · Marek Vasut
Quoted 56 lines · Adam Ford
Quoted 55 lines · Marek Vasut

On 2/27/23 19:59, Marco Felsch wrote:
[...]

Quoted 11 lines

arch/arm64/boot/dts/freescale/imx8mp-evk.dts &i2c3 { · line 390

Quoted 8 lines
arch/arm64/boot/dts/freescale/imx8mp-evk.dts +4 -0
@@ -344,6 +384,18 @@ &i2c3 {
       pinctrl-0 = <&pinctrl_i2c3>;
       status = "okay";
 
+    wm8960: codec@1a {
+            #sound-dai-cells = <0>;
+            compatible = "wlf,wm8960";
+            reg = <0x1a>;

The compatible should be the first property followed by the reg property.

See my reply to the mx8mn sound-sai-cells patch , I am not sure here. The rest is fixed in V6.

Quoted 12 lines
Quoted 12 lines
arch/arm64/boot/dts/freescale/imx8mp-evk.dts +8 -0
+            clocks = <&audio_blk_ctrl 
 IMX8MP_CLK_AUDIOMIX_SAI3_MCLK1>;
+            clock-names = "mclk";
+            wlf,shared-lrclk;
+            wlf,hp-cfg = <3 2 3>;
+            wlf,gpio-cfg = <1 3>;
+            SPKVDD1-supply = <&reg_audio_pwr>;
+    };
+
       pca6416: gpio@20 {
               compatible = "ti,tca6416";

              reg = <0x20>;

[...]

Quoted 20 lines
Quoted 10 lines
arch/arm64/boot/dts/freescale/imx8mp-evk.dts +3 -0
@@ -668,6 +730,18 @@ MX8MP_IOMUXC_UART3_TXD__UART1_DCE_RTS   0x140
               >;
       };
 
+    pinctrl_sai3: sai3grp {
+            fsl,pins = <
+                    

MX8MP_IOMUXC_SAI3_TXFS__AUDIOMIX_SAI3_TX_SYNC   0xd6 + MX8MP_IOMUXC_SAI3_TXC__AUDIOMIX_SAI3_TX_BCLK    0xd6

Quoted 8 lines

+ MX8MP_IOMUXC_SAI3_RXD__AUDIOMIX_SAI3_RX_DATA00  0xd6 + MX8MP_IOMUXC_SAI3_TXD__AUDIOMIX_SAI3_TX_DATA00  0xd6 +
MX8MP_IOMUXC_SAI3_MCLK__AUDIOMIX_SAI3_MCLK      0xd6 +
MX8MP_IOMUXC_SAI3_RXFS__GPIO4_IO28              0xd6

What is gpio04-io28 used for?

Quoted 7 lines
Quoted 5 lines
Quoted 1 line

Apparently unused, dropped.

Isn't that the headphone detect GPIO?

I think simple-audio-card,hp-det-gpio can reference it.

Per the schematics of the MX8MP EVK, the pin is not connected on the board-to-board connector EVK side, right ?

Er, correction, that's AUD_NINT, which is WM8960 GPIO1 .

#14 lore raw

Re: [PATCH v5 5/5] arm64: dts: imx8mp: Add analog audio output on i.MX8MP EVK

Quoted 61 lines · Marek Vasut
Quoted 59 lines · Marek Vasut
Quoted 58 lines · Adam Ford
Quoted 56 lines · Marek Vasut

On 2/27/23 19:59, Marco Felsch wrote:
[...]

Quoted 11 lines

arch/arm64/boot/dts/freescale/imx8mp-evk.dts &i2c3 { · line 390

Quoted 8 lines
arch/arm64/boot/dts/freescale/imx8mp-evk.dts +4 -0
@@ -344,6 +384,18 @@ &i2c3 {
      pinctrl-0 = <&pinctrl_i2c3>;
      status = "okay";
 
+    wm8960: codec@1a {
+            #sound-dai-cells = <0>;
+            compatible = "wlf,wm8960";
+            reg = <0x1a>;

The compatible should be the first property followed by the reg property.

See my reply to the mx8mn sound-sai-cells patch , I am not sure here. The rest is fixed in V6.

Quoted 12 lines
Quoted 12 lines
arch/arm64/boot/dts/freescale/imx8mp-evk.dts +8 -0
+            clocks = <&audio_blk_ctrl
 IMX8MP_CLK_AUDIOMIX_SAI3_MCLK1>;
+            clock-names = "mclk";
+            wlf,shared-lrclk;
+            wlf,hp-cfg = <3 2 3>;
+            wlf,gpio-cfg = <1 3>;
+            SPKVDD1-supply = <&reg_audio_pwr>;
+    };
+
      pca6416: gpio@20 {
              compatible = "ti,tca6416";
              reg = <0x20>;

[...]

Quoted 4 lines
Quoted 4 lines
(quoted diff) +0 -0
@@ -668,6 +730,18 @@ MX8MP_IOMUXC_UART3_TXD__UART1_DCE_RTS   0x140
              >;
      };
 
Quoted 16 lines
Quoted 6 lines
arch/arm64/boot/dts/freescale/imx8mp-evk.dts +3 -0
+    pinctrl_sai3: sai3grp {
+            fsl,pins = <
+

MX8MP_IOMUXC_SAI3_TXFS__AUDIOMIX_SAI3_TX_SYNC 0xd6
+
MX8MP_IOMUXC_SAI3_TXC__AUDIOMIX_SAI3_TX_BCLK 0xd6

Quoted 8 lines

+ MX8MP_IOMUXC_SAI3_RXD__AUDIOMIX_SAI3_RX_DATA00 0xd6 + MX8MP_IOMUXC_SAI3_TXD__AUDIOMIX_SAI3_TX_DATA00 0xd6 +
MX8MP_IOMUXC_SAI3_MCLK__AUDIOMIX_SAI3_MCLK 0xd6
+
MX8MP_IOMUXC_SAI3_RXFS__GPIO4_IO28 0xd6

What is gpio04-io28 used for?

Apparently unused, dropped.

Quoted 8 lines
Quoted 6 lines
Quoted 3 lines

Isn't that the headphone detect GPIO?

I think simple-audio-card,hp-det-gpio can reference it.

Per the schematics of the MX8MP EVK, the pin is not connected on the board-to-board connector EVK side, right ?

Er, correction, that's AUD_NINT, which is WM8960 GPIO1 .

I only went by NXP's downstream device tree. I didn't have the schematics in front of me. Sorry for the noise.

adam

#15 lore raw

Re: [PATCH v5 5/5] arm64: dts: imx8mp: Add analog audio output on i.MX8MP EVK

Quoted 66 lines · Adam Ford
Quoted 65 lines · Marek Vasut
Quoted 63 lines · Marek Vasut
Quoted 61 lines · Adam Ford
Quoted 55 lines · Marek Vasut

On 2/27/23 19:59, Marco Felsch wrote:
[...]

Quoted 11 lines

Review &i2c3 { · line 390

Quoted 8 lines
(quoted diff) +4 -0
@@ -344,6 +384,18 @@ &i2c3 {
       pinctrl-0 = <&pinctrl_i2c3>;
       status = "okay";
 
+    wm8960: codec@1a {
+            #sound-dai-cells = <0>;
+            compatible = "wlf,wm8960";
+            reg = <0x1a>;

The compatible should be the first property followed by the reg property.

See my reply to the mx8mn sound-sai-cells patch , I am not sure here. The rest is fixed in V6.

Quoted 12 lines
Quoted 12 lines
(quoted diff) +8 -0
+            clocks = <&audio_blk_ctrl
 IMX8MP_CLK_AUDIOMIX_SAI3_MCLK1>;
+            clock-names = "mclk";
+            wlf,shared-lrclk;
+            wlf,hp-cfg = <3 2 3>;
+            wlf,gpio-cfg = <1 3>;
+            SPKVDD1-supply = <&reg_audio_pwr>;
+    };
+
       pca6416: gpio@20 {
               compatible = "ti,tca6416";
               reg = <0x20>;

[...]

Quoted 4 lines
Quoted 4 lines
(quoted diff) +0 -0
@@ -668,6 +730,18 @@ MX8MP_IOMUXC_UART3_TXD__UART1_DCE_RTS   0x140
               >;
       };
 
Quoted 16 lines
Quoted 6 lines
(quoted diff) +3 -0
+    pinctrl_sai3: sai3grp {
+            fsl,pins = <
+

MX8MP_IOMUXC_SAI3_TXFS__AUDIOMIX_SAI3_TX_SYNC 0xd6
+
MX8MP_IOMUXC_SAI3_TXC__AUDIOMIX_SAI3_TX_BCLK 0xd6

Quoted 8 lines

+ MX8MP_IOMUXC_SAI3_RXD__AUDIOMIX_SAI3_RX_DATA00 0xd6 + MX8MP_IOMUXC_SAI3_TXD__AUDIOMIX_SAI3_TX_DATA00 0xd6 +
MX8MP_IOMUXC_SAI3_MCLK__AUDIOMIX_SAI3_MCLK 0xd6
+
MX8MP_IOMUXC_SAI3_RXFS__GPIO4_IO28 0xd6

What is gpio04-io28 used for?

Quoted 1 line

Apparently unused, dropped.

Isn't that the headphone detect GPIO?

I think simple-audio-card,hp-det-gpio can reference it.

Quoted 7 lines
Quoted 4 lines
Quoted 2 lines

Per the schematics of the MX8MP EVK, the pin is not connected on the board-to-board connector EVK side, right ?

Er, correction, that's AUD_NINT, which is WM8960 GPIO1 .

I only went by NXP's downstream device tree. I didn't have the schematics in front of me. Sorry for the noise.

But you and Marco were right in that I had the regulator pinmux wrong (fixed in V6)