* [PATCH v6 1/4] dt-bindings: fsl-imx-sdma: Convert imx sdma to DT schema
2022-09-06 9:42 [PATCH v6 0/4] dmaengine: sdma support hdmi audio Joy Zou
@ 2022-09-06 9:42 ` Joy Zou
2022-09-06 10:55 ` Alexander Stein
2022-09-06 9:42 ` [PATCH v6 2/4] dmaengine: imx-sdma: support hdmi audio Joy Zou
` (2 subsequent siblings)
3 siblings, 1 reply; 12+ messages in thread
From: Joy Zou @ 2022-09-06 9:42 UTC (permalink / raw)
To: vkoul, robh+dt, krzysztof.kozlowski+dt, shawnguo, s.hauer,
kernel, festevam
Cc: shengjiu.wang, martink, dev, alexander.stein, peng.fan, david,
aford173, hongxing.zhu, linux-imx, dmaengine, devicetree,
linux-arm-kernel, linux-kernel
Convert the i.MX SDMA binding to DT schema format using json-schema.
The compatibles fsl,imx31-to1-sdma, fsl,imx31-to2-sdma, fsl,imx35-to1-sdma
and fsl,imx35-to2-sdma are not used. So need to delete it. The compatibles
fsl,imx50-sdma, fsl,imx6sll-sdma and fsl,imx6sl-sdma are added. The
original binding don't list all compatible used.
In addition, add new peripheral types HDMI Audio.
Signed-off-by: Joy Zou <joy.zou@nxp.com>
---
Changes in v6:
delete tag Acked-by from commit message.
Changes in v5:
modify the commit message fromat.
add additionalProperties, because delete the quotes in patch v4.
delete unevaluatedProperties due to similar to additionalProperties.
modification fsl,sdma-event-remap items and description.
Changes in v4:
modify the commit message.
delete the quotes in patch.
modify the compatible in patch.
delete maxitems and add items for clock-names property.
add iram property.
Changes in v3:
modify the commit message.
modify the filename.
modify the maintainer.
delete the unnecessary comment.
modify the compatible and run dt_binding_check and dtbs_check.
add clocks and clock-names property.
delete the reg description and add maxItems.
delete the interrupts description and add maxItems.
add ref for gpr property.
modify the fsl,sdma-event-remap ref type and add items.
delete consumer example.
Changes in v2:
convert imx sdma bindings to DT schema.
---
.../devicetree/bindings/dma/fsl,imx-sdma.yaml | 147 ++++++++++++++++++
.../devicetree/bindings/dma/fsl-imx-sdma.txt | 118 --------------
2 files changed, 147 insertions(+), 118 deletions(-)
create mode 100644 Documentation/devicetree/bindings/dma/fsl,imx-sdma.yaml
delete mode 100644 Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt
diff --git a/Documentation/devicetree/bindings/dma/fsl,imx-sdma.yaml b/Documentation/devicetree/bindings/dma/fsl,imx-sdma.yaml
new file mode 100644
index 000000000000..3da65d3ea4af
--- /dev/null
+++ b/Documentation/devicetree/bindings/dma/fsl,imx-sdma.yaml
@@ -0,0 +1,147 @@
+# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/dma/fsl,imx-sdma.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Freescale Smart Direct Memory Access (SDMA) Controller for i.MX
+
+maintainers:
+ - Joy Zou <joy.zou@nxp.com>
+
+properties:
+ compatible:
+ oneOf:
+ - items:
+ - enum:
+ - fsl,imx50-sdma
+ - fsl,imx51-sdma
+ - fsl,imx53-sdma
+ - fsl,imx6q-sdma
+ - fsl,imx7d-sdma
+ - const: fsl,imx35-sdma
+ - items:
+ - enum:
+ - fsl,imx6sx-sdma
+ - fsl,imx6sl-sdma
+ - const: fsl,imx6q-sdma
+ - items:
+ - const: fsl,imx6ul-sdma
+ - const: fsl,imx6q-sdma
+ - const: fsl,imx35-sdma
+ - items:
+ - const: fsl,imx6sll-sdma
+ - const: fsl,imx6ul-sdma
+ - items:
+ - const: fsl,imx8mq-sdma
+ - const: fsl,imx7d-sdma
+ - items:
+ - enum:
+ - fsl,imx8mp-sdma
+ - fsl,imx8mn-sdma
+ - fsl,imx8mm-sdma
+ - const: fsl,imx8mq-sdma
+ - items:
+ - enum:
+ - fsl,imx25-sdma
+ - fsl,imx31-sdma
+ - fsl,imx35-sdma
+ reg:
+ maxItems: 1
+
+ interrupts:
+ maxItems: 1
+
+ fsl,sdma-ram-script-name:
+ $ref: /schemas/types.yaml#/definitions/string
+ description: Should contain the full path of SDMA RAM scripts firmware.
+
+ "#dma-cells":
+ const: 3
+ description: |
+ The first cell: request/event ID
+
+ The second cell: peripheral types ID
+ enum:
+ - MCU domain SSI: 0
+ - Shared SSI: 1
+ - MMC: 2
+ - SDHC: 3
+ - MCU domain UART: 4
+ - Shared UART: 5
+ - FIRI: 6
+ - MCU domain CSPI: 7
+ - Shared CSPI: 8
+ - SIM: 9
+ - ATA: 10
+ - CCM: 11
+ - External peripheral: 12
+ - Memory Stick Host Controller: 13
+ - Shared Memory Stick Host Controller: 14
+ - DSP: 15
+ - Memory: 16
+ - FIFO type Memory: 17
+ - SPDIF: 18
+ - IPU Memory: 19
+ - ASRC: 20
+ - ESAI: 21
+ - SSI Dual FIFO: 22
+ description: needs firmware more than ver 2
+ - Shared ASRC: 23
+ - SAI: 24
+ - HDMI Audio: 25
+
+ The third cell: transfer priority ID
+ enum:
+ - High: 0
+ - Medium: 1
+ - Low: 2
+
+ gpr:
+ $ref: /schemas/types.yaml#/definitions/phandle
+ description: The phandle to the General Purpose Register (GPR) node
+
+ fsl,sdma-event-remap:
+ $ref: /schemas/types.yaml#/definitions/uint32-matrix
+ maxItems: 2
+ items:
+ items:
+ - description: GPR register offset
+ - description: GPR register shift
+ - description: GPR register value
+ description: |
+ Register bits of sdma event remap, the format is <reg shift val>.
+ The order is <RX>, <TX>.
+
+ clocks:
+ maxItems: 2
+
+ clock-names:
+ items:
+ - const: ipg
+ - const: ahb
+
+ iram:
+ $ref: /schemas/types.yaml#/definitions/phandle
+ description: The phandle to the On-chip RAM (OCRAM) node.
+
+required:
+ - compatible
+ - reg
+ - interrupts
+ - fsl,sdma-ram-script-name
+ - "#dma-cells"
+
+additionalProperties: false
+
+examples:
+ - |
+ sdma: dma-controller@83fb0000 {
+ compatible = "fsl,imx51-sdma", "fsl,imx35-sdma";
+ reg = <0x83fb0000 0x4000>;
+ interrupts = <6>;
+ #dma-cells = <3>;
+ fsl,sdma-ram-script-name = "sdma-imx51.bin";
+ };
+
+...
diff --git a/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt b/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt
deleted file mode 100644
index 12c316ff4834..000000000000
--- a/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt
+++ /dev/null
@@ -1,118 +0,0 @@
-* Freescale Smart Direct Memory Access (SDMA) Controller for i.MX
-
-Required properties:
-- compatible : Should be one of
- "fsl,imx25-sdma"
- "fsl,imx31-sdma", "fsl,imx31-to1-sdma", "fsl,imx31-to2-sdma"
- "fsl,imx35-sdma", "fsl,imx35-to1-sdma", "fsl,imx35-to2-sdma"
- "fsl,imx51-sdma"
- "fsl,imx53-sdma"
- "fsl,imx6q-sdma"
- "fsl,imx7d-sdma"
- "fsl,imx6ul-sdma"
- "fsl,imx8mq-sdma"
- "fsl,imx8mm-sdma"
- "fsl,imx8mn-sdma"
- "fsl,imx8mp-sdma"
- The -to variants should be preferred since they allow to determine the
- correct ROM script addresses needed for the driver to work without additional
- firmware.
-- reg : Should contain SDMA registers location and length
-- interrupts : Should contain SDMA interrupt
-- #dma-cells : Must be <3>.
- The first cell specifies the DMA request/event ID. See details below
- about the second and third cell.
-- fsl,sdma-ram-script-name : Should contain the full path of SDMA RAM
- scripts firmware
-
-The second cell of dma phandle specifies the peripheral type of DMA transfer.
-The full ID of peripheral types can be found below.
-
- ID transfer type
- ---------------------
- 0 MCU domain SSI
- 1 Shared SSI
- 2 MMC
- 3 SDHC
- 4 MCU domain UART
- 5 Shared UART
- 6 FIRI
- 7 MCU domain CSPI
- 8 Shared CSPI
- 9 SIM
- 10 ATA
- 11 CCM
- 12 External peripheral
- 13 Memory Stick Host Controller
- 14 Shared Memory Stick Host Controller
- 15 DSP
- 16 Memory
- 17 FIFO type Memory
- 18 SPDIF
- 19 IPU Memory
- 20 ASRC
- 21 ESAI
- 22 SSI Dual FIFO (needs firmware ver >= 2)
- 23 Shared ASRC
- 24 SAI
-
-The third cell specifies the transfer priority as below.
-
- ID transfer priority
- -------------------------
- 0 High
- 1 Medium
- 2 Low
-
-Optional properties:
-
-- gpr : The phandle to the General Purpose Register (GPR) node.
-- fsl,sdma-event-remap : Register bits of sdma event remap, the format is
- <reg shift val>.
- reg is the GPR register offset.
- shift is the bit position inside the GPR register.
- val is the value of the bit (0 or 1).
-
-Examples:
-
-sdma@83fb0000 {
- compatible = "fsl,imx51-sdma", "fsl,imx35-sdma";
- reg = <0x83fb0000 0x4000>;
- interrupts = <6>;
- #dma-cells = <3>;
- fsl,sdma-ram-script-name = "sdma-imx51.bin";
-};
-
-DMA clients connected to the i.MX SDMA controller must use the format
-described in the dma.txt file.
-
-Examples:
-
-ssi2: ssi@70014000 {
- compatible = "fsl,imx51-ssi", "fsl,imx21-ssi";
- reg = <0x70014000 0x4000>;
- interrupts = <30>;
- clocks = <&clks 49>;
- dmas = <&sdma 24 1 0>,
- <&sdma 25 1 0>;
- dma-names = "rx", "tx";
- fsl,fifo-depth = <15>;
-};
-
-Using the fsl,sdma-event-remap property:
-
-If we want to use SDMA on the SAI1 port on a MX6SX:
-
-&sdma {
- gpr = <&gpr>;
- /* SDMA events remap for SAI1_RX and SAI1_TX */
- fsl,sdma-event-remap = <0 15 1>, <0 16 1>;
-};
-
-The fsl,sdma-event-remap property in this case has two values:
-- <0 15 1> means that the offset is 0, so GPR0 is the register of the
-SDMA remap. Bit 15 of GPR0 selects between UART4_RX and SAI1_RX.
-Setting bit 15 to 1 selects SAI1_RX.
-- <0 16 1> means that the offset is 0, so GPR0 is the register of the
-SDMA remap. Bit 16 of GPR0 selects between UART4_TX and SAI1_TX.
-Setting bit 16 to 1 selects SAI1_TX.
--
2.37.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH v6 1/4] dt-bindings: fsl-imx-sdma: Convert imx sdma to DT schema
2022-09-06 9:42 ` [PATCH v6 1/4] dt-bindings: fsl-imx-sdma: Convert imx sdma to DT schema Joy Zou
@ 2022-09-06 10:55 ` Alexander Stein
2022-09-06 11:13 ` [EXT] " Joy Zou
2022-09-07 11:12 ` Krzysztof Kozlowski
0 siblings, 2 replies; 12+ messages in thread
From: Alexander Stein @ 2022-09-06 10:55 UTC (permalink / raw)
To: Joy Zou
Cc: vkoul, robh+dt, krzysztof.kozlowski+dt, shawnguo, s.hauer,
kernel, festevam, shengjiu.wang, martink, dev, peng.fan, david,
aford173, hongxing.zhu, linux-imx, dmaengine, devicetree,
linux-arm-kernel, linux-kernel
Hi,
thanks for the YAML conversion patch.
Am Dienstag, 6. September 2022, 11:42:53 CEST schrieb Joy Zou:
> Convert the i.MX SDMA binding to DT schema format using json-schema.
>
> The compatibles fsl,imx31-to1-sdma, fsl,imx31-to2-sdma, fsl,imx35-to1-sdma
> and fsl,imx35-to2-sdma are not used. So need to delete it. The compatibles
> fsl,imx50-sdma, fsl,imx6sll-sdma and fsl,imx6sl-sdma are added. The
> original binding don't list all compatible used.
>
> In addition, add new peripheral types HDMI Audio.
>
> Signed-off-by: Joy Zou <joy.zou@nxp.com>
> ---
> Changes in v6:
> delete tag Acked-by from commit message.
>
> Changes in v5:
> modify the commit message fromat.
> add additionalProperties, because delete the quotes in patch v4.
> delete unevaluatedProperties due to similar to additionalProperties.
> modification fsl,sdma-event-remap items and description.
>
> Changes in v4:
> modify the commit message.
> delete the quotes in patch.
> modify the compatible in patch.
> delete maxitems and add items for clock-names property.
> add iram property.
>
> Changes in v3:
> modify the commit message.
> modify the filename.
> modify the maintainer.
> delete the unnecessary comment.
> modify the compatible and run dt_binding_check and dtbs_check.
> add clocks and clock-names property.
> delete the reg description and add maxItems.
> delete the interrupts description and add maxItems.
> add ref for gpr property.
> modify the fsl,sdma-event-remap ref type and add items.
> delete consumer example.
>
> Changes in v2:
> convert imx sdma bindings to DT schema.
> ---
> .../devicetree/bindings/dma/fsl,imx-sdma.yaml | 147 ++++++++++++++++++
> .../devicetree/bindings/dma/fsl-imx-sdma.txt | 118 --------------
> 2 files changed, 147 insertions(+), 118 deletions(-)
> create mode 100644 Documentation/devicetree/bindings/dma/fsl,imx-sdma.yaml
> delete mode 100644 Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt
>
> diff --git a/Documentation/devicetree/bindings/dma/fsl,imx-sdma.yaml
> b/Documentation/devicetree/bindings/dma/fsl,imx-sdma.yaml new file mode
> 100644
> index 000000000000..3da65d3ea4af
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/dma/fsl,imx-sdma.yaml
> @@ -0,0 +1,147 @@
> +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
> +%YAML 1.2
> +---
> +$id: http://devicetree.org/schemas/dma/fsl,imx-sdma.yaml#
> +$schema: http://devicetree.org/meta-schemas/core.yaml#
> +
> +title: Freescale Smart Direct Memory Access (SDMA) Controller for i.MX
> +
> +maintainers:
> + - Joy Zou <joy.zou@nxp.com>
> +
> +properties:
Is it sensible to add something like this?
$nodename:
pattern: "^dma-controller(@.*)?$"
You are changing the node names in patch 3 anyway.
Best regards,
Alexander
> + compatible:
> + oneOf:
> + - items:
> + - enum:
> + - fsl,imx50-sdma
> + - fsl,imx51-sdma
> + - fsl,imx53-sdma
> + - fsl,imx6q-sdma
> + - fsl,imx7d-sdma
> + - const: fsl,imx35-sdma
> + - items:
> + - enum:
> + - fsl,imx6sx-sdma
> + - fsl,imx6sl-sdma
> + - const: fsl,imx6q-sdma
> + - items:
> + - const: fsl,imx6ul-sdma
> + - const: fsl,imx6q-sdma
> + - const: fsl,imx35-sdma
> + - items:
> + - const: fsl,imx6sll-sdma
> + - const: fsl,imx6ul-sdma
> + - items:
> + - const: fsl,imx8mq-sdma
> + - const: fsl,imx7d-sdma
> + - items:
> + - enum:
> + - fsl,imx8mp-sdma
> + - fsl,imx8mn-sdma
> + - fsl,imx8mm-sdma
> + - const: fsl,imx8mq-sdma
> + - items:
> + - enum:
> + - fsl,imx25-sdma
> + - fsl,imx31-sdma
> + - fsl,imx35-sdma
> + reg:
> + maxItems: 1
> +
> + interrupts:
> + maxItems: 1
> +
> + fsl,sdma-ram-script-name:
> + $ref: /schemas/types.yaml#/definitions/string
> + description: Should contain the full path of SDMA RAM scripts firmware.
> +
> + "#dma-cells":
> + const: 3
> + description: |
> + The first cell: request/event ID
> +
> + The second cell: peripheral types ID
> + enum:
> + - MCU domain SSI: 0
> + - Shared SSI: 1
> + - MMC: 2
> + - SDHC: 3
> + - MCU domain UART: 4
> + - Shared UART: 5
> + - FIRI: 6
> + - MCU domain CSPI: 7
> + - Shared CSPI: 8
> + - SIM: 9
> + - ATA: 10
> + - CCM: 11
> + - External peripheral: 12
> + - Memory Stick Host Controller: 13
> + - Shared Memory Stick Host Controller: 14
> + - DSP: 15
> + - Memory: 16
> + - FIFO type Memory: 17
> + - SPDIF: 18
> + - IPU Memory: 19
> + - ASRC: 20
> + - ESAI: 21
> + - SSI Dual FIFO: 22
> + description: needs firmware more than ver 2
> + - Shared ASRC: 23
> + - SAI: 24
> + - HDMI Audio: 25
> +
> + The third cell: transfer priority ID
> + enum:
> + - High: 0
> + - Medium: 1
> + - Low: 2
> +
> + gpr:
> + $ref: /schemas/types.yaml#/definitions/phandle
> + description: The phandle to the General Purpose Register (GPR) node
> +
> + fsl,sdma-event-remap:
> + $ref: /schemas/types.yaml#/definitions/uint32-matrix
> + maxItems: 2
> + items:
> + items:
> + - description: GPR register offset
> + - description: GPR register shift
> + - description: GPR register value
> + description: |
> + Register bits of sdma event remap, the format is <reg shift val>.
> + The order is <RX>, <TX>.
> +
> + clocks:
> + maxItems: 2
> +
> + clock-names:
> + items:
> + - const: ipg
> + - const: ahb
> +
> + iram:
> + $ref: /schemas/types.yaml#/definitions/phandle
> + description: The phandle to the On-chip RAM (OCRAM) node.
> +
> +required:
> + - compatible
> + - reg
> + - interrupts
> + - fsl,sdma-ram-script-name
> + - "#dma-cells"
> +
> +additionalProperties: false
> +
> +examples:
> + - |
> + sdma: dma-controller@83fb0000 {
> + compatible = "fsl,imx51-sdma", "fsl,imx35-sdma";
> + reg = <0x83fb0000 0x4000>;
> + interrupts = <6>;
> + #dma-cells = <3>;
> + fsl,sdma-ram-script-name = "sdma-imx51.bin";
> + };
> +
> +...
> diff --git a/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt
> b/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt deleted file mode
> 100644
> index 12c316ff4834..000000000000
> --- a/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt
> +++ /dev/null
> @@ -1,118 +0,0 @@
> -* Freescale Smart Direct Memory Access (SDMA) Controller for i.MX
> -
> -Required properties:
> -- compatible : Should be one of
> - "fsl,imx25-sdma"
> - "fsl,imx31-sdma", "fsl,imx31-to1-sdma", "fsl,imx31-to2-sdma"
> - "fsl,imx35-sdma", "fsl,imx35-to1-sdma", "fsl,imx35-to2-sdma"
> - "fsl,imx51-sdma"
> - "fsl,imx53-sdma"
> - "fsl,imx6q-sdma"
> - "fsl,imx7d-sdma"
> - "fsl,imx6ul-sdma"
> - "fsl,imx8mq-sdma"
> - "fsl,imx8mm-sdma"
> - "fsl,imx8mn-sdma"
> - "fsl,imx8mp-sdma"
> - The -to variants should be preferred since they allow to determine the
> - correct ROM script addresses needed for the driver to work without
> additional - firmware.
> -- reg : Should contain SDMA registers location and length
> -- interrupts : Should contain SDMA interrupt
> -- #dma-cells : Must be <3>.
> - The first cell specifies the DMA request/event ID. See details below
> - about the second and third cell.
> -- fsl,sdma-ram-script-name : Should contain the full path of SDMA RAM
> - scripts firmware
> -
> -The second cell of dma phandle specifies the peripheral type of DMA
> transfer. -The full ID of peripheral types can be found below.
> -
> - ID transfer type
> - ---------------------
> - 0 MCU domain SSI
> - 1 Shared SSI
> - 2 MMC
> - 3 SDHC
> - 4 MCU domain UART
> - 5 Shared UART
> - 6 FIRI
> - 7 MCU domain CSPI
> - 8 Shared CSPI
> - 9 SIM
> - 10 ATA
> - 11 CCM
> - 12 External peripheral
> - 13 Memory Stick Host Controller
> - 14 Shared Memory Stick Host Controller
> - 15 DSP
> - 16 Memory
> - 17 FIFO type Memory
> - 18 SPDIF
> - 19 IPU Memory
> - 20 ASRC
> - 21 ESAI
> - 22 SSI Dual FIFO (needs firmware ver >= 2)
> - 23 Shared ASRC
> - 24 SAI
> -
> -The third cell specifies the transfer priority as below.
> -
> - ID transfer priority
> - -------------------------
> - 0 High
> - 1 Medium
> - 2 Low
> -
> -Optional properties:
> -
> -- gpr : The phandle to the General Purpose Register (GPR) node.
> -- fsl,sdma-event-remap : Register bits of sdma event remap, the format is
> - <reg shift val>.
> - reg is the GPR register offset.
> - shift is the bit position inside the GPR register.
> - val is the value of the bit (0 or 1).
> -
> -Examples:
> -
> -sdma@83fb0000 {
> - compatible = "fsl,imx51-sdma", "fsl,imx35-sdma";
> - reg = <0x83fb0000 0x4000>;
> - interrupts = <6>;
> - #dma-cells = <3>;
> - fsl,sdma-ram-script-name = "sdma-imx51.bin";
> -};
> -
> -DMA clients connected to the i.MX SDMA controller must use the format
> -described in the dma.txt file.
> -
> -Examples:
> -
> -ssi2: ssi@70014000 {
> - compatible = "fsl,imx51-ssi", "fsl,imx21-ssi";
> - reg = <0x70014000 0x4000>;
> - interrupts = <30>;
> - clocks = <&clks 49>;
> - dmas = <&sdma 24 1 0>,
> - <&sdma 25 1 0>;
> - dma-names = "rx", "tx";
> - fsl,fifo-depth = <15>;
> -};
> -
> -Using the fsl,sdma-event-remap property:
> -
> -If we want to use SDMA on the SAI1 port on a MX6SX:
> -
> -&sdma {
> - gpr = <&gpr>;
> - /* SDMA events remap for SAI1_RX and SAI1_TX */
> - fsl,sdma-event-remap = <0 15 1>, <0 16 1>;
> -};
> -
> -The fsl,sdma-event-remap property in this case has two values:
> -- <0 15 1> means that the offset is 0, so GPR0 is the register of the
> -SDMA remap. Bit 15 of GPR0 selects between UART4_RX and SAI1_RX.
> -Setting bit 15 to 1 selects SAI1_RX.
> -- <0 16 1> means that the offset is 0, so GPR0 is the register of the
> -SDMA remap. Bit 16 of GPR0 selects between UART4_TX and SAI1_TX.
> -Setting bit 16 to 1 selects SAI1_TX.
^ permalink raw reply [flat|nested] 12+ messages in thread* RE: [EXT] Re: [PATCH v6 1/4] dt-bindings: fsl-imx-sdma: Convert imx sdma to DT schema
2022-09-06 10:55 ` Alexander Stein
@ 2022-09-06 11:13 ` Joy Zou
2022-09-06 16:25 ` Rob Herring
2022-09-07 11:12 ` Krzysztof Kozlowski
1 sibling, 1 reply; 12+ messages in thread
From: Joy Zou @ 2022-09-06 11:13 UTC (permalink / raw)
To: Alexander Stein
Cc: vkoul, robh+dt, krzysztof.kozlowski+dt, shawnguo, s.hauer,
kernel, festevam, S.J. Wang, martink, dev, Peng Fan, david,
aford173, Hongxing Zhu, dl-linux-imx, dmaengine, devicetree,
linux-arm-kernel, linux-kernel
> -----Original Message-----
> From: Alexander Stein <alexander.stein@ew.tq-group.com>
> Sent: 2022年9月6日 18:55
> To: Joy Zou <joy.zou@nxp.com>
> Cc: vkoul@kernel.org; robh+dt@kernel.org; krzysztof.kozlowski+dt@linaro.org;
> shawnguo@kernel.org; s.hauer@pengutronix.de; kernel@pengutronix.de;
> festevam@gmail.com; S.J. Wang <shengjiu.wang@nxp.com>;
> martink@posteo.de; dev@lynxeye.de; Peng Fan <peng.fan@nxp.com>;
> david@ixit.cz; aford173@gmail.com; Hongxing Zhu <hongxing.zhu@nxp.com>;
> dl-linux-imx <linux-imx@nxp.com>; dmaengine@vger.kernel.org;
> devicetree@vger.kernel.org; linux-arm-kernel@lists.infradead.org;
> linux-kernel@vger.kernel.org
> Subject: [EXT] Re: [PATCH v6 1/4] dt-bindings: fsl-imx-sdma: Convert imx sdma
> to DT schema
>
> Caution: EXT Email
>
> Hi,
>
> thanks for the YAML conversion patch.
>
> Am Dienstag, 6. September 2022, 11:42:53 CEST schrieb Joy Zou:
> > Convert the i.MX SDMA binding to DT schema format using json-schema.
> >
> > The compatibles fsl,imx31-to1-sdma, fsl,imx31-to2-sdma,
> > fsl,imx35-to1-sdma and fsl,imx35-to2-sdma are not used. So need to
> > delete it. The compatibles fsl,imx50-sdma, fsl,imx6sll-sdma and
> > fsl,imx6sl-sdma are added. The original binding don't list all compatible used.
> >
> > In addition, add new peripheral types HDMI Audio.
> >
> > Signed-off-by: Joy Zou <joy.zou@nxp.com>
> > ---
> > Changes in v6:
> > delete tag Acked-by from commit message.
> >
> > Changes in v5:
> > modify the commit message fromat.
> > add additionalProperties, because delete the quotes in patch v4.
> > delete unevaluatedProperties due to similar to additionalProperties.
> > modification fsl,sdma-event-remap items and description.
> >
> > Changes in v4:
> > modify the commit message.
> > delete the quotes in patch.
> > modify the compatible in patch.
> > delete maxitems and add items for clock-names property.
> > add iram property.
> >
> > Changes in v3:
> > modify the commit message.
> > modify the filename.
> > modify the maintainer.
> > delete the unnecessary comment.
> > modify the compatible and run dt_binding_check and dtbs_check.
> > add clocks and clock-names property.
> > delete the reg description and add maxItems.
> > delete the interrupts description and add maxItems.
> > add ref for gpr property.
> > modify the fsl,sdma-event-remap ref type and add items.
> > delete consumer example.
> >
> > Changes in v2:
> > convert imx sdma bindings to DT schema.
> > ---
> > .../devicetree/bindings/dma/fsl,imx-sdma.yaml | 147
> > ++++++++++++++++++ .../devicetree/bindings/dma/fsl-imx-sdma.txt |
> > 118 --------------
> > 2 files changed, 147 insertions(+), 118 deletions(-) create mode
> > 100644 Documentation/devicetree/bindings/dma/fsl,imx-sdma.yaml
> > delete mode 100644
> > Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt
> >
> > diff --git a/Documentation/devicetree/bindings/dma/fsl,imx-sdma.yaml
> > b/Documentation/devicetree/bindings/dma/fsl,imx-sdma.yaml new file
> > mode
> > 100644
> > index 000000000000..3da65d3ea4af
> > --- /dev/null
> > +++ b/Documentation/devicetree/bindings/dma/fsl,imx-sdma.yaml
> > @@ -0,0 +1,147 @@
> > +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause %YAML 1.2
> > +---
> > +$id:
> > +https://eur01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fdevi
> >
> +cetree.org%2Fschemas%2Fdma%2Ffsl%2Cimx-sdma.yaml%23&data=05
> %7C01%
> >
> +7Cjoy.zou%40nxp.com%7Cc7a8409ee52447126b2908da8ff649db%7C686ea
> 1d3bc2b
> >
> +4c6fa92cd99c5c301635%7C0%7C0%7C637980585219845112%7CUnknown
> %7CTWFpbGZ
> >
> +sb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6M
> n0%
> >
> +3D%7C3000%7C%7C%7C&sdata=XHRpq%2BiZpXdB7Yw4gZRONgWMn7
> KiSxM9yBES7R
> > +H0iNc%3D&reserved=0
> > +$schema:
> > +https://eur01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fdevi
> >
> +cetree.org%2Fmeta-schemas%2Fcore.yaml%23&data=05%7C01%7Cjoy.z
> ou%4
> >
> +0nxp.com%7Cc7a8409ee52447126b2908da8ff649db%7C686ea1d3bc2b4c6f
> a92cd99
> >
> +c5c301635%7C0%7C0%7C637980585220001350%7CUnknown%7CTWFpbG
> Zsb3d8eyJWIj
> >
> +oiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3
> 000%7
> >
> +C%7C%7C&sdata=6albMSOV7dsgaHuDk05ZUtAiMTlwYX6QyHrfXWz7%2
> BmY%3D&am
> > +p;reserved=0
> > +
> > +title: Freescale Smart Direct Memory Access (SDMA) Controller for
> > +i.MX
> > +
> > +maintainers:
> > + - Joy Zou <joy.zou@nxp.com>
> > +
> > +properties:
>
> Is it sensible to add something like this?
>
> $nodename:
> pattern: "^dma-controller(@.*)?$"
>
> You are changing the node names in patch 3 anyway.
Yes, it is sensible to add $nodename. Because I have deleted the dma-controller quotes.
I follow the dma-controller $nodename. I think it is general. So changing the node name.
I will add it next version.
Thanks for your comments!
BR
Joy Zou
>
> Best regards,
> Alexander
>
> > + compatible:
> > + oneOf:
> > + - items:
> > + - enum:
> > + - fsl,imx50-sdma
> > + - fsl,imx51-sdma
> > + - fsl,imx53-sdma
> > + - fsl,imx6q-sdma
> > + - fsl,imx7d-sdma
> > + - const: fsl,imx35-sdma
> > + - items:
> > + - enum:
> > + - fsl,imx6sx-sdma
> > + - fsl,imx6sl-sdma
> > + - const: fsl,imx6q-sdma
> > + - items:
> > + - const: fsl,imx6ul-sdma
> > + - const: fsl,imx6q-sdma
> > + - const: fsl,imx35-sdma
> > + - items:
> > + - const: fsl,imx6sll-sdma
> > + - const: fsl,imx6ul-sdma
> > + - items:
> > + - const: fsl,imx8mq-sdma
> > + - const: fsl,imx7d-sdma
> > + - items:
> > + - enum:
> > + - fsl,imx8mp-sdma
> > + - fsl,imx8mn-sdma
> > + - fsl,imx8mm-sdma
> > + - const: fsl,imx8mq-sdma
> > + - items:
> > + - enum:
> > + - fsl,imx25-sdma
> > + - fsl,imx31-sdma
> > + - fsl,imx35-sdma
> > + reg:
> > + maxItems: 1
> > +
> > + interrupts:
> > + maxItems: 1
> > +
> > + fsl,sdma-ram-script-name:
> > + $ref: /schemas/types.yaml#/definitions/string
> > + description: Should contain the full path of SDMA RAM scripts
> firmware.
> > +
> > + "#dma-cells":
> > + const: 3
> > + description: |
> > + The first cell: request/event ID
> > +
> > + The second cell: peripheral types ID
> > + enum:
> > + - MCU domain SSI: 0
> > + - Shared SSI: 1
> > + - MMC: 2
> > + - SDHC: 3
> > + - MCU domain UART: 4
> > + - Shared UART: 5
> > + - FIRI: 6
> > + - MCU domain CSPI: 7
> > + - Shared CSPI: 8
> > + - SIM: 9
> > + - ATA: 10
> > + - CCM: 11
> > + - External peripheral: 12
> > + - Memory Stick Host Controller: 13
> > + - Shared Memory Stick Host Controller: 14
> > + - DSP: 15
> > + - Memory: 16
> > + - FIFO type Memory: 17
> > + - SPDIF: 18
> > + - IPU Memory: 19
> > + - ASRC: 20
> > + - ESAI: 21
> > + - SSI Dual FIFO: 22
> > + description: needs firmware more than ver 2
> > + - Shared ASRC: 23
> > + - SAI: 24
> > + - HDMI Audio: 25
> > +
> > + The third cell: transfer priority ID
> > + enum:
> > + - High: 0
> > + - Medium: 1
> > + - Low: 2
> > +
> > + gpr:
> > + $ref: /schemas/types.yaml#/definitions/phandle
> > + description: The phandle to the General Purpose Register (GPR)
> > + node
> > +
> > + fsl,sdma-event-remap:
> > + $ref: /schemas/types.yaml#/definitions/uint32-matrix
> > + maxItems: 2
> > + items:
> > + items:
> > + - description: GPR register offset
> > + - description: GPR register shift
> > + - description: GPR register value
> > + description: |
> > + Register bits of sdma event remap, the format is <reg shift val>.
> > + The order is <RX>, <TX>.
> > +
> > + clocks:
> > + maxItems: 2
> > +
> > + clock-names:
> > + items:
> > + - const: ipg
> > + - const: ahb
> > +
> > + iram:
> > + $ref: /schemas/types.yaml#/definitions/phandle
> > + description: The phandle to the On-chip RAM (OCRAM) node.
> > +
> > +required:
> > + - compatible
> > + - reg
> > + - interrupts
> > + - fsl,sdma-ram-script-name
> > + - "#dma-cells"
> > +
> > +additionalProperties: false
> > +
> > +examples:
> > + - |
> > + sdma: dma-controller@83fb0000 {
> > + compatible = "fsl,imx51-sdma", "fsl,imx35-sdma";
> > + reg = <0x83fb0000 0x4000>;
> > + interrupts = <6>;
> > + #dma-cells = <3>;
> > + fsl,sdma-ram-script-name = "sdma-imx51.bin";
> > + };
> > +
> > +...
> > diff --git a/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt
> > b/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt deleted file
> > mode
> > 100644
> > index 12c316ff4834..000000000000
> > --- a/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt
> > +++ /dev/null
> > @@ -1,118 +0,0 @@
> > -* Freescale Smart Direct Memory Access (SDMA) Controller for i.MX
> > -
> > -Required properties:
> > -- compatible : Should be one of
> > - "fsl,imx25-sdma"
> > - "fsl,imx31-sdma", "fsl,imx31-to1-sdma", "fsl,imx31-to2-sdma"
> > - "fsl,imx35-sdma", "fsl,imx35-to1-sdma", "fsl,imx35-to2-sdma"
> > - "fsl,imx51-sdma"
> > - "fsl,imx53-sdma"
> > - "fsl,imx6q-sdma"
> > - "fsl,imx7d-sdma"
> > - "fsl,imx6ul-sdma"
> > - "fsl,imx8mq-sdma"
> > - "fsl,imx8mm-sdma"
> > - "fsl,imx8mn-sdma"
> > - "fsl,imx8mp-sdma"
> > - The -to variants should be preferred since they allow to determine
> > the
> > - correct ROM script addresses needed for the driver to work without
> > additional - firmware.
> > -- reg : Should contain SDMA registers location and length
> > -- interrupts : Should contain SDMA interrupt
> > -- #dma-cells : Must be <3>.
> > - The first cell specifies the DMA request/event ID. See details
> > below
> > - about the second and third cell.
> > -- fsl,sdma-ram-script-name : Should contain the full path of SDMA RAM
> > - scripts firmware
> > -
> > -The second cell of dma phandle specifies the peripheral type of DMA
> > transfer. -The full ID of peripheral types can be found below.
> > -
> > - ID transfer type
> > - ---------------------
> > - 0 MCU domain SSI
> > - 1 Shared SSI
> > - 2 MMC
> > - 3 SDHC
> > - 4 MCU domain UART
> > - 5 Shared UART
> > - 6 FIRI
> > - 7 MCU domain CSPI
> > - 8 Shared CSPI
> > - 9 SIM
> > - 10 ATA
> > - 11 CCM
> > - 12 External peripheral
> > - 13 Memory Stick Host Controller
> > - 14 Shared Memory Stick Host Controller
> > - 15 DSP
> > - 16 Memory
> > - 17 FIFO type Memory
> > - 18 SPDIF
> > - 19 IPU Memory
> > - 20 ASRC
> > - 21 ESAI
> > - 22 SSI Dual FIFO (needs firmware ver >= 2)
> > - 23 Shared ASRC
> > - 24 SAI
> > -
> > -The third cell specifies the transfer priority as below.
> > -
> > - ID transfer priority
> > - -------------------------
> > - 0 High
> > - 1 Medium
> > - 2 Low
> > -
> > -Optional properties:
> > -
> > -- gpr : The phandle to the General Purpose Register (GPR) node.
> > -- fsl,sdma-event-remap : Register bits of sdma event remap, the
> > format is
> > - <reg shift val>.
> > - reg is the GPR register offset.
> > - shift is the bit position inside the GPR register.
> > - val is the value of the bit (0 or 1).
> > -
> > -Examples:
> > -
> > -sdma@83fb0000 {
> > - compatible = "fsl,imx51-sdma", "fsl,imx35-sdma";
> > - reg = <0x83fb0000 0x4000>;
> > - interrupts = <6>;
> > - #dma-cells = <3>;
> > - fsl,sdma-ram-script-name = "sdma-imx51.bin";
> > -};
> > -
> > -DMA clients connected to the i.MX SDMA controller must use the format
> > -described in the dma.txt file.
> > -
> > -Examples:
> > -
> > -ssi2: ssi@70014000 {
> > - compatible = "fsl,imx51-ssi", "fsl,imx21-ssi";
> > - reg = <0x70014000 0x4000>;
> > - interrupts = <30>;
> > - clocks = <&clks 49>;
> > - dmas = <&sdma 24 1 0>,
> > - <&sdma 25 1 0>;
> > - dma-names = "rx", "tx";
> > - fsl,fifo-depth = <15>;
> > -};
> > -
> > -Using the fsl,sdma-event-remap property:
> > -
> > -If we want to use SDMA on the SAI1 port on a MX6SX:
> > -
> > -&sdma {
> > - gpr = <&gpr>;
> > - /* SDMA events remap for SAI1_RX and SAI1_TX */
> > - fsl,sdma-event-remap = <0 15 1>, <0 16 1>;
> > -};
> > -
> > -The fsl,sdma-event-remap property in this case has two values:
> > -- <0 15 1> means that the offset is 0, so GPR0 is the register of the
> > -SDMA remap. Bit 15 of GPR0 selects between UART4_RX and SAI1_RX.
> > -Setting bit 15 to 1 selects SAI1_RX.
> > -- <0 16 1> means that the offset is 0, so GPR0 is the register of the
> > -SDMA remap. Bit 16 of GPR0 selects between UART4_TX and SAI1_TX.
> > -Setting bit 16 to 1 selects SAI1_TX.
>
>
>
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [EXT] Re: [PATCH v6 1/4] dt-bindings: fsl-imx-sdma: Convert imx sdma to DT schema
2022-09-06 11:13 ` [EXT] " Joy Zou
@ 2022-09-06 16:25 ` Rob Herring
2022-09-07 6:48 ` Joy Zou
0 siblings, 1 reply; 12+ messages in thread
From: Rob Herring @ 2022-09-06 16:25 UTC (permalink / raw)
To: Joy Zou
Cc: Alexander Stein, vkoul, krzysztof.kozlowski+dt, shawnguo,
s.hauer, kernel, festevam, S.J. Wang, martink, dev, Peng Fan,
david, aford173, Hongxing Zhu, dl-linux-imx, dmaengine,
devicetree, linux-arm-kernel, linux-kernel
On Tue, Sep 06, 2022 at 11:13:41AM +0000, Joy Zou wrote:
>
> > -----Original Message-----
> > From: Alexander Stein <alexander.stein@ew.tq-group.com>
> > Sent: 2022年9月6日 18:55
> > To: Joy Zou <joy.zou@nxp.com>
> > Cc: vkoul@kernel.org; robh+dt@kernel.org; krzysztof.kozlowski+dt@linaro.org;
> > shawnguo@kernel.org; s.hauer@pengutronix.de; kernel@pengutronix.de;
> > festevam@gmail.com; S.J. Wang <shengjiu.wang@nxp.com>;
> > martink@posteo.de; dev@lynxeye.de; Peng Fan <peng.fan@nxp.com>;
> > david@ixit.cz; aford173@gmail.com; Hongxing Zhu <hongxing.zhu@nxp.com>;
> > dl-linux-imx <linux-imx@nxp.com>; dmaengine@vger.kernel.org;
> > devicetree@vger.kernel.org; linux-arm-kernel@lists.infradead.org;
> > linux-kernel@vger.kernel.org
> > Subject: [EXT] Re: [PATCH v6 1/4] dt-bindings: fsl-imx-sdma: Convert imx sdma
> > to DT schema
> >
> > Caution: EXT Email
> >
> > Hi,
> >
> > thanks for the YAML conversion patch.
> >
> > Am Dienstag, 6. September 2022, 11:42:53 CEST schrieb Joy Zou:
> > > Convert the i.MX SDMA binding to DT schema format using json-schema.
> > >
> > > The compatibles fsl,imx31-to1-sdma, fsl,imx31-to2-sdma,
> > > fsl,imx35-to1-sdma and fsl,imx35-to2-sdma are not used. So need to
> > > delete it. The compatibles fsl,imx50-sdma, fsl,imx6sll-sdma and
> > > fsl,imx6sl-sdma are added. The original binding don't list all compatible used.
> > >
> > > In addition, add new peripheral types HDMI Audio.
> > >
> > > Signed-off-by: Joy Zou <joy.zou@nxp.com>
> > > ---
> > > Changes in v6:
> > > delete tag Acked-by from commit message.
> > >
> > > Changes in v5:
> > > modify the commit message fromat.
> > > add additionalProperties, because delete the quotes in patch v4.
> > > delete unevaluatedProperties due to similar to additionalProperties.
> > > modification fsl,sdma-event-remap items and description.
> > >
> > > Changes in v4:
> > > modify the commit message.
> > > delete the quotes in patch.
> > > modify the compatible in patch.
> > > delete maxitems and add items for clock-names property.
> > > add iram property.
> > >
> > > Changes in v3:
> > > modify the commit message.
> > > modify the filename.
> > > modify the maintainer.
> > > delete the unnecessary comment.
> > > modify the compatible and run dt_binding_check and dtbs_check.
> > > add clocks and clock-names property.
> > > delete the reg description and add maxItems.
> > > delete the interrupts description and add maxItems.
> > > add ref for gpr property.
> > > modify the fsl,sdma-event-remap ref type and add items.
> > > delete consumer example.
> > >
> > > Changes in v2:
> > > convert imx sdma bindings to DT schema.
> > > ---
> > > .../devicetree/bindings/dma/fsl,imx-sdma.yaml | 147
> > > ++++++++++++++++++ .../devicetree/bindings/dma/fsl-imx-sdma.txt |
> > > 118 --------------
> > > 2 files changed, 147 insertions(+), 118 deletions(-) create mode
> > > 100644 Documentation/devicetree/bindings/dma/fsl,imx-sdma.yaml
> > > delete mode 100644
> > > Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt
> > >
> > > diff --git a/Documentation/devicetree/bindings/dma/fsl,imx-sdma.yaml
> > > b/Documentation/devicetree/bindings/dma/fsl,imx-sdma.yaml new file
> > > mode
> > > 100644
> > > index 000000000000..3da65d3ea4af
> > > --- /dev/null
> > > +++ b/Documentation/devicetree/bindings/dma/fsl,imx-sdma.yaml
> > > @@ -0,0 +1,147 @@
> > > +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause %YAML 1.2
> > > +---
> > > +$id:
> > > +https://eur01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fdevi
> > >
> > +cetree.org%2Fschemas%2Fdma%2Ffsl%2Cimx-sdma.yaml%23&data=05
> > %7C01%
> > >
> > +7Cjoy.zou%40nxp.com%7Cc7a8409ee52447126b2908da8ff649db%7C686ea
> > 1d3bc2b
> > >
> > +4c6fa92cd99c5c301635%7C0%7C0%7C637980585219845112%7CUnknown
> > %7CTWFpbGZ
> > >
> > +sb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6M
> > n0%
> > >
> > +3D%7C3000%7C%7C%7C&sdata=XHRpq%2BiZpXdB7Yw4gZRONgWMn7
> > KiSxM9yBES7R
> > > +H0iNc%3D&reserved=0
> > > +$schema:
> > > +https://eur01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fdevi
> > >
> > +cetree.org%2Fmeta-schemas%2Fcore.yaml%23&data=05%7C01%7Cjoy.z
> > ou%4
> > >
> > +0nxp.com%7Cc7a8409ee52447126b2908da8ff649db%7C686ea1d3bc2b4c6f
> > a92cd99
> > >
> > +c5c301635%7C0%7C0%7C637980585220001350%7CUnknown%7CTWFpbG
> > Zsb3d8eyJWIj
> > >
> > +oiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3
> > 000%7
> > >
> > +C%7C%7C&sdata=6albMSOV7dsgaHuDk05ZUtAiMTlwYX6QyHrfXWz7%2
> > BmY%3D&am
> > > +p;reserved=0
> > > +
> > > +title: Freescale Smart Direct Memory Access (SDMA) Controller for
> > > +i.MX
> > > +
> > > +maintainers:
> > > + - Joy Zou <joy.zou@nxp.com>
> > > +
> > > +properties:
> >
> > Is it sensible to add something like this?
> >
> > $nodename:
> > pattern: "^dma-controller(@.*)?$"
> >
> > You are changing the node names in patch 3 anyway.
> Yes, it is sensible to add $nodename. Because I have deleted the dma-controller quotes.
> I follow the dma-controller $nodename. I think it is general. So changing the node name.
> I will add it next version.
> Thanks for your comments!
Instead, just add:
allOf:
- $ref: dma-controller.yaml#
That will do the same thing.
With that,
Reviewed-by: Rob Herring <robh@kernel.org>
Rob
^ permalink raw reply [flat|nested] 12+ messages in thread
* RE: [EXT] Re: [PATCH v6 1/4] dt-bindings: fsl-imx-sdma: Convert imx sdma to DT schema
2022-09-06 16:25 ` Rob Herring
@ 2022-09-07 6:48 ` Joy Zou
0 siblings, 0 replies; 12+ messages in thread
From: Joy Zou @ 2022-09-07 6:48 UTC (permalink / raw)
To: Rob Herring
Cc: Alexander Stein, vkoul, krzysztof.kozlowski+dt, shawnguo,
s.hauer, kernel, festevam, S.J. Wang, martink, dev, Peng Fan,
david, aford173, Hongxing Zhu, dl-linux-imx, dmaengine,
devicetree, linux-arm-kernel, linux-kernel
> -----Original Message-----
> From: Rob Herring <robh@kernel.org>
> Sent: 2022年9月7日 0:26
> To: Joy Zou <joy.zou@nxp.com>
> Cc: Alexander Stein <alexander.stein@ew.tq-group.com>; vkoul@kernel.org;
> krzysztof.kozlowski+dt@linaro.org; shawnguo@kernel.org;
> s.hauer@pengutronix.de; kernel@pengutronix.de; festevam@gmail.com; S.J.
> Wang <shengjiu.wang@nxp.com>; martink@posteo.de; dev@lynxeye.de; Peng
> Fan <peng.fan@nxp.com>; david@ixit.cz; aford173@gmail.com; Hongxing Zhu
> <hongxing.zhu@nxp.com>; dl-linux-imx <linux-imx@nxp.com>;
> dmaengine@vger.kernel.org; devicetree@vger.kernel.org;
> linux-arm-kernel@lists.infradead.org; linux-kernel@vger.kernel.org
> Subject: Re: [EXT] Re: [PATCH v6 1/4] dt-bindings: fsl-imx-sdma: Convert imx
> sdma to DT schema
>
> Caution: EXT Email
>
> On Tue, Sep 06, 2022 at 11:13:41AM +0000, Joy Zou wrote:
> >
> > > -----Original Message-----
> > > From: Alexander Stein <alexander.stein@ew.tq-group.com>
> > > Sent: 2022年9月6日 18:55
> > > To: Joy Zou <joy.zou@nxp.com>
> > > Cc: vkoul@kernel.org; robh+dt@kernel.org;
> > > krzysztof.kozlowski+dt@linaro.org;
> > > shawnguo@kernel.org; s.hauer@pengutronix.de; kernel@pengutronix.de;
> > > festevam@gmail.com; S.J. Wang <shengjiu.wang@nxp.com>;
> > > martink@posteo.de; dev@lynxeye.de; Peng Fan <peng.fan@nxp.com>;
> > > david@ixit.cz; aford173@gmail.com; Hongxing Zhu
> > > <hongxing.zhu@nxp.com>; dl-linux-imx <linux-imx@nxp.com>;
> > > dmaengine@vger.kernel.org; devicetree@vger.kernel.org;
> > > linux-arm-kernel@lists.infradead.org;
> > > linux-kernel@vger.kernel.org
> > > Subject: [EXT] Re: [PATCH v6 1/4] dt-bindings: fsl-imx-sdma: Convert
> > > imx sdma to DT schema
> > >
> > > Caution: EXT Email
> > >
> > > Hi,
> > >
> > > thanks for the YAML conversion patch.
> > >
> > > Am Dienstag, 6. September 2022, 11:42:53 CEST schrieb Joy Zou:
> > > > Convert the i.MX SDMA binding to DT schema format using json-schema.
> > > >
> > > > The compatibles fsl,imx31-to1-sdma, fsl,imx31-to2-sdma,
> > > > fsl,imx35-to1-sdma and fsl,imx35-to2-sdma are not used. So need to
> > > > delete it. The compatibles fsl,imx50-sdma, fsl,imx6sll-sdma and
> > > > fsl,imx6sl-sdma are added. The original binding don't list all compatible
> used.
> > > >
> > > > In addition, add new peripheral types HDMI Audio.
> > > >
> > > > Signed-off-by: Joy Zou <joy.zou@nxp.com>
> > > > ---
> > > > Changes in v6:
> > > > delete tag Acked-by from commit message.
> > > >
> > > > Changes in v5:
> > > > modify the commit message fromat.
> > > > add additionalProperties, because delete the quotes in patch v4.
> > > > delete unevaluatedProperties due to similar to additionalProperties.
> > > > modification fsl,sdma-event-remap items and description.
> > > >
> > > > Changes in v4:
> > > > modify the commit message.
> > > > delete the quotes in patch.
> > > > modify the compatible in patch.
> > > > delete maxitems and add items for clock-names property.
> > > > add iram property.
> > > >
> > > > Changes in v3:
> > > > modify the commit message.
> > > > modify the filename.
> > > > modify the maintainer.
> > > > delete the unnecessary comment.
> > > > modify the compatible and run dt_binding_check and dtbs_check.
> > > > add clocks and clock-names property.
> > > > delete the reg description and add maxItems.
> > > > delete the interrupts description and add maxItems.
> > > > add ref for gpr property.
> > > > modify the fsl,sdma-event-remap ref type and add items.
> > > > delete consumer example.
> > > >
> > > > Changes in v2:
> > > > convert imx sdma bindings to DT schema.
> > > > ---
> > > > .../devicetree/bindings/dma/fsl,imx-sdma.yaml | 147
> > > > ++++++++++++++++++ .../devicetree/bindings/dma/fsl-imx-sdma.txt
> > > > ++++++++++++++++++ |
> > > > 118 --------------
> > > > 2 files changed, 147 insertions(+), 118 deletions(-) create mode
> > > > 100644 Documentation/devicetree/bindings/dma/fsl,imx-sdma.yaml
> > > > delete mode 100644
> > > > Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt
> > > >
> > > > diff --git
> > > > a/Documentation/devicetree/bindings/dma/fsl,imx-sdma.yaml
> > > > b/Documentation/devicetree/bindings/dma/fsl,imx-sdma.yaml new file
> > > > mode
> > > > 100644
> > > > index 000000000000..3da65d3ea4af
> > > > --- /dev/null
> > > > +++ b/Documentation/devicetree/bindings/dma/fsl,imx-sdma.yaml
> > > > @@ -0,0 +1,147 @@
> > > > +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause %YAML 1.2
> > > > +---
> > > > +$id:
> > > > +https://eur01.safelinks.protection.outlook.com/?url=http%3A%2F%2F
> > > > +devi
> > > >
> > >
> +cetree.org%2Fschemas%2Fdma%2Ffsl%2Cimx-sdma.yaml%23&data=05
> > > %7C01%
> > > >
> > >
> +7Cjoy.zou%40nxp.com%7Cc7a8409ee52447126b2908da8ff649db%7C686ea
> > > 1d3bc2b
> > > >
> > >
> +4c6fa92cd99c5c301635%7C0%7C0%7C637980585219845112%7CUnknown
> > > %7CTWFpbGZ
> > > >
> > >
> +sb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6M
> > > n0%
> > > >
> > >
> +3D%7C3000%7C%7C%7C&sdata=XHRpq%2BiZpXdB7Yw4gZRONgWMn7
> > > KiSxM9yBES7R
> > > > +H0iNc%3D&reserved=0
> > > > +$schema:
> > > > +https://eur01.safelinks.protection.outlook.com/?url=http%3A%2F%2F
> > > > +devi
> > > >
> > >
> +cetree.org%2Fmeta-schemas%2Fcore.yaml%23&data=05%7C01%7Cjoy.z
> > > ou%4
> > > >
> > >
> +0nxp.com%7Cc7a8409ee52447126b2908da8ff649db%7C686ea1d3bc2b4c6f
> > > a92cd99
> > > >
> > >
> +c5c301635%7C0%7C0%7C637980585220001350%7CUnknown%7CTWFpbG
> > > Zsb3d8eyJWIj
> > > >
> > >
> +oiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3
> > > 000%7
> > > >
> > >
> +C%7C%7C&sdata=6albMSOV7dsgaHuDk05ZUtAiMTlwYX6QyHrfXWz7%2
> > > BmY%3D&am
> > > > +p;reserved=0
> > > > +
> > > > +title: Freescale Smart Direct Memory Access (SDMA) Controller for
> > > > +i.MX
> > > > +
> > > > +maintainers:
> > > > + - Joy Zou <joy.zou@nxp.com>
> > > > +
> > > > +properties:
> > >
> > > Is it sensible to add something like this?
> > >
> > > $nodename:
> > > pattern: "^dma-controller(@.*)?$"
> > >
> > > You are changing the node names in patch 3 anyway.
> > Yes, it is sensible to add $nodename. Because I have deleted the
> dma-controller quotes.
> > I follow the dma-controller $nodename. I think it is general. So changing the
> node name.
> > I will add it next version.
> > Thanks for your comments!
>
> Instead, just add:
>
> allOf:
> - $ref: dma-controller.yaml#
I will add the quotes in next version.
Thank you very much!
BR
Joy Zou
>
>
> That will do the same thing.
>
> With that,
>
> Reviewed-by: Rob Herring <robh@kernel.org>
>
> Rob
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v6 1/4] dt-bindings: fsl-imx-sdma: Convert imx sdma to DT schema
2022-09-06 10:55 ` Alexander Stein
2022-09-06 11:13 ` [EXT] " Joy Zou
@ 2022-09-07 11:12 ` Krzysztof Kozlowski
1 sibling, 0 replies; 12+ messages in thread
From: Krzysztof Kozlowski @ 2022-09-07 11:12 UTC (permalink / raw)
To: Alexander Stein, Joy Zou
Cc: vkoul, robh+dt, krzysztof.kozlowski+dt, shawnguo, s.hauer,
kernel, festevam, shengjiu.wang, martink, dev, peng.fan, david,
aford173, hongxing.zhu, linux-imx, dmaengine, devicetree,
linux-arm-kernel, linux-kernel
On 06/09/2022 12:55, Alexander Stein wrote:
> Hi,
>
> thanks for the YAML conversion patch.
>
> Am Dienstag, 6. September 2022, 11:42:53 CEST schrieb Joy Zou:
>> Convert the i.MX SDMA binding to DT schema format using json-schema.
>>
>> The compatibles fsl,imx31-to1-sdma, fsl,imx31-to2-sdma, fsl,imx35-to1-sdma
>> and fsl,imx35-to2-sdma are not used. So need to delete it. The compatibles
>> fsl,imx50-sdma, fsl,imx6sll-sdma and fsl,imx6sl-sdma are added. The
>> original binding don't list all compatible used.
>>
>> In addition, add new peripheral types HDMI Audio.
>>
>> Signed-off-by: Joy Zou <joy.zou@nxp.com>
>> ---
>> Changes in v6:
>> delete tag Acked-by from commit message.
>>
>> Changes in v5:
>> modify the commit message fromat.
>> add additionalProperties, because delete the quotes in patch v4.
>> delete unevaluatedProperties due to similar to additionalProperties.
>> modification fsl,sdma-event-remap items and description.
>>
>> Changes in v4:
>> modify the commit message.
>> delete the quotes in patch.
>> modify the compatible in patch.
>> delete maxitems and add items for clock-names property.
>> add iram property.
>>
>> Changes in v3:
>> modify the commit message.
>> modify the filename.
>> modify the maintainer.
>> delete the unnecessary comment.
>> modify the compatible and run dt_binding_check and dtbs_check.
>> add clocks and clock-names property.
>> delete the reg description and add maxItems.
>> delete the interrupts description and add maxItems.
>> add ref for gpr property.
>> modify the fsl,sdma-event-remap ref type and add items.
>> delete consumer example.
>>
>> Changes in v2:
>> convert imx sdma bindings to DT schema.
>> ---
>> .../devicetree/bindings/dma/fsl,imx-sdma.yaml | 147 ++++++++++++++++++
>> .../devicetree/bindings/dma/fsl-imx-sdma.txt | 118 --------------
>> 2 files changed, 147 insertions(+), 118 deletions(-)
>> create mode 100644 Documentation/devicetree/bindings/dma/fsl,imx-sdma.yaml
>> delete mode 100644 Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt
>>
>> diff --git a/Documentation/devicetree/bindings/dma/fsl,imx-sdma.yaml
>> b/Documentation/devicetree/bindings/dma/fsl,imx-sdma.yaml new file mode
>> 100644
>> index 000000000000..3da65d3ea4af
>> --- /dev/null
>> +++ b/Documentation/devicetree/bindings/dma/fsl,imx-sdma.yaml
>> @@ -0,0 +1,147 @@
>> +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
>> +%YAML 1.2
>> +---
>> +$id: http://devicetree.org/schemas/dma/fsl,imx-sdma.yaml#
>> +$schema: http://devicetree.org/meta-schemas/core.yaml#
>> +
>> +title: Freescale Smart Direct Memory Access (SDMA) Controller for i.MX
>> +
>> +maintainers:
>> + - Joy Zou <joy.zou@nxp.com>
>> +
>> +properties:
>
> Is it sensible to add something like this?
>
> $nodename:
> pattern: "^dma-controller(@.*)?$"
>
> You are changing the node names in patch 3 anyway.
>
No, the device schemas do not need to enforce the name. The
dma-controller schema enforces it, so what is missing here is to
reference it.
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v6 2/4] dmaengine: imx-sdma: support hdmi audio
2022-09-06 9:42 [PATCH v6 0/4] dmaengine: sdma support hdmi audio Joy Zou
2022-09-06 9:42 ` [PATCH v6 1/4] dt-bindings: fsl-imx-sdma: Convert imx sdma to DT schema Joy Zou
@ 2022-09-06 9:42 ` Joy Zou
2022-10-19 14:24 ` Vinod Koul
2022-09-06 9:42 ` [PATCH v6 3/4] ARM: dts: imx: update sdma node name format Joy Zou
2022-09-06 9:42 ` [PATCH v6 4/4] arm64: dts: imx8mq: " Joy Zou
3 siblings, 1 reply; 12+ messages in thread
From: Joy Zou @ 2022-09-06 9:42 UTC (permalink / raw)
To: vkoul, robh+dt, krzysztof.kozlowski+dt, shawnguo, s.hauer,
kernel, festevam
Cc: shengjiu.wang, martink, dev, alexander.stein, peng.fan, david,
aford173, hongxing.zhu, linux-imx, dmaengine, devicetree,
linux-arm-kernel, linux-kernel
Add hdmi audio support in sdma.
Signed-off-by: Joy Zou <joy.zou@nxp.com>
---
drivers/dma/imx-sdma.c | 38 +++++++++++++++++++++++++++++--------
include/linux/dma/imx-dma.h | 1 +
2 files changed, 31 insertions(+), 8 deletions(-)
diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
index fbea5f62dd98..ab877ceeac3f 100644
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@ -954,7 +954,10 @@ static irqreturn_t sdma_int_handler(int irq, void *dev_id)
desc = sdmac->desc;
if (desc) {
if (sdmac->flags & IMX_DMA_SG_LOOP) {
- sdma_update_channel_loop(sdmac);
+ if (sdmac->peripheral_type != IMX_DMATYPE_HDMI)
+ sdma_update_channel_loop(sdmac);
+ else
+ vchan_cyclic_callback(&desc->vd);
} else {
mxc_sdma_handle_channel_normal(sdmac);
vchan_cookie_complete(&desc->vd);
@@ -1074,6 +1077,10 @@ static int sdma_get_pc(struct sdma_channel *sdmac,
per_2_emi = sdma->script_addrs->sai_2_mcu_addr;
emi_2_per = sdma->script_addrs->mcu_2_sai_addr;
break;
+ case IMX_DMATYPE_HDMI:
+ emi_2_per = sdma->script_addrs->hdmi_dma_addr;
+ sdmac->is_ram_script = true;
+ break;
default:
dev_err(sdma->dev, "Unsupported transfer type %d\n",
peripheral_type);
@@ -1125,11 +1132,16 @@ static int sdma_load_context(struct sdma_channel *sdmac)
/* Send by context the event mask,base address for peripheral
* and watermark level
*/
- context->gReg[0] = sdmac->event_mask[1];
- context->gReg[1] = sdmac->event_mask[0];
- context->gReg[2] = sdmac->per_addr;
- context->gReg[6] = sdmac->shp_addr;
- context->gReg[7] = sdmac->watermark_level;
+ if (sdmac->peripheral_type == IMX_DMATYPE_HDMI) {
+ context->gReg[4] = sdmac->per_addr;
+ context->gReg[6] = sdmac->shp_addr;
+ } else {
+ context->gReg[0] = sdmac->event_mask[1];
+ context->gReg[1] = sdmac->event_mask[0];
+ context->gReg[2] = sdmac->per_addr;
+ context->gReg[6] = sdmac->shp_addr;
+ context->gReg[7] = sdmac->watermark_level;
+ }
bd0->mode.command = C0_SETDM;
bd0->mode.status = BD_DONE | BD_WRAP | BD_EXTD;
@@ -1513,7 +1525,7 @@ static struct sdma_desc *sdma_transfer_init(struct sdma_channel *sdmac,
desc->sdmac = sdmac;
desc->num_bd = bds;
- if (sdma_alloc_bd(desc))
+ if (bds && sdma_alloc_bd(desc))
goto err_desc_out;
/* No slave_config called in MEMCPY case, so do here */
@@ -1678,13 +1690,16 @@ static struct dma_async_tx_descriptor *sdma_prep_dma_cyclic(
{
struct sdma_channel *sdmac = to_sdma_chan(chan);
struct sdma_engine *sdma = sdmac->sdma;
- int num_periods = buf_len / period_len;
+ int num_periods = 0;
int channel = sdmac->channel;
int i = 0, buf = 0;
struct sdma_desc *desc;
dev_dbg(sdma->dev, "%s channel: %d\n", __func__, channel);
+ if (sdmac->peripheral_type != IMX_DMATYPE_HDMI)
+ num_periods = buf_len / period_len;
+
sdma_config_write(chan, &sdmac->slave_config, direction);
desc = sdma_transfer_init(sdmac, direction, num_periods);
@@ -1701,6 +1716,9 @@ static struct dma_async_tx_descriptor *sdma_prep_dma_cyclic(
goto err_bd_out;
}
+ if (sdmac->peripheral_type == IMX_DMATYPE_HDMI)
+ return vchan_tx_prep(&sdmac->vc, &desc->vd, flags);
+
while (buf < buf_len) {
struct sdma_buffer_descriptor *bd = &desc->bd[i];
int param;
@@ -1761,6 +1779,10 @@ static int sdma_config_write(struct dma_chan *chan,
sdmac->watermark_level |= (dmaengine_cfg->dst_maxburst << 16) &
SDMA_WATERMARK_LEVEL_HWML;
sdmac->word_size = dmaengine_cfg->dst_addr_width;
+ } else if (sdmac->peripheral_type == IMX_DMATYPE_HDMI) {
+ sdmac->per_address = dmaengine_cfg->dst_addr;
+ sdmac->per_address2 = dmaengine_cfg->src_addr;
+ sdmac->watermark_level = 0;
} else {
sdmac->per_address = dmaengine_cfg->dst_addr;
sdmac->watermark_level = dmaengine_cfg->dst_maxburst *
diff --git a/include/linux/dma/imx-dma.h b/include/linux/dma/imx-dma.h
index f487a4fa103a..cfec5f946e23 100644
--- a/include/linux/dma/imx-dma.h
+++ b/include/linux/dma/imx-dma.h
@@ -40,6 +40,7 @@ enum sdma_peripheral_type {
IMX_DMATYPE_ASRC_SP, /* Shared ASRC */
IMX_DMATYPE_SAI, /* SAI */
IMX_DMATYPE_MULTI_SAI, /* MULTI FIFOs For Audio */
+ IMX_DMATYPE_HDMI, /* HDMI Audio */
};
enum imx_dma_prio {
--
2.37.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH v6 2/4] dmaengine: imx-sdma: support hdmi audio
2022-09-06 9:42 ` [PATCH v6 2/4] dmaengine: imx-sdma: support hdmi audio Joy Zou
@ 2022-10-19 14:24 ` Vinod Koul
2022-10-20 10:19 ` [EXT] " Joy Zou
0 siblings, 1 reply; 12+ messages in thread
From: Vinod Koul @ 2022-10-19 14:24 UTC (permalink / raw)
To: Joy Zou
Cc: robh+dt, krzysztof.kozlowski+dt, shawnguo, s.hauer, kernel,
festevam, shengjiu.wang, martink, dev, alexander.stein, peng.fan,
david, aford173, hongxing.zhu, linux-imx, dmaengine, devicetree,
linux-arm-kernel, linux-kernel
On 06-09-22, 17:42, Joy Zou wrote:
> Add hdmi audio support in sdma.
Pls add description in changelog about what it takes to enabled hdmi
(cyclic support etc)
>
> Signed-off-by: Joy Zou <joy.zou@nxp.com>
> ---
> drivers/dma/imx-sdma.c | 38 +++++++++++++++++++++++++++++--------
> include/linux/dma/imx-dma.h | 1 +
> 2 files changed, 31 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
> index fbea5f62dd98..ab877ceeac3f 100644
> --- a/drivers/dma/imx-sdma.c
> +++ b/drivers/dma/imx-sdma.c
> @@ -954,7 +954,10 @@ static irqreturn_t sdma_int_handler(int irq, void *dev_id)
> desc = sdmac->desc;
> if (desc) {
> if (sdmac->flags & IMX_DMA_SG_LOOP) {
> - sdma_update_channel_loop(sdmac);
> + if (sdmac->peripheral_type != IMX_DMATYPE_HDMI)
> + sdma_update_channel_loop(sdmac);
> + else
> + vchan_cyclic_callback(&desc->vd);
> } else {
> mxc_sdma_handle_channel_normal(sdmac);
> vchan_cookie_complete(&desc->vd);
> @@ -1074,6 +1077,10 @@ static int sdma_get_pc(struct sdma_channel *sdmac,
> per_2_emi = sdma->script_addrs->sai_2_mcu_addr;
> emi_2_per = sdma->script_addrs->mcu_2_sai_addr;
> break;
> + case IMX_DMATYPE_HDMI:
> + emi_2_per = sdma->script_addrs->hdmi_dma_addr;
> + sdmac->is_ram_script = true;
> + break;
> default:
> dev_err(sdma->dev, "Unsupported transfer type %d\n",
> peripheral_type);
> @@ -1125,11 +1132,16 @@ static int sdma_load_context(struct sdma_channel *sdmac)
> /* Send by context the event mask,base address for peripheral
> * and watermark level
> */
> - context->gReg[0] = sdmac->event_mask[1];
> - context->gReg[1] = sdmac->event_mask[0];
> - context->gReg[2] = sdmac->per_addr;
> - context->gReg[6] = sdmac->shp_addr;
> - context->gReg[7] = sdmac->watermark_level;
> + if (sdmac->peripheral_type == IMX_DMATYPE_HDMI) {
> + context->gReg[4] = sdmac->per_addr;
> + context->gReg[6] = sdmac->shp_addr;
> + } else {
> + context->gReg[0] = sdmac->event_mask[1];
> + context->gReg[1] = sdmac->event_mask[0];
> + context->gReg[2] = sdmac->per_addr;
> + context->gReg[6] = sdmac->shp_addr;
> + context->gReg[7] = sdmac->watermark_level;
> + }
>
> bd0->mode.command = C0_SETDM;
> bd0->mode.status = BD_DONE | BD_WRAP | BD_EXTD;
> @@ -1513,7 +1525,7 @@ static struct sdma_desc *sdma_transfer_init(struct sdma_channel *sdmac,
> desc->sdmac = sdmac;
> desc->num_bd = bds;
>
> - if (sdma_alloc_bd(desc))
> + if (bds && sdma_alloc_bd(desc))
> goto err_desc_out;
>
> /* No slave_config called in MEMCPY case, so do here */
> @@ -1678,13 +1690,16 @@ static struct dma_async_tx_descriptor *sdma_prep_dma_cyclic(
> {
> struct sdma_channel *sdmac = to_sdma_chan(chan);
> struct sdma_engine *sdma = sdmac->sdma;
> - int num_periods = buf_len / period_len;
> + int num_periods = 0;
> int channel = sdmac->channel;
> int i = 0, buf = 0;
> struct sdma_desc *desc;
>
> dev_dbg(sdma->dev, "%s channel: %d\n", __func__, channel);
>
> + if (sdmac->peripheral_type != IMX_DMATYPE_HDMI)
> + num_periods = buf_len / period_len;
> +
> sdma_config_write(chan, &sdmac->slave_config, direction);
>
> desc = sdma_transfer_init(sdmac, direction, num_periods);
> @@ -1701,6 +1716,9 @@ static struct dma_async_tx_descriptor *sdma_prep_dma_cyclic(
> goto err_bd_out;
> }
>
> + if (sdmac->peripheral_type == IMX_DMATYPE_HDMI)
> + return vchan_tx_prep(&sdmac->vc, &desc->vd, flags);
> +
> while (buf < buf_len) {
> struct sdma_buffer_descriptor *bd = &desc->bd[i];
> int param;
> @@ -1761,6 +1779,10 @@ static int sdma_config_write(struct dma_chan *chan,
> sdmac->watermark_level |= (dmaengine_cfg->dst_maxburst << 16) &
> SDMA_WATERMARK_LEVEL_HWML;
> sdmac->word_size = dmaengine_cfg->dst_addr_width;
> + } else if (sdmac->peripheral_type == IMX_DMATYPE_HDMI) {
> + sdmac->per_address = dmaengine_cfg->dst_addr;
> + sdmac->per_address2 = dmaengine_cfg->src_addr;
> + sdmac->watermark_level = 0;
> } else {
> sdmac->per_address = dmaengine_cfg->dst_addr;
> sdmac->watermark_level = dmaengine_cfg->dst_maxburst *
> diff --git a/include/linux/dma/imx-dma.h b/include/linux/dma/imx-dma.h
> index f487a4fa103a..cfec5f946e23 100644
> --- a/include/linux/dma/imx-dma.h
> +++ b/include/linux/dma/imx-dma.h
> @@ -40,6 +40,7 @@ enum sdma_peripheral_type {
> IMX_DMATYPE_ASRC_SP, /* Shared ASRC */
> IMX_DMATYPE_SAI, /* SAI */
> IMX_DMATYPE_MULTI_SAI, /* MULTI FIFOs For Audio */
> + IMX_DMATYPE_HDMI, /* HDMI Audio */
> };
>
> enum imx_dma_prio {
> --
> 2.37.1
--
~Vinod
^ permalink raw reply [flat|nested] 12+ messages in thread* RE: [EXT] Re: [PATCH v6 2/4] dmaengine: imx-sdma: support hdmi audio
2022-10-19 14:24 ` Vinod Koul
@ 2022-10-20 10:19 ` Joy Zou
0 siblings, 0 replies; 12+ messages in thread
From: Joy Zou @ 2022-10-20 10:19 UTC (permalink / raw)
To: Vinod Koul
Cc: robh+dt, krzysztof.kozlowski+dt, shawnguo, s.hauer, kernel,
festevam, S.J. Wang, martink, dev, alexander.stein, Peng Fan,
david, aford173, Hongxing Zhu, dl-linux-imx, dmaengine,
devicetree, linux-arm-kernel, linux-kernel
> -----Original Message-----
> From: Vinod Koul <vkoul@kernel.org>
> Sent: 2022年10月19日 22:25
> To: Joy Zou <joy.zou@nxp.com>
> Cc: robh+dt@kernel.org; krzysztof.kozlowski+dt@linaro.org;
> shawnguo@kernel.org; s.hauer@pengutronix.de; kernel@pengutronix.de;
> festevam@gmail.com; S.J. Wang <shengjiu.wang@nxp.com>;
> martink@posteo.de; dev@lynxeye.de; alexander.stein@ew.tq-group.com;
> Peng Fan <peng.fan@nxp.com>; david@ixit.cz; aford173@gmail.com;
> Hongxing Zhu <hongxing.zhu@nxp.com>; dl-linux-imx <linux-imx@nxp.com>;
> dmaengine@vger.kernel.org; devicetree@vger.kernel.org;
> linux-arm-kernel@lists.infradead.org; linux-kernel@vger.kernel.org
> Subject: [EXT] Re: [PATCH v6 2/4] dmaengine: imx-sdma: support hdmi audio
>
> Caution: EXT Email
>
> On 06-09-22, 17:42, Joy Zou wrote:
> > Add hdmi audio support in sdma.
>
> Pls add description in changelog about what it takes to enabled hdmi (cyclic
> support etc)
Thank you very much for your comments.
I have changed commit message in patch v7.
BR
Joy Zou
>
> >
> > Signed-off-by: Joy Zou <joy.zou@nxp.com>
> > ---
> > drivers/dma/imx-sdma.c | 38
> +++++++++++++++++++++++++++++--------
> > include/linux/dma/imx-dma.h | 1 +
> > 2 files changed, 31 insertions(+), 8 deletions(-)
> >
> > diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index
> > fbea5f62dd98..ab877ceeac3f 100644
> > --- a/drivers/dma/imx-sdma.c
> > +++ b/drivers/dma/imx-sdma.c
> > @@ -954,7 +954,10 @@ static irqreturn_t sdma_int_handler(int irq, void
> *dev_id)
> > desc = sdmac->desc;
> > if (desc) {
> > if (sdmac->flags & IMX_DMA_SG_LOOP) {
> > - sdma_update_channel_loop(sdmac);
> > + if (sdmac->peripheral_type !=
> IMX_DMATYPE_HDMI)
> > +
> sdma_update_channel_loop(sdmac);
> > + else
> > +
> > + vchan_cyclic_callback(&desc->vd);
> > } else {
> >
> mxc_sdma_handle_channel_normal(sdmac);
> > vchan_cookie_complete(&desc->vd);
> @@
> > -1074,6 +1077,10 @@ static int sdma_get_pc(struct sdma_channel *sdmac,
> > per_2_emi = sdma->script_addrs->sai_2_mcu_addr;
> > emi_2_per = sdma->script_addrs->mcu_2_sai_addr;
> > break;
> > + case IMX_DMATYPE_HDMI:
> > + emi_2_per = sdma->script_addrs->hdmi_dma_addr;
> > + sdmac->is_ram_script = true;
> > + break;
> > default:
> > dev_err(sdma->dev, "Unsupported transfer type %d\n",
> > peripheral_type); @@ -1125,11 +1132,16 @@
> static
> > int sdma_load_context(struct sdma_channel *sdmac)
> > /* Send by context the event mask,base address for peripheral
> > * and watermark level
> > */
> > - context->gReg[0] = sdmac->event_mask[1];
> > - context->gReg[1] = sdmac->event_mask[0];
> > - context->gReg[2] = sdmac->per_addr;
> > - context->gReg[6] = sdmac->shp_addr;
> > - context->gReg[7] = sdmac->watermark_level;
> > + if (sdmac->peripheral_type == IMX_DMATYPE_HDMI) {
> > + context->gReg[4] = sdmac->per_addr;
> > + context->gReg[6] = sdmac->shp_addr;
> > + } else {
> > + context->gReg[0] = sdmac->event_mask[1];
> > + context->gReg[1] = sdmac->event_mask[0];
> > + context->gReg[2] = sdmac->per_addr;
> > + context->gReg[6] = sdmac->shp_addr;
> > + context->gReg[7] = sdmac->watermark_level;
> > + }
> >
> > bd0->mode.command = C0_SETDM;
> > bd0->mode.status = BD_DONE | BD_WRAP | BD_EXTD; @@ -1513,7
> > +1525,7 @@ static struct sdma_desc *sdma_transfer_init(struct
> sdma_channel *sdmac,
> > desc->sdmac = sdmac;
> > desc->num_bd = bds;
> >
> > - if (sdma_alloc_bd(desc))
> > + if (bds && sdma_alloc_bd(desc))
> > goto err_desc_out;
> >
> > /* No slave_config called in MEMCPY case, so do here */ @@
> > -1678,13 +1690,16 @@ static struct dma_async_tx_descriptor
> > *sdma_prep_dma_cyclic( {
> > struct sdma_channel *sdmac = to_sdma_chan(chan);
> > struct sdma_engine *sdma = sdmac->sdma;
> > - int num_periods = buf_len / period_len;
> > + int num_periods = 0;
> > int channel = sdmac->channel;
> > int i = 0, buf = 0;
> > struct sdma_desc *desc;
> >
> > dev_dbg(sdma->dev, "%s channel: %d\n", __func__, channel);
> >
> > + if (sdmac->peripheral_type != IMX_DMATYPE_HDMI)
> > + num_periods = buf_len / period_len;
> > +
> > sdma_config_write(chan, &sdmac->slave_config, direction);
> >
> > desc = sdma_transfer_init(sdmac, direction, num_periods); @@
> > -1701,6 +1716,9 @@ static struct dma_async_tx_descriptor
> *sdma_prep_dma_cyclic(
> > goto err_bd_out;
> > }
> >
> > + if (sdmac->peripheral_type == IMX_DMATYPE_HDMI)
> > + return vchan_tx_prep(&sdmac->vc, &desc->vd, flags);
> > +
> > while (buf < buf_len) {
> > struct sdma_buffer_descriptor *bd = &desc->bd[i];
> > int param;
> > @@ -1761,6 +1779,10 @@ static int sdma_config_write(struct dma_chan
> *chan,
> > sdmac->watermark_level |= (dmaengine_cfg->dst_maxburst
> << 16) &
> > SDMA_WATERMARK_LEVEL_HWML;
> > sdmac->word_size = dmaengine_cfg->dst_addr_width;
> > + } else if (sdmac->peripheral_type == IMX_DMATYPE_HDMI) {
> > + sdmac->per_address = dmaengine_cfg->dst_addr;
> > + sdmac->per_address2 = dmaengine_cfg->src_addr;
> > + sdmac->watermark_level = 0;
> > } else {
> > sdmac->per_address = dmaengine_cfg->dst_addr;
> > sdmac->watermark_level = dmaengine_cfg->dst_maxburst *
> > diff --git a/include/linux/dma/imx-dma.h b/include/linux/dma/imx-dma.h
> > index f487a4fa103a..cfec5f946e23 100644
> > --- a/include/linux/dma/imx-dma.h
> > +++ b/include/linux/dma/imx-dma.h
> > @@ -40,6 +40,7 @@ enum sdma_peripheral_type {
> > IMX_DMATYPE_ASRC_SP, /* Shared ASRC */
> > IMX_DMATYPE_SAI, /* SAI */
> > IMX_DMATYPE_MULTI_SAI, /* MULTI FIFOs For Audio */
> > + IMX_DMATYPE_HDMI, /* HDMI Audio */
> > };
> >
> > enum imx_dma_prio {
> > --
> > 2.37.1
>
> --
> ~Vinod
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v6 3/4] ARM: dts: imx: update sdma node name format
2022-09-06 9:42 [PATCH v6 0/4] dmaengine: sdma support hdmi audio Joy Zou
2022-09-06 9:42 ` [PATCH v6 1/4] dt-bindings: fsl-imx-sdma: Convert imx sdma to DT schema Joy Zou
2022-09-06 9:42 ` [PATCH v6 2/4] dmaengine: imx-sdma: support hdmi audio Joy Zou
@ 2022-09-06 9:42 ` Joy Zou
2022-09-06 9:42 ` [PATCH v6 4/4] arm64: dts: imx8mq: " Joy Zou
3 siblings, 0 replies; 12+ messages in thread
From: Joy Zou @ 2022-09-06 9:42 UTC (permalink / raw)
To: vkoul, robh+dt, krzysztof.kozlowski+dt, shawnguo, s.hauer,
kernel, festevam
Cc: shengjiu.wang, martink, dev, alexander.stein, peng.fan, david,
aford173, hongxing.zhu, linux-imx, dmaengine, devicetree,
linux-arm-kernel, linux-kernel
Node names should be generic, so change the sdma node name format 'sdma'
into 'dma-controller'.
Signed-off-by: Joy Zou <joy.zou@nxp.com>
---
Changes in v6:
delete tag Acked-by from commit message.
Changes in v5:
modify the commit message.
---
arch/arm/boot/dts/imx25.dtsi | 2 +-
arch/arm/boot/dts/imx31.dtsi | 2 +-
arch/arm/boot/dts/imx35.dtsi | 2 +-
arch/arm/boot/dts/imx50.dtsi | 2 +-
arch/arm/boot/dts/imx51.dtsi | 2 +-
arch/arm/boot/dts/imx53.dtsi | 2 +-
arch/arm/boot/dts/imx6qdl.dtsi | 2 +-
arch/arm/boot/dts/imx6sl.dtsi | 2 +-
arch/arm/boot/dts/imx6sx.dtsi | 2 +-
arch/arm/boot/dts/imx6ul.dtsi | 2 +-
arch/arm/boot/dts/imx7s.dtsi | 2 +-
11 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/arch/arm/boot/dts/imx25.dtsi b/arch/arm/boot/dts/imx25.dtsi
index bc4de0c05511..5f90d72b840b 100644
--- a/arch/arm/boot/dts/imx25.dtsi
+++ b/arch/arm/boot/dts/imx25.dtsi
@@ -515,7 +515,7 @@ gpio2: gpio@53fd0000 {
#interrupt-cells = <2>;
};
- sdma: sdma@53fd4000 {
+ sdma: dma-controller@53fd4000 {
compatible = "fsl,imx25-sdma";
reg = <0x53fd4000 0x4000>;
clocks = <&clks 112>, <&clks 68>;
diff --git a/arch/arm/boot/dts/imx31.dtsi b/arch/arm/boot/dts/imx31.dtsi
index 5c4938b0d5a1..95c05f17a6d5 100644
--- a/arch/arm/boot/dts/imx31.dtsi
+++ b/arch/arm/boot/dts/imx31.dtsi
@@ -297,7 +297,7 @@ gpio2: gpio@53fd0000 {
#interrupt-cells = <2>;
};
- sdma: sdma@53fd4000 {
+ sdma: dma-controller@53fd4000 {
compatible = "fsl,imx31-sdma";
reg = <0x53fd4000 0x4000>;
interrupts = <34>;
diff --git a/arch/arm/boot/dts/imx35.dtsi b/arch/arm/boot/dts/imx35.dtsi
index 8e41c8b7bd70..d650f54c3fc6 100644
--- a/arch/arm/boot/dts/imx35.dtsi
+++ b/arch/arm/boot/dts/imx35.dtsi
@@ -284,7 +284,7 @@ gpio2: gpio@53fd0000 {
#interrupt-cells = <2>;
};
- sdma: sdma@53fd4000 {
+ sdma: dma-controller@53fd4000 {
compatible = "fsl,imx35-sdma";
reg = <0x53fd4000 0x4000>;
clocks = <&clks 9>, <&clks 65>;
diff --git a/arch/arm/boot/dts/imx50.dtsi b/arch/arm/boot/dts/imx50.dtsi
index c0c7575fbecf..3d9a9f37f672 100644
--- a/arch/arm/boot/dts/imx50.dtsi
+++ b/arch/arm/boot/dts/imx50.dtsi
@@ -421,7 +421,7 @@ ecspi2: spi@63fac000 {
status = "disabled";
};
- sdma: sdma@63fb0000 {
+ sdma: dma-controller@63fb0000 {
compatible = "fsl,imx50-sdma", "fsl,imx35-sdma";
reg = <0x63fb0000 0x4000>;
interrupts = <6>;
diff --git a/arch/arm/boot/dts/imx51.dtsi b/arch/arm/boot/dts/imx51.dtsi
index 592d9c23a447..853707574d2e 100644
--- a/arch/arm/boot/dts/imx51.dtsi
+++ b/arch/arm/boot/dts/imx51.dtsi
@@ -504,7 +504,7 @@ ecspi2: spi@83fac000 {
status = "disabled";
};
- sdma: sdma@83fb0000 {
+ sdma: dma-controller@83fb0000 {
compatible = "fsl,imx51-sdma", "fsl,imx35-sdma";
reg = <0x83fb0000 0x4000>;
interrupts = <6>;
diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi
index b7a6469d3472..56b3c13f4eb7 100644
--- a/arch/arm/boot/dts/imx53.dtsi
+++ b/arch/arm/boot/dts/imx53.dtsi
@@ -710,7 +710,7 @@ ecspi2: spi@63fac000 {
status = "disabled";
};
- sdma: sdma@63fb0000 {
+ sdma: dma-controller@63fb0000 {
compatible = "fsl,imx53-sdma", "fsl,imx35-sdma";
reg = <0x63fb0000 0x4000>;
interrupts = <6>;
diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index 4f7fefc14d0a..ff1e0173b39b 100644
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -929,7 +929,7 @@ dcic2: dcic@20e8000 {
interrupts = <0 125 IRQ_TYPE_LEVEL_HIGH>;
};
- sdma: sdma@20ec000 {
+ sdma: dma-controller@20ec000 {
compatible = "fsl,imx6q-sdma", "fsl,imx35-sdma";
reg = <0x020ec000 0x4000>;
interrupts = <0 2 IRQ_TYPE_LEVEL_HIGH>;
diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi
index 06a515121dfc..61dd78467aea 100644
--- a/arch/arm/boot/dts/imx6sl.dtsi
+++ b/arch/arm/boot/dts/imx6sl.dtsi
@@ -747,7 +747,7 @@ spdc: spdc@20e8000 {
interrupts = <0 6 IRQ_TYPE_LEVEL_HIGH>;
};
- sdma: sdma@20ec000 {
+ sdma: dma-controller@20ec000 {
compatible = "fsl,imx6sl-sdma", "fsl,imx6q-sdma";
reg = <0x020ec000 0x4000>;
interrupts = <0 2 IRQ_TYPE_LEVEL_HIGH>;
diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi
index 4d075e2bf749..514ed4dbd6fd 100644
--- a/arch/arm/boot/dts/imx6sx.dtsi
+++ b/arch/arm/boot/dts/imx6sx.dtsi
@@ -842,7 +842,7 @@ gpr: iomuxc-gpr@20e4000 {
reg = <0x020e4000 0x4000>;
};
- sdma: sdma@20ec000 {
+ sdma: dma-controller@20ec000 {
compatible = "fsl,imx6sx-sdma", "fsl,imx6q-sdma";
reg = <0x020ec000 0x4000>;
interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;
diff --git a/arch/arm/boot/dts/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi
index c95efd1d8c2d..2b5996395701 100644
--- a/arch/arm/boot/dts/imx6ul.dtsi
+++ b/arch/arm/boot/dts/imx6ul.dtsi
@@ -744,7 +744,7 @@ gpt2: timer@20e8000 {
status = "disabled";
};
- sdma: sdma@20ec000 {
+ sdma: dma-controller@20ec000 {
compatible = "fsl,imx6ul-sdma", "fsl,imx6q-sdma",
"fsl,imx35-sdma";
reg = <0x020ec000 0x4000>;
diff --git a/arch/arm/boot/dts/imx7s.dtsi b/arch/arm/boot/dts/imx7s.dtsi
index 29148285f9fc..0fc9e6b8b05d 100644
--- a/arch/arm/boot/dts/imx7s.dtsi
+++ b/arch/arm/boot/dts/imx7s.dtsi
@@ -1224,7 +1224,7 @@ qspi: spi@30bb0000 {
status = "disabled";
};
- sdma: sdma@30bd0000 {
+ sdma: dma-controller@30bd0000 {
compatible = "fsl,imx7d-sdma", "fsl,imx35-sdma";
reg = <0x30bd0000 0x10000>;
interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;
--
2.37.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH v6 4/4] arm64: dts: imx8mq: update sdma node name format
2022-09-06 9:42 [PATCH v6 0/4] dmaengine: sdma support hdmi audio Joy Zou
` (2 preceding siblings ...)
2022-09-06 9:42 ` [PATCH v6 3/4] ARM: dts: imx: update sdma node name format Joy Zou
@ 2022-09-06 9:42 ` Joy Zou
3 siblings, 0 replies; 12+ messages in thread
From: Joy Zou @ 2022-09-06 9:42 UTC (permalink / raw)
To: vkoul, robh+dt, krzysztof.kozlowski+dt, shawnguo, s.hauer,
kernel, festevam
Cc: shengjiu.wang, martink, dev, alexander.stein, peng.fan, david,
aford173, hongxing.zhu, linux-imx, dmaengine, devicetree,
linux-arm-kernel, linux-kernel
Node names should be generic, so change the sdma node name format 'sdma'
into 'dma-controller'.
Signed-off-by: Joy Zou <joy.zou@nxp.com>
---
Changes in v5:
modify the commit message.
---
arch/arm64/boot/dts/freescale/imx8mq.dtsi | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/boot/dts/freescale/imx8mq.dtsi b/arch/arm64/boot/dts/freescale/imx8mq.dtsi
index e9f0cdd10ab6..19eaa523564d 100644
--- a/arch/arm64/boot/dts/freescale/imx8mq.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mq.dtsi
@@ -534,7 +534,7 @@ wdog3: watchdog@302a0000 {
status = "disabled";
};
- sdma2: sdma@302c0000 {
+ sdma2: dma-controller@302c0000 {
compatible = "fsl,imx8mq-sdma","fsl,imx7d-sdma";
reg = <0x302c0000 0x10000>;
interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>;
@@ -1302,7 +1302,7 @@ qspi0: spi@30bb0000 {
status = "disabled";
};
- sdma1: sdma@30bd0000 {
+ sdma1: dma-controller@30bd0000 {
compatible = "fsl,imx8mq-sdma","fsl,imx7d-sdma";
reg = <0x30bd0000 0x10000>;
interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;
--
2.37.1
^ permalink raw reply related [flat|nested] 12+ messages in thread