mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2025-10-31 05:54:26 -04:00
6be2305da8
Changelog: * https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.5 Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 46598
39 lines
1.3 KiB
Diff
39 lines
1.3 KiB
Diff
--- a/Documentation/devicetree/bindings/dma/sun6i-dma.txt
|
|
+++ b/Documentation/devicetree/bindings/dma/sun6i-dma.txt
|
|
@@ -4,7 +4,10 @@ This driver follows the generic DMA bind
|
|
|
|
Required properties:
|
|
|
|
-- compatible: Must be "allwinner,sun6i-a31-dma" or "allwinner,sun8i-a23-dma"
|
|
+- compatible: Must be one of
|
|
+ "allwinner,sun6i-a31-dma"
|
|
+ "allwinner,sun8i-a23-dma"
|
|
+ "allwinner,sun8i-h3-dma"
|
|
- reg: Should contain the registers base address and length
|
|
- interrupts: Should contain a reference to the interrupt used by this device
|
|
- clocks: Should contain a reference to the parent AHB clock
|
|
--- a/drivers/dma/sun6i-dma.c
|
|
+++ b/drivers/dma/sun6i-dma.c
|
|
@@ -891,9 +891,21 @@ static struct sun6i_dma_config sun8i_a23
|
|
.nr_max_vchans = 37,
|
|
};
|
|
|
|
+/*
|
|
+ * The H3 has 12 physical channels, a maximum DRQ port id of 27,
|
|
+ * and a total of 34 usable source and destination endpoints.
|
|
+ */
|
|
+
|
|
+static struct sun6i_dma_config sun8i_h3_dma_cfg = {
|
|
+ .nr_max_channels = 12,
|
|
+ .nr_max_requests = 27,
|
|
+ .nr_max_vchans = 34,
|
|
+};
|
|
+
|
|
static const struct of_device_id sun6i_dma_match[] = {
|
|
{ .compatible = "allwinner,sun6i-a31-dma", .data = &sun6i_a31_dma_cfg },
|
|
{ .compatible = "allwinner,sun8i-a23-dma", .data = &sun8i_a23_dma_cfg },
|
|
+ { .compatible = "allwinner,sun8i-h3-dma", .data = &sun8i_h3_dma_cfg },
|
|
{ /* sentinel */ }
|
|
};
|
|
|