Commit b00ed48b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull dmaengine updates from Vinod Koul:
 "Nothing special, this includes a couple of new device support and new
  driver support and bunch of driver updates.

  New support:

   - Tegra gpcdma driver support

   - Qualcomm SM8350, Sm8450 and SC7280 device support

   - Renesas RZN1 dma and platform support

  Updates:

   - stm32 device pause/resume support and updates

   - DMA memset ops Documentation and usage clarification

   - deprecate '#dma-channels' & '#dma-requests' bindings

   - driver updates for stm32, ptdma idsx etc"

* tag 'dmaengine-5.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine: (87 commits)
  dmaengine: idxd: make idxd_wq_enable() return 0 if wq is already enabled
  dmaengine: sun6i: Add support for the D1 variant
  dmaengine: sun6i: Add support for 34-bit physical addresses
  dmaengine: sun6i: Do not use virt_to_phys
  dt-bindings: dma: sun50i-a64: Add compatible for D1
  dmaengine: tegra: Remove unused switch case
  dmaengine: tegra: Fix uninitialized variable usage
  dmaengine: stm32-dma: add device_pause/device_resume support
  dmaengine: stm32-dma: rename pm ops before dma pause/resume introduction
  dmaengine: stm32-dma: pass DMA_SxSCR value to stm32_dma_handle_chan_done()
  dmaengine: stm32-dma: introduce stm32_dma_sg_inc to manage chan->next_sg
  dmaengine: stm32-dmamux: avoid reset of dmamux if used by coprocessor
  dmaengine: qcom: gpi: Add support for sc7280
  dt-bindings: dma: pl330: Add power-domains
  dmaengine: stm32-mdma: use dev_dbg on non-busy channel spurious it
  dmaengine: stm32-mdma: fix chan initialization in stm32_mdma_irq_handler()
  dmaengine: stm32-mdma: remove GISR1 register
  dmaengine: ti: deprecate '#dma-channels'
  dmaengine: mmp: deprecate '#dma-channels'
  dmaengine: pxa: deprecate '#dma-channels' and '#dma-requests'
  ...
parents c3a9a3c5 d1a28597

Documentation/devicetree/bindings/clock/renesas,r9a06g032-sysctrl.yaml

+11 −0
Original line number Diff line number Diff line
@@ -39,6 +39,17 @@ properties: 
  '#power-domain-cells':

    const: 0



  '#address-cells':

    const: 1



  '#size-cells':

    const: 1



patternProperties:

  "^dma-router@[a-f0-9]+$":

    type: object

    $ref: "../dma/renesas,rzn1-dmamux.yaml#"



required:

  - compatible

  - reg

Documentation/devicetree/bindings/dma/allwinner,sun50i-a64-dma.yaml

+6 −3
Original line number Diff line number Diff line
@@ -20,9 +20,11 @@ properties: 


  compatible:

    oneOf:

      - const: allwinner,sun50i-a64-dma

      - const: allwinner,sun50i-a100-dma

      - const: allwinner,sun50i-h6-dma

      - enum:

          - allwinner,sun20i-d1-dma

          - allwinner,sun50i-a64-dma

          - allwinner,sun50i-a100-dma

          - allwinner,sun50i-h6-dma

      - items:

          - const: allwinner,sun8i-r40-dma

          - const: allwinner,sun50i-a64-dma
@@ -58,6 +60,7 @@ if: 
  properties:

    compatible:

      enum:

        - allwinner,sun20i-d1-dma

        - allwinner,sun50i-a100-dma

        - allwinner,sun50i-h6-dma

Documentation/devicetree/bindings/dma/altr,msgdma.yaml

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# 
title: Altera mSGDMA IP core



maintainers:

  - Olivier Dautricourt <olivier.dautricourt@orolia.com>

  - Olivier Dautricourt <olivierdautricourt@gmail.com>



description: |

  Altera / Intel modular Scatter-Gather Direct Memory Access (mSGDMA)

Documentation/devicetree/bindings/dma/arm,pl330.yaml

+3 −0
Original line number Diff line number Diff line
@@ -55,6 +55,9 @@ properties: 


  dma-coherent: true



  power-domains:

    maxItems: 1



  resets:

    minItems: 1

    maxItems: 2

Documentation/devicetree/bindings/dma/mmp-dma.txt

+6 −4
Original line number Diff line number Diff line
@@ -10,10 +10,12 @@ Required properties: 
		or one irq for pdma device



Optional properties:

- #dma-channels: Number of DMA channels supported by the controller (defaults

- dma-channels: Number of DMA channels supported by the controller (defaults

  to 32 when not specified)

- #dma-requests: Number of DMA requestor lines supported by the controller

- #dma-channels: deprecated

- dma-requests: Number of DMA requestor lines supported by the controller

  (defaults to 32 when not specified)

- #dma-requests: deprecated



"marvell,pdma-1.0"

Used platforms: pxa25x, pxa27x, pxa3xx, pxa93x, pxa168, pxa910, pxa688.
@@ -33,7 +35,7 @@ pdma: dma-controller@d4000000 { 
	      reg = <0xd4000000 0x10000>;

	      interrupts = <0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15>;

	      interrupt-parent = <&intcmux32>;

	      #dma-channels = <16>;

	      dma-channels = <16>;

      };



/*
@@ -45,7 +47,7 @@ pdma: dma-controller@d4000000 { 
	      compatible = "marvell,pdma-1.0";

	      reg = <0xd4000000 0x10000>;

	      interrupts = <47>;

	      #dma-channels = <16>;

	      dma-channels = <16>;

      };