@@ -161,6 +161,10 @@ struct fsl_qdma_format {
161
161
u8 __reserved1 [2 ];
162
162
u8 cfg8b_w1 ;
163
163
} __packed ;
164
+ struct {
165
+ __le32 __reserved2 ;
166
+ __le32 cmd ;
167
+ } __packed ;
164
168
__le64 data ;
165
169
};
166
170
} __packed ;
@@ -355,7 +359,6 @@ static void fsl_qdma_free_chan_resources(struct dma_chan *chan)
355
359
static void fsl_qdma_comp_fill_memcpy (struct fsl_qdma_comp * fsl_comp ,
356
360
dma_addr_t dst , dma_addr_t src , u32 len )
357
361
{
358
- u32 cmd ;
359
362
struct fsl_qdma_format * sdf , * ddf ;
360
363
struct fsl_qdma_format * ccdf , * csgf_desc , * csgf_src , * csgf_dest ;
361
364
@@ -384,15 +387,11 @@ static void fsl_qdma_comp_fill_memcpy(struct fsl_qdma_comp *fsl_comp,
384
387
/* This entry is the last entry. */
385
388
qdma_csgf_set_f (csgf_dest , len );
386
389
/* Descriptor Buffer */
387
- cmd = cpu_to_le32 (FSL_QDMA_CMD_RWTTYPE <<
388
- FSL_QDMA_CMD_RWTTYPE_OFFSET ) |
389
- FSL_QDMA_CMD_PF ;
390
- sdf -> data = QDMA_SDDF_CMD (cmd );
391
-
392
- cmd = cpu_to_le32 (FSL_QDMA_CMD_RWTTYPE <<
393
- FSL_QDMA_CMD_RWTTYPE_OFFSET );
394
- cmd |= cpu_to_le32 (FSL_QDMA_CMD_LWC << FSL_QDMA_CMD_LWC_OFFSET );
395
- ddf -> data = QDMA_SDDF_CMD (cmd );
390
+ sdf -> cmd = cpu_to_le32 ((FSL_QDMA_CMD_RWTTYPE << FSL_QDMA_CMD_RWTTYPE_OFFSET ) |
391
+ FSL_QDMA_CMD_PF );
392
+
393
+ ddf -> cmd = cpu_to_le32 ((FSL_QDMA_CMD_RWTTYPE << FSL_QDMA_CMD_RWTTYPE_OFFSET ) |
394
+ (FSL_QDMA_CMD_LWC << FSL_QDMA_CMD_LWC_OFFSET ));
396
395
}
397
396
398
397
/*
@@ -626,7 +625,7 @@ static int fsl_qdma_halt(struct fsl_qdma_engine *fsl_qdma)
626
625
627
626
static int
628
627
fsl_qdma_queue_transfer_complete (struct fsl_qdma_engine * fsl_qdma ,
629
- void * block ,
628
+ __iomem void * block ,
630
629
int id )
631
630
{
632
631
bool duplicate ;
0 commit comments