Hi,
I am doing another push of this neglected series which adds support for
Audio DMA Controller on recent Apple SoCs.
All best,
Martin
Changes since v3:
- collected Rob's r-b tag on binding
- split off MAINTAINERS commit for easier merging (allegedly)
Changes since v2:
(link: https://lore.kernel.org/dmaengine/[email protected]/ )
- in binding, make 'interrupts' fixed length and add a comment
- do not use devm allocation on descriptors
- use platform_get_irq_optional to not log errors in the course of looking for
an usable interrupt
- make channel no. unsigned
Changes since v1:
(link: https://lore.kernel.org/dmaengine/[email protected]/ )
- in binding, drop 'apple,internal-irq-destination' in favor of
prepending entries to 'interrupts'
- drop admac_peek/poke helpers
- use special versions of dev_err/WARN_ON where desirable, fix %pad
formatter invocation
- bring implementation of terminate_all up to dmaengine spec, add
device_synchronize
- minor fixes (comments, formatting)
Martin Povišer (3):
dt-bindings: dma: Add Apple ADMAC
dmaengine: apple-admac: Add Apple ADMAC driver
MAINTAINERS: Add ADMAC driver under ARM/APPLE MACHINE
.../devicetree/bindings/dma/apple,admac.yaml | 75 ++
MAINTAINERS | 2 +
drivers/dma/Kconfig | 8 +
drivers/dma/Makefile | 1 +
drivers/dma/apple-admac.c | 818 ++++++++++++++++++
5 files changed, 904 insertions(+)
create mode 100644 Documentation/devicetree/bindings/dma/apple,admac.yaml
create mode 100644 drivers/dma/apple-admac.c
--
2.33.0
Register the driver source and binding schema.
Signed-off-by: Martin Povišer <[email protected]>
---
MAINTAINERS | 2 ++
1 file changed, 2 insertions(+)
diff --git a/MAINTAINERS b/MAINTAINERS
index 6850d079f012..8cd1b4484746 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1835,6 +1835,7 @@ T: git https://github.com/AsahiLinux/linux.git
F: Documentation/devicetree/bindings/arm/apple.yaml
F: Documentation/devicetree/bindings/arm/apple/*
F: Documentation/devicetree/bindings/clock/apple,nco.yaml
+F: Documentation/devicetree/bindings/dma/apple,admac.yaml
F: Documentation/devicetree/bindings/i2c/apple,i2c.yaml
F: Documentation/devicetree/bindings/interrupt-controller/apple,*
F: Documentation/devicetree/bindings/iommu/apple,sart.yaml
@@ -1848,6 +1849,7 @@ F: Documentation/devicetree/bindings/power/apple*
F: Documentation/devicetree/bindings/watchdog/apple,wdt.yaml
F: arch/arm64/boot/dts/apple/
F: drivers/clk/clk-apple-nco.c
+F: drivers/dma/apple-admac.c
F: drivers/i2c/busses/i2c-pasemi-core.c
F: drivers/i2c/busses/i2c-pasemi-platform.c
F: drivers/iommu/apple-dart.c
--
2.33.0
Apple's Audio DMA Controller (ADMAC) is used to fetch and store audio
samples on SoCs from the "Apple Silicon" family.
Reviewed-by: Rob Herring <[email protected]>
Signed-off-by: Martin Povišer <[email protected]>
---
.../devicetree/bindings/dma/apple,admac.yaml | 75 +++++++++++++++++++
1 file changed, 75 insertions(+)
create mode 100644 Documentation/devicetree/bindings/dma/apple,admac.yaml
diff --git a/Documentation/devicetree/bindings/dma/apple,admac.yaml b/Documentation/devicetree/bindings/dma/apple,admac.yaml
new file mode 100644
index 000000000000..ab8a4ec7779f
--- /dev/null
+++ b/Documentation/devicetree/bindings/dma/apple,admac.yaml
@@ -0,0 +1,75 @@
+# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/dma/apple,admac.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Apple Audio DMA Controller (ADMAC)
+
+description: |
+ Apple's Audio DMA Controller (ADMAC) is used to fetch and store audio samples
+ on SoCs from the "Apple Silicon" family.
+
+ The controller has been seen with up to 24 channels. Even-numbered channels
+ are TX-only, odd-numbered are RX-only. Individual channels are coupled to
+ fixed device endpoints.
+
+maintainers:
+ - Martin Povišer <[email protected]>
+
+allOf:
+ - $ref: "dma-controller.yaml#"
+
+properties:
+ compatible:
+ items:
+ - enum:
+ - apple,t6000-admac
+ - apple,t8103-admac
+ - const: apple,admac
+
+ reg:
+ maxItems: 1
+
+ '#dma-cells':
+ const: 1
+ description:
+ Clients specify a single cell with channel number.
+
+ dma-channels:
+ maximum: 24
+
+ interrupts:
+ minItems: 4
+ maxItems: 4
+ description:
+ Interrupts that correspond to the 4 IRQ outputs of the controller. Usually
+ only one of the controller outputs will be connected as an usable interrupt
+ source. The remaining interrupts will be left without a valid value, e.g.
+ in an interrupts-extended list the disconnected positions will contain
+ an empty phandle reference <0>.
+
+required:
+ - compatible
+ - reg
+ - '#dma-cells'
+ - dma-channels
+ - interrupts
+
+additionalProperties: false
+
+examples:
+ - |
+ #include <dt-bindings/interrupt-controller/apple-aic.h>
+ #include <dt-bindings/interrupt-controller/irq.h>
+
+ admac: dma-controller@238200000 {
+ compatible = "apple,t8103-admac", "apple,admac";
+ reg = <0x38200000 0x34000>;
+ dma-channels = <24>;
+ interrupts-extended = <0>,
+ <&aic AIC_IRQ 626 IRQ_TYPE_LEVEL_HIGH>,
+ <0>,
+ <0>;
+ #dma-cells = <1>;
+ };
--
2.33.0
On 31-05-22, 23:36, Martin Povišer wrote:
> Hi,
>
> I am doing another push of this neglected series which adds support for
> Audio DMA Controller on recent Apple SoCs.
Applied, thanks
--
~Vinod