Commit 65163d16 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'dmaengine-fix-6.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine 

Pull dmaengine updates from Vinod Koul:
 "New support:
   - Loongson LS2X APB DMA controller
   - sf-pdma: mpfs-pdma support
   - Qualcomm X1E80100 GPI dma controller support

  Updates:
   - Xilinx XDMA updates to support interleaved DMA transfers
   - TI PSIL threads for AM62P and J722S and cfg register regions
     description
   - axi-dmac Improving the cyclic DMA transfers
   - Tegra Support dma-channel-mask property
   - Remaining platform remove callback returning void conversions

 Driver fixes for:
   - Xilinx xdma driver operator precedence and initialization fix
   - Excess kernel-doc warning fix in imx-sdma xilinx xdma drivers
   - format-overflow warning fix for rz-dmac, sh usb dmac drivers
   - 'output may be truncated' fix for shdma, fsl-qdma and dw-edma
     drivers"

* tag 'dmaengine-fix-6.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine: (58 commits)
  dmaengine: dw-edma: increase size of 'name' in debugfs code
  dmaengine: fsl-qdma: increase size of 'irq_name'
  dmaengine: shdma: increase size of 'dev_id'
  dmaengine: xilinx: xdma: Fix kernel-doc warnings
  dmaengine: usb-dmac: Avoid format-overflow warning
  dmaengine: sh: rz-dmac: Avoid format-overflow warning
  dmaengine: imx-sdma: fix Excess kernel-doc warnings
  dmaengine: xilinx: xdma: Fix initialization location of desc in xdma_channel_isr()
  dmaengine: xilinx: xdma: Fix operator precedence in xdma_prep_interleaved_dma()
  dmaengine: xilinx: xdma: statify xdma_prep_interleaved_dma
  dmaengine: xilinx: xdma: Workaround truncation compilation error
  dmaengine: pl330: issue_pending waits until WFP state
  dmaengine: xilinx: xdma: Implement interleaved DMA transfers
  dmaengine: xilinx: xdma: Prepare the introduction of interleaved DMA transfers
  dmaengine: xilinx: xdma: Add transfer error reporting
  dmaengine: xilinx: xdma: Add error checking in xdma_channel_isr()
  dmaengine: xilinx: xdma: Rework xdma_terminate_all()
  dmaengine: xilinx: xdma: Ease dma_pool alignment requirements
  dmaengine: xilinx: xdma: Add necessary macro definitions
  dmaengine: xilinx: xdma: Get rid of unused code
  ...
parents 80fc600f cb95a4fa

Documentation/devicetree/bindings/dma/dma-controller.yaml

+0 −15
Original line number Diff line number Diff line
@@ -19,19 +19,4 @@ properties: 


additionalProperties: true



examples:

  - |

    dma: dma-controller@48000000 {

        compatible = "ti,omap-sdma";

        reg = <0x48000000 0x1000>;

        interrupts = <0 12 0x4>,

                     <0 13 0x4>,

                     <0 14 0x4>,

                     <0 15 0x4>;

        #dma-cells = <1>;

        dma-channels = <32>;

        dma-requests = <127>;

        dma-channel-mask = <0xfffe>;

    };



...

Documentation/devicetree/bindings/dma/dma-router.yaml

+0 −11
Original line number Diff line number Diff line
@@ -40,15 +40,4 @@ required: 


additionalProperties: true



examples:

  - |

    sdma_xbar: dma-router@4a002b78 {

        compatible = "ti,dra7-dma-crossbar";

        reg = <0x4a002b78 0xfc>;

        #dma-cells = <1>;

        dma-requests = <205>;

        ti,dma-safe-map = <0>;

        dma-masters = <&sdma>;

    };



...

Documentation/devicetree/bindings/dma/loongson,ls2x-apbdma.yaml

0 → 100644
+62 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/dma/loongson,ls2x-apbdma.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Loongson LS2X APB DMA controller



description:

  The Loongson LS2X APB DMA controller is used for transferring data

  between system memory and the peripherals on the APB bus.



maintainers:

  - Binbin Zhou <zhoubinbin@loongson.cn>



allOf:

  - $ref: dma-controller.yaml#



properties:

  compatible:

    oneOf:

      - const: loongson,ls2k1000-apbdma

      - items:

          - const: loongson,ls2k0500-apbdma

          - const: loongson,ls2k1000-apbdma



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



  clocks:

    maxItems: 1



  '#dma-cells':

    const: 1



required:

  - compatible

  - reg

  - interrupts

  - clocks

  - '#dma-cells'



additionalProperties: false



examples:

  - |

    #include <dt-bindings/interrupt-controller/irq.h>

    #include <dt-bindings/clock/loongson,ls2k-clk.h>



    dma-controller@1fe00c00 {

        compatible = "loongson,ls2k1000-apbdma";

        reg = <0x1fe00c00 0x8>;

        interrupt-parent = <&liointc1>;

        interrupts = <12 IRQ_TYPE_LEVEL_HIGH>;

        clocks = <&clk LOONGSON2_APB_CLK>;

        #dma-cells = <1>;

    };



...

Documentation/devicetree/bindings/dma/nvidia,tegra210-adma.yaml

+3 −0
Original line number Diff line number Diff line
@@ -53,6 +53,9 @@ properties: 
      ADMA_CHn_CTRL register.

    const: 1



  dma-channel-mask:

    maxItems: 1



required:

  - compatible

  - reg

Documentation/devicetree/bindings/dma/qcom,gpi.yaml

+2 −0
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ properties: 
              - qcom,sm8350-gpi-dma

              - qcom,sm8450-gpi-dma

              - qcom,sm8550-gpi-dma

              - qcom,sm8650-gpi-dma

              - qcom,x1e80100-gpi-dma

          - const: qcom,sm6350-gpi-dma

      - items:

          - enum: