Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d92342df authored by Linus Walleij's avatar Linus Walleij Committed by Ben Dooks
Browse files

DMAENGINE: correct PL080 register header file 



This PL008 among all other variables named PL080 doesn't seem
right. Fix it. Also add some missing defined that I use in the
new PL08x driver.

Acked-by: default avatarBen Dooks <ben-linux@fluff.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@stericsson.com>
Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
parent 2d4a3b76

arch/arm/include/asm/hardware/pl080.h

+3 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 


/* Per channel configuration registers */



#define PL008_Cx_STRIDE				(0x20)

#define PL080_Cx_STRIDE				(0x20)

#define PL080_Cx_BASE(x)			((0x100 + (x * 0x20)))

#define PL080_Cx_SRC_ADDR(x)			((0x100 + (x * 0x20)))

#define PL080_Cx_DST_ADDR(x)			((0x104 + (x * 0x20)))
@@ -68,6 +68,8 @@ 
#define PL080_CONTROL_TC_IRQ_EN			(1 << 31)

#define PL080_CONTROL_PROT_MASK			(0x7 << 28)

#define PL080_CONTROL_PROT_SHIFT		(28)

#define PL080_CONTROL_PROT_CACHE		(1 << 30)

#define PL080_CONTROL_PROT_BUFF			(1 << 29)

#define PL080_CONTROL_PROT_SYS			(1 << 28)

#define PL080_CONTROL_DST_INCR			(1 << 27)

#define PL080_CONTROL_SRC_INCR			(1 << 26)

arch/arm/mach-s3c64xx/dma.c

+1 −1
Original line number Diff line number Diff line
@@ -697,7 +697,7 @@ static int s3c64xx_dma_init1(int chno, enum dma_ch chbase, 
		chptr->number = chno;

		chptr->dmac = dmac;

		chptr->regs = regptr;

		regptr += PL008_Cx_STRIDE;

		regptr += PL080_Cx_STRIDE;

	}



	/* for the moment, permanently enable the controller */