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

Commit d45c30cb authored by Ben Dooks's avatar Ben Dooks Committed by Russell King
Browse files

[ARM] 4725/1: S3C2412: Fix IIS and SDI definitions in DMA map 



The IIS and SDI register hw_addr definitions are
incorrect in the DMA map for the S3C2412.

Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 71e5b2f1

arch/arm/mach-s3c2412/dma.c

+5 −4
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include <asm/arch/regs-mem.h>

#include <asm/arch/regs-lcd.h>

#include <asm/arch/regs-sdi.h>

#include <asm/plat-s3c24xx/regs-s3c2412-iis.h>

#include <asm/plat-s3c24xx/regs-iis.h>

#include <asm/plat-s3c24xx/regs-spi.h>
@@ -47,8 +48,8 @@ static struct s3c24xx_dma_map __initdata s3c2412_dma_mappings[] = { 
	[DMACH_SDI] = {

		.name		= "sdi",

		.channels	= MAP(S3C2412_DMAREQSEL_SDI),

		.hw_addr.to	= S3C2410_PA_IIS + S3C2410_IISFIFO,

		.hw_addr.from	= S3C2410_PA_IIS + S3C2410_IISFIFO,

		.hw_addr.to	= S3C2410_PA_SDI + S3C2410_SDIDATA,

		.hw_addr.from	= S3C2410_PA_SDI + S3C2410_SDIDATA,

	},

	[DMACH_SPI0] = {

		.name		= "spi0",
@@ -105,12 +106,12 @@ static struct s3c24xx_dma_map __initdata s3c2412_dma_mappings[] = { 
	[DMACH_I2S_IN] = {

		.name		= "i2s-sdi",

		.channels	= MAP(S3C2412_DMAREQSEL_I2SRX),

		.hw_addr.from	= S3C2410_PA_IIS + S3C2410_IISFIFO,

		.hw_addr.from	= S3C2410_PA_IIS + S3C2412_IISRXD,

	},

	[DMACH_I2S_OUT] = {

		.name		= "i2s-sdo",

		.channels	= MAP(S3C2412_DMAREQSEL_I2STX),

		.hw_addr.to	= S3C2410_PA_IIS + S3C2410_IISFIFO,

		.hw_addr.to	= S3C2410_PA_IIS + S3C2412_IISTXD,

	},

	[DMACH_USB_EP1] = {

		.name		= "usb-ep1",