Commit 7536c1a5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull dmaengine updates from Vinod Koul:
 "New hardware support:

   - Qualcomm SAR2130P GPI dma support

   - Sifive PIC64GX pdma support

   - Rcar r7s72100 support and associated updates

  Updates:

   - STM32 DMA3 updates for packing/unpacking mode and prevention of
     additional xfers

   - Simplification of devm_acpi_dma_controller_register() and associate
     cleanup including headers

   - loongson prefix renames

   - Switch back to platform_driver::remove() subsystem update"

* tag 'dmaengine-6.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine:
  dmaengine: loongson2-apb: Rename the prefix ls2x to loongson2
  dt-bindings: dma: sifive pdma: Add PIC64GX to compatibles
  dmaengine: fix typo in the comment
  dmaengine: stm32-dma3: clamp AXI burst using match data
  dmaengine: stm32-dma3: prevent LL refactoring thanks to DT configuration
  dt-bindings: dma: stm32-dma3: prevent additional transfers
  dmaengine: stm32-dma3: refactor HW linked-list to optimize memory accesses
  dmaengine: stm32-dma3: prevent pack/unpack thanks to DT configuration
  dt-bindings: dma: stm32-dma3: prevent packing/unpacking mode
  dmaengine: idxd: Move DSA/IAA device IDs to IDXD driver
  dt-bindings: dma: qcom,gpi: Add SAR2130P compatible
  dmaengine: Switch back to struct platform_driver::remove()
  dmaengine: ep93xx: Fix unsigned compared against 0
  dmaengine: acpi: Clean up headers
  dmaengine: acpi: Simplify devm_acpi_dma_controller_register()
  dmaengine: acpi: Drop unused devm_acpi_dma_controller_free()
  dmaengine: sh: rz-dmac: add r7s72100 support
  dt-bindings: dma: rz-dmac: Document RZ/A1H SoC
parents 6b867c47 8974f34d

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

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ properties: 
          - enum:

              - qcom,qcm2290-gpi-dma

              - qcom,qdu1000-gpi-dma

              - qcom,sar2130p-gpi-dma

              - qcom,sc7280-gpi-dma

              - qcom,sdx75-gpi-dma

              - qcom,sm6115-gpi-dma

Documentation/devicetree/bindings/dma/renesas,rz-dmac.yaml

+20 −9
Original line number Diff line number Diff line
@@ -4,18 +4,16 @@ 
$id: http://devicetree.org/schemas/dma/renesas,rz-dmac.yaml#

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



title: Renesas RZ/{G2L,G2UL,V2L} DMA Controller

title: Renesas RZ DMA Controller



maintainers:

  - Biju Das <biju.das.jz@bp.renesas.com>



allOf:

  - $ref: dma-controller.yaml#



properties:

  compatible:

    items:

      - enum:

          - renesas,r7s72100-dmac # RZ/A1H

          - renesas,r9a07g043-dmac # RZ/G2UL and RZ/Five

          - renesas,r9a07g044-dmac # RZ/G2{L,LC}

          - renesas,r9a07g054-dmac # RZ/V2L
@@ -93,10 +91,23 @@ required: 
  - reg

  - interrupts

  - interrupt-names

  - clocks

  - clock-names

  - '#dma-cells'

  - dma-channels



allOf:

  - $ref: dma-controller.yaml#



  - if:

      not:

        properties:

          compatible:

            contains:

              enum:

                - renesas,r7s72100-dmac

    then:

      required:

        - clocks

        - clock-names

        - power-domains

        - resets

        - reset-names

Documentation/devicetree/bindings/dma/sifive,fu540-c000-pdma.yaml

+10 −5
Original line number Diff line number Diff line
@@ -27,7 +27,12 @@ allOf: 


properties:

  compatible:

    items:

    oneOf:

      - items:

          - const: microchip,pic64gx-pdma

          - const: microchip,mpfs-pdma

          - const: sifive,pdma0

      - items:

          - enum:

              - microchip,mpfs-pdma

              - sifive,fu540-c000-pdma

Documentation/devicetree/bindings/dma/stm32/st,stm32-dma3.yaml

+6 −0
Original line number Diff line number Diff line
@@ -96,6 +96,12 @@ properties: 
               including the update of the LLI if any

          0x3: at channel level, the transfer complete event is generated at the

               end of the last LLI

        -bit 16: Prevent packing/unpacking mode

          0x0: pack/unpack enabled when source data width/burst != destination data width/burst

          0x1: memory data width/burst forced to peripheral data width/burst to prevent pack/unpack

        -bit 17: Prevent additional transfers due to linked-list refactoring

          0x0: don't prevent additional transfers for optimal performance

          0x1: prevent additional transfer to accommodate user constraints such as single transfer



required:

  - compatible

Documentation/driver-api/driver-model/devres.rst

+0 −1
Original line number Diff line number Diff line
@@ -458,7 +458,6 @@ SERDEV 


SLAVE DMA ENGINE

  devm_acpi_dma_controller_register()

  devm_acpi_dma_controller_free()



SPI

  devm_spi_alloc_host()