Skip to contentSkip to conversation

dmaengine: fsl-edma: extract common fsl-edma code (no changes in behavior intended)

PATCH Superseded Angelo Dureghello 1 participant 1 message Aug 6, 2018 dmaengine

v8 of 10 Superseded Latest is v10 →

lore
Share & tools
lore
#0 lore raw

PATCH v8 1/3 dmaengine: fsl-edma: extract common fsl-edma code (no changes in behavior intended)

Hi Krzysztof,

Quoted 59 lines · Krzysztof Kozlowski
Quoted 58 lines · Angelo Dureghello

This patch adds a new fsl-edma-common module to allow new mcf-edma module code to use most of the fsl-edma code.

---
Changes for v2:
- patch splitted into 4
- add mcf-edma as minimal different parts from fsl-edma

Changes for v3:
none

Changes for v4:
- patch simplified from 4/4 into 2/2
- collecting all the mcf-edma-related changes

Changes for v5:
none

Changes for v6:
- adjusted comment header
- fixed bit shift with BIT()
- we need to free the interrupts at remove(), so removed all devm_ interrupt related calls

Changes for v7:
none

Changes for v8:
- patch rewritten from scratch, splitted into 3, common code isolated, minimal changes from the original Freescale code have been done. The patch has been tested with both Iris + Colibri Vybrid VF50 and stmark2/mcf54415 Coldfire boards.

---
 drivers/dma/Makefile          |   2 +-
 drivers/dma/fsl-edma-common.c | 576 ++++++++++++++++++++++++++++
 drivers/dma/fsl-edma-common.h | 196 ++++++++++
 drivers/dma/fsl-edma.c        | 697 +---------------------------------
 4 files changed, 774 insertions(+), 697 deletions(-)
 create mode 100644 drivers/dma/fsl-edma-common.c
 create mode 100644 drivers/dma/fsl-edma-common.h
drivers/dma/Makefile +1 -1
index 203a99d68315..66022f59fca4 100644
@@ -31,7 +31,7 @@ obj-$(CONFIG_DW_AXI_DMAC) += dw-axi-dmac/
 obj-$(CONFIG_DW_DMAC_CORE) += dw/
 obj-$(CONFIG_EP93XX_DMA) += ep93xx_dma.o
 obj-$(CONFIG_FSL_DMA) += fsldma.o
-obj-$(CONFIG_FSL_EDMA) += fsl-edma.o
+obj-$(CONFIG_FSL_EDMA) += fsl-edma.o fsl-edma-common.o
 obj-$(CONFIG_FSL_RAID) += fsl_raid.o
 obj-$(CONFIG_HSU_DMA) += hsu/
 obj-$(CONFIG_IMG_MDC_DMA) += img-mdc-dma.o
drivers/dma/fsl-edma-common.c new file +0 -0
new file mode 100644
index 000000000000..0ae7094f477a
Quoted 9 lines

drivers/dma/fsl-edma-common.c line 1

Quoted 4 lines
drivers/dma/fsl-edma-common.c new file +1 -0
@@ -0,0 +1,576 @@
+// SPDX-License-Identifier: GPL-2.0

You moved code from fsl-edma.c which is licensed on GPL-2.0+. I think that's not allowed as you effectively relicense the work on new license.

Ok, so if i undestrand, i should change that comment to // SPDX-License-Identifier: GPL-2.0+
Right ?

Quoted 5 lines

Best regards,
Krzysztof

Best regards,
Angelo

Quoted 7 lines

drivers/dma/fsl-edma-common.c line 4

Quoted 3 lines
drivers/dma/fsl-edma-common.c new file +3 -0
+//
+// Copyright (c) 2013-2014 Freescale Semiconductor, Inc
+// Copyright (c) 2017 Sysam, Angelo Dureghello  <[email protected]>

--
To unsubscribe from this list: send the line "unsubscribe dmaengine" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

---
To unsubscribe from this list: send the line "unsubscribe dmaengine" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html