OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung 

* 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: S5PV310: Add missing virtual ASoC DMA device
  ARM: S5PV210: Add missing virtual ASoC DMA device
  ARM: S5P6450: Add missing virtual ASoC DMA device
  ARM: S5P6440: Add missing virtual ASoC DMA device
  ARM: S5P6442: Enable I2S device to work on SMDK6442
This commit is contained in:
Linus Torvalds 2011-01-18 08:03:55 -08:00
parent 8dec00059e fbcb44dea8
commit 34c682adb3
7 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/mach-s5p6442/mach-smdk6442.c
View File

@ -68,6 +68,7 @@ static struct s3c2410_uartcfg smdk6442_uartcfgs[] __initdata = {
static struct platform_device *smdk6442_devices[] __initdata = {
&s3c_device_i2c0,
&samsung_asoc_dma,
&s5p6442_device_iis0,
&s3c_device_wdt,
};

1
arch/arm/mach-s5p64x0/mach-smdk6440.c
View File

@ -95,6 +95,7 @@ static struct platform_device *smdk6440_devices[] __initdata = {
&s3c_device_i2c1,
&s3c_device_ts,
&s3c_device_wdt,
&samsung_asoc_dma,
&s5p6440_device_iis,
};

1
arch/arm/mach-s5p64x0/mach-smdk6450.c
View File

@ -113,6 +113,7 @@ static struct platform_device *smdk6450_devices[] __initdata = {
&s3c_device_i2c1,
&s3c_device_ts,
&s3c_device_wdt,
&samsung_asoc_dma,
&s5p6450_device_iis0,
/* s5p6450_device_spi0 will be added */
};

1
arch/arm/mach-s5pv210/mach-smdkc110.c
View File

@ -81,6 +81,7 @@ static struct s3c_ide_platdata smdkc110_ide_pdata __initdata = {
};
static struct platform_device *smdkc110_devices[] __initdata = {
&samsung_asoc_dma,
&s5pv210_device_iis0,
&s5pv210_device_ac97,
&s5pv210_device_spdif,

1
arch/arm/mach-s5pv210/mach-smdkv210.c
View File

@ -225,6 +225,7 @@ static struct platform_device *smdkv210_devices[] __initdata = {
&s5pv210_device_ac97,
&s5pv210_device_iis0,
&s5pv210_device_spdif,
&samsung_asoc_dma,
&samsung_device_keypad,
&smdkv210_dm9000,
&smdkv210_lcd_lte480wv,

3
arch/arm/mach-s5pv310/mach-smdkc210.c
View File

@ -163,8 +163,9 @@ static struct platform_device *smdkc210_devices[] __initdata = {
&s5pv310_device_pd[PD_CAM],
&s5pv310_device_pd[PD_TV],
&s5pv310_device_pd[PD_GPS],
&smdkc210_smsc911x,
&s5pv310_device_sysmmu,
&samsung_asoc_dma,
&smdkc210_smsc911x,
};
static void __init smdkc210_smsc911x_init(void)

3
arch/arm/mach-s5pv310/mach-smdkv310.c
View File

@ -163,8 +163,9 @@ static struct platform_device *smdkv310_devices[] __initdata = {
&s5pv310_device_pd[PD_CAM],
&s5pv310_device_pd[PD_TV],
&s5pv310_device_pd[PD_GPS],
&smdkv310_smsc911x,
&s5pv310_device_sysmmu,
&samsung_asoc_dma,
&smdkv310_smsc911x,
};
static void __init smdkv310_smsc911x_init(void)