Skip to content

Commit 2fe6777

Browse files
shimodayvinodkoul
authored andcommitted
dmaengine: rcar-dmac: Add support for R-Car S4-8
Add support for R-Car S4-8. We can reuse R-Car V3U code so that renames variable names as "gen4". Note that some registers of R-Car V3U do not exist on R-Car S4-8, but none of them are used by the driver for now. Signed-off-by: Yoshihiro Shimoda <[email protected]> Reviewed-by: Ulrich Hecht <[email protected]> Reviewed-by: Geert Uytterhoeven <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Vinod Koul <[email protected]>
1 parent 401c151 commit 2fe6777

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

drivers/dma/sh/rcar-dmac.c

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ struct rcar_dmac_of_data {
236236
#define RCAR_DMAOR_PRI_ROUND_ROBIN (3 << 8)
237237
#define RCAR_DMAOR_AE (1 << 2)
238238
#define RCAR_DMAOR_DME (1 << 0)
239-
#define RCAR_DMACHCLR 0x0080 /* Not on R-Car V3U */
239+
#define RCAR_DMACHCLR 0x0080 /* Not on R-Car Gen4 */
240240
#define RCAR_DMADPSEC 0x00a0
241241

242242
#define RCAR_DMASAR 0x0000
@@ -299,8 +299,8 @@ struct rcar_dmac_of_data {
299299
#define RCAR_DMAFIXDAR 0x0014
300300
#define RCAR_DMAFIXDPBASE 0x0060
301301

302-
/* For R-Car V3U */
303-
#define RCAR_V3U_DMACHCLR 0x0100
302+
/* For R-Car Gen4 */
303+
#define RCAR_GEN4_DMACHCLR 0x0100
304304

305305
/* Hardcode the MEMCPY transfer size to 4 bytes. */
306306
#define RCAR_DMAC_MEMCPY_XFER_SIZE 4
@@ -345,7 +345,7 @@ static void rcar_dmac_chan_clear(struct rcar_dmac *dmac,
345345
struct rcar_dmac_chan *chan)
346346
{
347347
if (dmac->chan_base)
348-
rcar_dmac_chan_write(chan, RCAR_V3U_DMACHCLR, 1);
348+
rcar_dmac_chan_write(chan, RCAR_GEN4_DMACHCLR, 1);
349349
else
350350
rcar_dmac_write(dmac, RCAR_DMACHCLR, BIT(chan->index));
351351
}
@@ -357,7 +357,7 @@ static void rcar_dmac_chan_clear_all(struct rcar_dmac *dmac)
357357

358358
if (dmac->chan_base) {
359359
for_each_rcar_dmac_chan(i, dmac, chan)
360-
rcar_dmac_chan_write(chan, RCAR_V3U_DMACHCLR, 1);
360+
rcar_dmac_chan_write(chan, RCAR_GEN4_DMACHCLR, 1);
361361
} else {
362362
rcar_dmac_write(dmac, RCAR_DMACHCLR, dmac->channels_mask);
363363
}
@@ -2009,7 +2009,7 @@ static const struct rcar_dmac_of_data rcar_dmac_data = {
20092009
.chan_offset_stride = 0x80,
20102010
};
20112011

2012-
static const struct rcar_dmac_of_data rcar_v3u_dmac_data = {
2012+
static const struct rcar_dmac_of_data rcar_gen4_dmac_data = {
20132013
.chan_offset_base = 0x0,
20142014
.chan_offset_stride = 0x1000,
20152015
};
@@ -2018,9 +2018,12 @@ static const struct of_device_id rcar_dmac_of_ids[] = {
20182018
{
20192019
.compatible = "renesas,rcar-dmac",
20202020
.data = &rcar_dmac_data,
2021+
}, {
2022+
.compatible = "renesas,rcar-gen4-dmac",
2023+
.data = &rcar_gen4_dmac_data,
20212024
}, {
20222025
.compatible = "renesas,dmac-r8a779a0",
2023-
.data = &rcar_v3u_dmac_data,
2026+
.data = &rcar_gen4_dmac_data,
20242027
},
20252028
{ /* Sentinel */ }
20262029
};

0 commit comments

Comments
 (0)