Our platforms(such as LS1021A, LS1012A, LS1043A, LS1046A, LS1028A) with
below registers(CHCFG0 - CHCFG15) of eDMA as follows:
*-----------------------------------------------------------*
| Offset | OTHERS | LS1028A |
|--------------|--------------------|-----------------------|
| 0x0 | CHCFG0 | CHCFG3 |
|--------------|--------------------|-----------------------|
| 0x1 | CHCFG1 | CHCFG2 |
|--------------|--------------------|-----------------------|
| 0x2 | CHCFG2 | CHCFG1 |
|--------------|--------------------|-----------------------|
| 0x3 | CHCFG3 | CHCFG0 |
|--------------|--------------------|-----------------------|
| ... | ...... | ...... |
|--------------|--------------------|-----------------------|
| 0xC | CHCFG12 | CHCFG15 |
|--------------|--------------------|-----------------------|
| 0xD | CHCFG13 | CHCFG14 |
|--------------|--------------------|-----------------------|
| 0xE | CHCFG14 | CHCFG13 |
|--------------|--------------------|-----------------------|
| 0xF | CHCFG15 | CHCFG12 |
*-----------------------------------------------------------*
This patch is to improve edma driver to fit LS1028A platform.
Signed-off-by: Peng Ma <[email protected]>
---
Changed for v4:
- Add 'mux_swap' into 'struct fsl_edma_drvdata'
- Remove soc match function
drivers/dma/fsl-edma-common.c | 5 +++++
drivers/dma/fsl-edma-common.h | 1 +
drivers/dma/fsl-edma.c | 8 ++++++++
3 files changed, 14 insertions(+)
diff --git a/drivers/dma/fsl-edma-common.c b/drivers/dma/fsl-edma-common.c
index b1a7ca91701a..5697c3622699 100644
--- a/drivers/dma/fsl-edma-common.c
+++ b/drivers/dma/fsl-edma-common.c
@@ -109,10 +109,15 @@ void fsl_edma_chan_mux(struct fsl_edma_chan *fsl_chan,
u32 ch = fsl_chan->vchan.chan.chan_id;
void __iomem *muxaddr;
unsigned int chans_per_mux, ch_off;
+ int endian_diff[4] = {3, 1, -1, -3};
u32 dmamux_nr = fsl_chan->edma->drvdata->dmamuxs;
chans_per_mux = fsl_chan->edma->n_chans / dmamux_nr;
ch_off = fsl_chan->vchan.chan.chan_id % chans_per_mux;
+
+ if (fsl_chan->edma->drvdata->mux_swap)
+ ch_off += endian_diff[ch_off % 4];
+
muxaddr = fsl_chan->edma->muxbase[ch / chans_per_mux];
slot = EDMAMUX_CHCFG_SOURCE(slot);
diff --git a/drivers/dma/fsl-edma-common.h b/drivers/dma/fsl-edma-common.h
index 5eaa2902ed39..67e422590c9a 100644
--- a/drivers/dma/fsl-edma-common.h
+++ b/drivers/dma/fsl-edma-common.h
@@ -147,6 +147,7 @@ struct fsl_edma_drvdata {
enum edma_version version;
u32 dmamuxs;
bool has_dmaclk;
+ bool mux_swap;
int (*setup_irq)(struct platform_device *pdev,
struct fsl_edma_engine *fsl_edma);
};
diff --git a/drivers/dma/fsl-edma.c b/drivers/dma/fsl-edma.c
index b626c06ac2e0..eff7ebd8cf35 100644
--- a/drivers/dma/fsl-edma.c
+++ b/drivers/dma/fsl-edma.c
@@ -233,6 +233,13 @@ static struct fsl_edma_drvdata vf610_data = {
.setup_irq = fsl_edma_irq_init,
};
+static struct fsl_edma_drvdata ls1028a_data = {
+ .version = v1,
+ .dmamuxs = DMAMUX_NR,
+ .mux_swap = true,
+ .setup_irq = fsl_edma_irq_init,
+};
+
static struct fsl_edma_drvdata imx7ulp_data = {
.version = v3,
.dmamuxs = 1,
@@ -242,6 +249,7 @@ static struct fsl_edma_drvdata imx7ulp_data = {
static const struct of_device_id fsl_edma_dt_ids[] = {
{ .compatible = "fsl,vf610-edma", .data = &vf610_data},
+ { .compatible = "fsl,ls1028a-edma", .data = &ls1028a_data},
{ .compatible = "fsl,imx7ulp-edma", .data = &imx7ulp_data},
{ /* sentinel */ }
};
--
2.17.1
The eDMA of LS1028A soc has a little bit different from others, So we
should distinguish them in driver by compatible.
Signed-off-by: Peng Ma <[email protected]>
---
Changed for v4
- Add new change patch
Documentation/devicetree/bindings/dma/fsl-edma.txt | 1 +
arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/dma/fsl-edma.txt b/Documentation/devicetree/bindings/dma/fsl-edma.txt
index 29dd3ccb1235..e77b08ebcd06 100644
--- a/Documentation/devicetree/bindings/dma/fsl-edma.txt
+++ b/Documentation/devicetree/bindings/dma/fsl-edma.txt
@@ -10,6 +10,7 @@ Required properties:
- compatible :
- "fsl,vf610-edma" for eDMA used similar to that on Vybrid vf610 SoC
- "fsl,imx7ulp-edma" for eDMA2 used similar to that on i.mx7ulp
+ - "fsl,fsl,ls1028a-edma" for eDMA used similar to that on Vybrid vf610 SoC
- reg : Specifies base physical address(s) and size of the eDMA registers.
The 1st region is eDMA control register's address and size.
The 2nd and the 3rd regions are programmable channel multiplexing
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
index 8e8a77eb596a..b3716a89fa0d 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
@@ -316,7 +316,7 @@
edma0: dma-controller@22c0000 {
#dma-cells = <2>;
- compatible = "fsl,vf610-edma";
+ compatible = "fsl,ls1028a-edma";
reg = <0x0 0x22c0000 0x0 0x10000>,
<0x0 0x22d0000 0x0 0x10000>,
<0x0 0x22e0000 0x0 0x10000>;
--
2.17.1
On 2019/11/12 16:10 Peng Ma <[email protected]> wrote:
> Our platforms(such as LS1021A, LS1012A, LS1043A, LS1046A, LS1028A) with
> below registers(CHCFG0 - CHCFG15) of eDMA as follows:
> *-----------------------------------------------------------*
> | Offset | OTHERS | LS1028A |
> |--------------|--------------------|-----------------------|
> | 0x0 | CHCFG0 | CHCFG3 |
> |--------------|--------------------|-----------------------|
> | 0x1 | CHCFG1 | CHCFG2 |
> |--------------|--------------------|-----------------------|
> | 0x2 | CHCFG2 | CHCFG1 |
> |--------------|--------------------|-----------------------|
> | 0x3 | CHCFG3 | CHCFG0 |
> |--------------|--------------------|-----------------------|
> | ... | ...... | ...... |
> |--------------|--------------------|-----------------------|
> | 0xC | CHCFG12 | CHCFG15 |
> |--------------|--------------------|-----------------------|
> | 0xD | CHCFG13 | CHCFG14 |
> |--------------|--------------------|-----------------------|
> | 0xE | CHCFG14 | CHCFG13 |
> |--------------|--------------------|-----------------------|
> | 0xF | CHCFG15 | CHCFG12 |
> *-----------------------------------------------------------*
>
> This patch is to improve edma driver to fit LS1028A platform.
>
> Signed-off-by: Peng Ma <[email protected]>
Reviewed-by: Robin Gong <[email protected]>
On Wed, Dec 11, 2019 at 08:09:39AM +0000, Peng Ma wrote:
> The eDMA of LS1028A soc has a little bit different from others, So we
> should distinguish them in driver by compatible.
>
> Signed-off-by: Peng Ma <[email protected]>
> ---
> Changed for v4
> - Add new change patch
>
> Documentation/devicetree/bindings/dma/fsl-edma.txt | 1 +
Please have bindings change as a separate patch.
Shawn
> arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 2 +-
> 2 files changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/Documentation/devicetree/bindings/dma/fsl-edma.txt b/Documentation/devicetree/bindings/dma/fsl-edma.txt
> index 29dd3ccb1235..e77b08ebcd06 100644
> --- a/Documentation/devicetree/bindings/dma/fsl-edma.txt
> +++ b/Documentation/devicetree/bindings/dma/fsl-edma.txt
> @@ -10,6 +10,7 @@ Required properties:
> - compatible :
> - "fsl,vf610-edma" for eDMA used similar to that on Vybrid vf610 SoC
> - "fsl,imx7ulp-edma" for eDMA2 used similar to that on i.mx7ulp
> + - "fsl,fsl,ls1028a-edma" for eDMA used similar to that on Vybrid vf610 SoC
> - reg : Specifies base physical address(s) and size of the eDMA registers.
> The 1st region is eDMA control register's address and size.
> The 2nd and the 3rd regions are programmable channel multiplexing
> diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
> index 8e8a77eb596a..b3716a89fa0d 100644
> --- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
> +++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
> @@ -316,7 +316,7 @@
>
> edma0: dma-controller@22c0000 {
> #dma-cells = <2>;
> - compatible = "fsl,vf610-edma";
> + compatible = "fsl,ls1028a-edma";
> reg = <0x0 0x22c0000 0x0 0x10000>,
> <0x0 0x22d0000 0x0 0x10000>,
> <0x0 0x22e0000 0x0 0x10000>;
> --
> 2.17.1
>