Skip to content

Commit

Permalink
dmaengine: fsl-edma: utilize common dt-binding header file
Browse files Browse the repository at this point in the history
[ Upstream commit d0e217b ]

Refactor the code to use the common dt-binding header file, fsl-edma.h.
Renaming ARGS* to FSL_EDMA*, ensuring no functional changes.

Signed-off-by: Frank Li <Frank.Li@nxp.com>
Link: https://lore.kernel.org/r/20231114154824.3617255-4-Frank.Li@nxp.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Stable-dep-of: a79f949 ("dmaengine: fsl-edma: correct max_segment_size setting")
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
nxpfrankli authored and Sasha Levin committed Mar 15, 2024
1 parent fb2f43e commit 525c139
Showing 1 changed file with 6 additions and 11 deletions.
17 changes: 6 additions & 11 deletions drivers/dma/fsl-edma-main.c
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
* Vybrid and Layerscape SoCs.
*/

#include <dt-bindings/dma/fsl-edma.h>
#include <linux/module.h>
#include <linux/interrupt.h>
#include <linux/clk.h>
Expand All @@ -23,12 +24,6 @@

#include "fsl-edma-common.h"

#define ARGS_RX BIT(0)
#define ARGS_REMOTE BIT(1)
#define ARGS_MULTI_FIFO BIT(2)
#define ARGS_EVEN_CH BIT(3)
#define ARGS_ODD_CH BIT(4)

static void fsl_edma_synchronize(struct dma_chan *chan)
{
struct fsl_edma_chan *fsl_chan = to_fsl_edma_chan(chan);
Expand Down Expand Up @@ -157,14 +152,14 @@ static struct dma_chan *fsl_edma3_xlate(struct of_phandle_args *dma_spec,
i = fsl_chan - fsl_edma->chans;

fsl_chan->priority = dma_spec->args[1];
fsl_chan->is_rxchan = dma_spec->args[2] & ARGS_RX;
fsl_chan->is_remote = dma_spec->args[2] & ARGS_REMOTE;
fsl_chan->is_multi_fifo = dma_spec->args[2] & ARGS_MULTI_FIFO;
fsl_chan->is_rxchan = dma_spec->args[2] & FSL_EDMA_RX;
fsl_chan->is_remote = dma_spec->args[2] & FSL_EDMA_REMOTE;
fsl_chan->is_multi_fifo = dma_spec->args[2] & FSL_EDMA_MULTI_FIFO;

if ((dma_spec->args[2] & ARGS_EVEN_CH) && (i & 0x1))
if ((dma_spec->args[2] & FSL_EDMA_EVEN_CH) && (i & 0x1))
continue;

if ((dma_spec->args[2] & ARGS_ODD_CH) && !(i & 0x1))
if ((dma_spec->args[2] & FSL_EDMA_ODD_CH) && !(i & 0x1))
continue;

if (!b_chmux && i == dma_spec->args[0]) {
Expand Down

0 comments on commit 525c139

Please sign in to comment.