Merge remote-tracking branch 'regmap/topic/core' into regmap-next

[cascardo/linux.git] / drivers / dma / ste_dma40_ll.c

diff --git a/drivers/dma/ste_dma40_ll.c b/drivers/dma/ste_dma40_ll.c
index 851ad56..7180e0d 100644 (file)
--- a/drivers/dma/ste_dma40_ll.c
+++ b/drivers/dma/ste_dma40_ll.c
@@ -102,17 +102,18 @@ void d40_phy_cfg(struct stedma40_chan_cfg *cfg,
                src |= cfg->src_info.data_width << D40_SREG_CFG_ESIZE_POS;
                dst |= cfg->dst_info.data_width << D40_SREG_CFG_ESIZE_POS;
 
+               /* Set the priority bit to high for the physical channel */
+               if (cfg->high_priority) {
+                       src |= 1 << D40_SREG_CFG_PRI_POS;
+                       dst |= 1 << D40_SREG_CFG_PRI_POS;
+               }
+
        } else {
                /* Logical channel */
                dst |= 1 << D40_SREG_CFG_LOG_GIM_POS;
                src |= 1 << D40_SREG_CFG_LOG_GIM_POS;
        }
 
-       if (cfg->high_priority) {
-               src |= 1 << D40_SREG_CFG_PRI_POS;
-               dst |= 1 << D40_SREG_CFG_PRI_POS;
-       }
-
        if (cfg->src_info.big_endian)
                src |= 1 << D40_SREG_CFG_LBE_POS;
        if (cfg->dst_info.big_endian)
@@ -250,7 +251,7 @@ d40_phy_buf_to_lli(struct d40_phy_lli *lli, dma_addr_t addr, u32 size,
 
        return lli;
 
- err:
+err:
        return NULL;
 }
 
@@ -331,10 +332,10 @@ void d40_log_lli_lcpa_write(struct d40_log_lli_full *lcpa,
 {
        d40_log_lli_link(lli_dst, lli_src, next, flags);
 
-       writel(lli_src->lcsp02, &lcpa[0].lcsp0);
-       writel(lli_src->lcsp13, &lcpa[0].lcsp1);
-       writel(lli_dst->lcsp02, &lcpa[0].lcsp2);
-       writel(lli_dst->lcsp13, &lcpa[0].lcsp3);
+       writel_relaxed(lli_src->lcsp02, &lcpa[0].lcsp0);
+       writel_relaxed(lli_src->lcsp13, &lcpa[0].lcsp1);
+       writel_relaxed(lli_dst->lcsp02, &lcpa[0].lcsp2);
+       writel_relaxed(lli_dst->lcsp13, &lcpa[0].lcsp3);
 }
 
 void d40_log_lli_lcla_write(struct d40_log_lli *lcla,
@@ -344,10 +345,10 @@ void d40_log_lli_lcla_write(struct d40_log_lli *lcla,
 {
        d40_log_lli_link(lli_dst, lli_src, next, flags);
 
-       writel(lli_src->lcsp02, &lcla[0].lcsp02);
-       writel(lli_src->lcsp13, &lcla[0].lcsp13);
-       writel(lli_dst->lcsp02, &lcla[1].lcsp02);
-       writel(lli_dst->lcsp13, &lcla[1].lcsp13);
+       writel_relaxed(lli_src->lcsp02, &lcla[0].lcsp02);
+       writel_relaxed(lli_src->lcsp13, &lcla[0].lcsp13);
+       writel_relaxed(lli_dst->lcsp02, &lcla[1].lcsp02);
+       writel_relaxed(lli_dst->lcsp13, &lcla[1].lcsp13);
 }
 
 static void d40_log_fill_lli(struct d40_log_lli *lli,