Commit df00b71f authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/topic/samsung' into asoc-next

parents 8c7df021 32873b59

arch/arm/mach-s3c24xx/dma-s3c2410.c

+0 −2
Original line number Diff line number Diff line
@@ -25,11 +25,9 @@ 


#include <plat/regs-serial.h>

#include <mach/regs-gpio.h>

#include <plat/regs-ac97.h>

#include <plat/regs-dma.h>

#include <mach/regs-lcd.h>

#include <mach/regs-sdi.h>

#include <plat/regs-iis.h>

#include <plat/regs-spi.h>



static struct s3c24xx_dma_map __initdata s3c2410_dma_mappings[] = {

arch/arm/mach-s3c24xx/dma-s3c2412.c

+0 −2
Original line number Diff line number Diff line
@@ -25,11 +25,9 @@ 


#include <plat/regs-serial.h>

#include <mach/regs-gpio.h>

#include <plat/regs-ac97.h>

#include <plat/regs-dma.h>

#include <mach/regs-lcd.h>

#include <mach/regs-sdi.h>

#include <plat/regs-iis.h>

#include <plat/regs-spi.h>



#define MAP(x) { (x)| DMA_CH_VALID, (x)| DMA_CH_VALID, (x)| DMA_CH_VALID, (x)| DMA_CH_VALID }

arch/arm/mach-s3c24xx/dma-s3c2440.c

+0 −2
Original line number Diff line number Diff line
@@ -25,11 +25,9 @@ 


#include <plat/regs-serial.h>

#include <mach/regs-gpio.h>

#include <plat/regs-ac97.h>

#include <plat/regs-dma.h>

#include <mach/regs-lcd.h>

#include <mach/regs-sdi.h>

#include <plat/regs-iis.h>

#include <plat/regs-spi.h>



static struct s3c24xx_dma_map __initdata s3c2440_dma_mappings[] = {

arch/arm/mach-s3c24xx/dma-s3c2443.c

+0 −2
Original line number Diff line number Diff line
@@ -25,11 +25,9 @@ 


#include <plat/regs-serial.h>

#include <mach/regs-gpio.h>

#include <plat/regs-ac97.h>

#include <plat/regs-dma.h>

#include <mach/regs-lcd.h>

#include <mach/regs-sdi.h>

#include <plat/regs-iis.h>

#include <plat/regs-spi.h>



#define MAP(x) { \

arch/arm/plat-samsung/devs.c

+6 −0
Original line number Diff line number Diff line
@@ -146,14 +146,20 @@ struct platform_device s3c_device_camif = { 


/* ASOC DMA */



#ifdef CONFIG_PLAT_S5P 

static struct resource samsung_asoc_idma_resource = DEFINE_RES_IRQ(IRQ_I2S0);



struct platform_device samsung_asoc_idma = {

	.name		= "samsung-idma",

	.id		= -1,

	.num_resources	= 1,

	.resource	= &samsung_asoc_idma_resource,

	.dev		= {

		.dma_mask		= &samsung_device_dma_mask,

		.coherent_dma_mask	= DMA_BIT_MASK(32),

	}

};

#endif



/* FB */