diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-exynos/mach-armlex4210.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-exynos/mach-smdkv310.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-s3c24xx/mach-gta02.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-s3c24xx/mach-h1940.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-s3c24xx/mach-mini2440.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-s3c24xx/mach-rx1950.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-s3c64xx/mach-crag6410.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-s3c64xx/mach-smdk6410.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-s5p64x0/mach-smdk6440.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-s5p64x0/mach-smdk6450.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-s5pc100/mach-smdkc100.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-s5pv210/mach-smdkc110.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-s5pv210/mach-smdkv210.c | 1 | ||||
-rw-r--r-- | arch/arm/plat-samsung/devs.c | 9 | ||||
-rw-r--r-- | arch/arm/plat-samsung/include/plat/devs.h | 1 |
15 files changed, 0 insertions, 23 deletions
diff --git a/arch/arm/mach-exynos/mach-armlex4210.c b/arch/arm/mach-exynos/mach-armlex4210.c index 3f37a5e8a1f4..b938f9fc1dd1 100644 --- a/arch/arm/mach-exynos/mach-armlex4210.c +++ b/arch/arm/mach-exynos/mach-armlex4210.c | |||
@@ -147,7 +147,6 @@ static struct platform_device *armlex4210_devices[] __initdata = { | |||
147 | &s3c_device_hsmmc3, | 147 | &s3c_device_hsmmc3, |
148 | &s3c_device_rtc, | 148 | &s3c_device_rtc, |
149 | &s3c_device_wdt, | 149 | &s3c_device_wdt, |
150 | &samsung_asoc_dma, | ||
151 | &armlex4210_smsc911x, | 150 | &armlex4210_smsc911x, |
152 | &exynos4_device_ahci, | 151 | &exynos4_device_ahci, |
153 | }; | 152 | }; |
diff --git a/arch/arm/mach-exynos/mach-smdkv310.c b/arch/arm/mach-exynos/mach-smdkv310.c index ee4fb1a9cb72..5de9ee28a508 100644 --- a/arch/arm/mach-exynos/mach-smdkv310.c +++ b/arch/arm/mach-exynos/mach-smdkv310.c | |||
@@ -311,7 +311,6 @@ static struct platform_device *smdkv310_devices[] __initdata = { | |||
311 | &s5p_device_mfc_l, | 311 | &s5p_device_mfc_l, |
312 | &s5p_device_mfc_r, | 312 | &s5p_device_mfc_r, |
313 | &exynos4_device_spdif, | 313 | &exynos4_device_spdif, |
314 | &samsung_asoc_dma, | ||
315 | &samsung_asoc_idma, | 314 | &samsung_asoc_idma, |
316 | &s5p_device_fimd0, | 315 | &s5p_device_fimd0, |
317 | &smdkv310_device_audio, | 316 | &smdkv310_device_audio, |
diff --git a/arch/arm/mach-s3c24xx/mach-gta02.c b/arch/arm/mach-s3c24xx/mach-gta02.c index 4a963467b7ee..973b87ca87f4 100644 --- a/arch/arm/mach-s3c24xx/mach-gta02.c +++ b/arch/arm/mach-s3c24xx/mach-gta02.c | |||
@@ -521,7 +521,6 @@ static struct platform_device *gta02_devices[] __initdata = { | |||
521 | >a02_nor_flash, | 521 | >a02_nor_flash, |
522 | &s3c24xx_pwm_device, | 522 | &s3c24xx_pwm_device, |
523 | &s3c_device_iis, | 523 | &s3c_device_iis, |
524 | &samsung_asoc_dma, | ||
525 | &s3c_device_i2c0, | 524 | &s3c_device_i2c0, |
526 | >a02_dfbmcs320_device, | 525 | >a02_dfbmcs320_device, |
527 | >a02_buttons_device, | 526 | >a02_buttons_device, |
diff --git a/arch/arm/mach-s3c24xx/mach-h1940.c b/arch/arm/mach-s3c24xx/mach-h1940.c index 63aaf076f611..b23dd1b106e8 100644 --- a/arch/arm/mach-s3c24xx/mach-h1940.c +++ b/arch/arm/mach-s3c24xx/mach-h1940.c | |||
@@ -632,7 +632,6 @@ static struct platform_device *h1940_devices[] __initdata = { | |||
632 | &s3c_device_wdt, | 632 | &s3c_device_wdt, |
633 | &s3c_device_i2c0, | 633 | &s3c_device_i2c0, |
634 | &s3c_device_iis, | 634 | &s3c_device_iis, |
635 | &samsung_asoc_dma, | ||
636 | &s3c_device_usbgadget, | 635 | &s3c_device_usbgadget, |
637 | &h1940_device_leds, | 636 | &h1940_device_leds, |
638 | &h1940_device_bluetooth, | 637 | &h1940_device_bluetooth, |
diff --git a/arch/arm/mach-s3c24xx/mach-mini2440.c b/arch/arm/mach-s3c24xx/mach-mini2440.c index 393c0f1ac11a..a31d5b83e5f7 100644 --- a/arch/arm/mach-s3c24xx/mach-mini2440.c +++ b/arch/arm/mach-s3c24xx/mach-mini2440.c | |||
@@ -519,7 +519,6 @@ static struct platform_device *mini2440_devices[] __initdata = { | |||
519 | &s3c_device_iis, | 519 | &s3c_device_iis, |
520 | &uda1340_codec, | 520 | &uda1340_codec, |
521 | &mini2440_audio, | 521 | &mini2440_audio, |
522 | &samsung_asoc_dma, | ||
523 | }; | 522 | }; |
524 | 523 | ||
525 | static void __init mini2440_map_io(void) | 524 | static void __init mini2440_map_io(void) |
diff --git a/arch/arm/mach-s3c24xx/mach-rx1950.c b/arch/arm/mach-s3c24xx/mach-rx1950.c index 379fde521d37..0606f2faaa5c 100644 --- a/arch/arm/mach-s3c24xx/mach-rx1950.c +++ b/arch/arm/mach-s3c24xx/mach-rx1950.c | |||
@@ -712,7 +712,6 @@ static struct platform_device *rx1950_devices[] __initdata = { | |||
712 | &s3c_device_wdt, | 712 | &s3c_device_wdt, |
713 | &s3c_device_i2c0, | 713 | &s3c_device_i2c0, |
714 | &s3c_device_iis, | 714 | &s3c_device_iis, |
715 | &samsung_asoc_dma, | ||
716 | &s3c_device_usbgadget, | 715 | &s3c_device_usbgadget, |
717 | &s3c_device_rtc, | 716 | &s3c_device_rtc, |
718 | &s3c_device_nand, | 717 | &s3c_device_nand, |
diff --git a/arch/arm/mach-s3c64xx/mach-crag6410.c b/arch/arm/mach-s3c64xx/mach-crag6410.c index 13b7eaa45fd0..ef2117d7391b 100644 --- a/arch/arm/mach-s3c64xx/mach-crag6410.c +++ b/arch/arm/mach-s3c64xx/mach-crag6410.c | |||
@@ -357,7 +357,6 @@ static struct platform_device *crag6410_devices[] __initdata = { | |||
357 | &s3c_device_timer[0], | 357 | &s3c_device_timer[0], |
358 | &s3c64xx_device_iis0, | 358 | &s3c64xx_device_iis0, |
359 | &s3c64xx_device_iis1, | 359 | &s3c64xx_device_iis1, |
360 | &samsung_asoc_dma, | ||
361 | &samsung_device_keypad, | 360 | &samsung_device_keypad, |
362 | &crag6410_gpio_keydev, | 361 | &crag6410_gpio_keydev, |
363 | &crag6410_dm9k_device, | 362 | &crag6410_dm9k_device, |
diff --git a/arch/arm/mach-s3c64xx/mach-smdk6410.c b/arch/arm/mach-s3c64xx/mach-smdk6410.c index da1a771a29e9..574a9eef588d 100644 --- a/arch/arm/mach-s3c64xx/mach-smdk6410.c +++ b/arch/arm/mach-s3c64xx/mach-smdk6410.c | |||
@@ -275,7 +275,6 @@ static struct platform_device *smdk6410_devices[] __initdata = { | |||
275 | &s3c_device_fb, | 275 | &s3c_device_fb, |
276 | &s3c_device_ohci, | 276 | &s3c_device_ohci, |
277 | &s3c_device_usb_hsotg, | 277 | &s3c_device_usb_hsotg, |
278 | &samsung_asoc_dma, | ||
279 | &s3c64xx_device_iisv4, | 278 | &s3c64xx_device_iisv4, |
280 | &samsung_device_keypad, | 279 | &samsung_device_keypad, |
281 | 280 | ||
diff --git a/arch/arm/mach-s5p64x0/mach-smdk6440.c b/arch/arm/mach-s5p64x0/mach-smdk6440.c index 96ea1fe0ec94..1af823558c60 100644 --- a/arch/arm/mach-s5p64x0/mach-smdk6440.c +++ b/arch/arm/mach-s5p64x0/mach-smdk6440.c | |||
@@ -165,7 +165,6 @@ static struct platform_device *smdk6440_devices[] __initdata = { | |||
165 | &s3c_device_i2c1, | 165 | &s3c_device_i2c1, |
166 | &s3c_device_ts, | 166 | &s3c_device_ts, |
167 | &s3c_device_wdt, | 167 | &s3c_device_wdt, |
168 | &samsung_asoc_dma, | ||
169 | &s5p6440_device_iis, | 168 | &s5p6440_device_iis, |
170 | &s3c_device_fb, | 169 | &s3c_device_fb, |
171 | &smdk6440_lcd_lte480wv, | 170 | &smdk6440_lcd_lte480wv, |
diff --git a/arch/arm/mach-s5p64x0/mach-smdk6450.c b/arch/arm/mach-s5p64x0/mach-smdk6450.c index 12748b6eaa7b..62526ccf6b70 100644 --- a/arch/arm/mach-s5p64x0/mach-smdk6450.c +++ b/arch/arm/mach-s5p64x0/mach-smdk6450.c | |||
@@ -183,7 +183,6 @@ static struct platform_device *smdk6450_devices[] __initdata = { | |||
183 | &s3c_device_i2c1, | 183 | &s3c_device_i2c1, |
184 | &s3c_device_ts, | 184 | &s3c_device_ts, |
185 | &s3c_device_wdt, | 185 | &s3c_device_wdt, |
186 | &samsung_asoc_dma, | ||
187 | &s5p6450_device_iis0, | 186 | &s5p6450_device_iis0, |
188 | &s3c_device_fb, | 187 | &s3c_device_fb, |
189 | &smdk6450_lcd_lte480wv, | 188 | &smdk6450_lcd_lte480wv, |
diff --git a/arch/arm/mach-s5pc100/mach-smdkc100.c b/arch/arm/mach-s5pc100/mach-smdkc100.c index dba7384a87bd..9abe95e806ab 100644 --- a/arch/arm/mach-s5pc100/mach-smdkc100.c +++ b/arch/arm/mach-s5pc100/mach-smdkc100.c | |||
@@ -197,7 +197,6 @@ static struct platform_device *smdkc100_devices[] __initdata = { | |||
197 | &s3c_device_ts, | 197 | &s3c_device_ts, |
198 | &s3c_device_wdt, | 198 | &s3c_device_wdt, |
199 | &smdkc100_lcd_powerdev, | 199 | &smdkc100_lcd_powerdev, |
200 | &samsung_asoc_dma, | ||
201 | &s5pc100_device_iis0, | 200 | &s5pc100_device_iis0, |
202 | &samsung_device_keypad, | 201 | &samsung_device_keypad, |
203 | &s5pc100_device_ac97, | 202 | &s5pc100_device_ac97, |
diff --git a/arch/arm/mach-s5pv210/mach-smdkc110.c b/arch/arm/mach-s5pv210/mach-smdkc110.c index d9c99fcc1aa7..f1f3bd37ecda 100644 --- a/arch/arm/mach-s5pv210/mach-smdkc110.c +++ b/arch/arm/mach-s5pv210/mach-smdkc110.c | |||
@@ -85,7 +85,6 @@ static struct s3c_ide_platdata smdkc110_ide_pdata __initdata = { | |||
85 | }; | 85 | }; |
86 | 86 | ||
87 | static struct platform_device *smdkc110_devices[] __initdata = { | 87 | static struct platform_device *smdkc110_devices[] __initdata = { |
88 | &samsung_asoc_dma, | ||
89 | &s5pv210_device_iis0, | 88 | &s5pv210_device_iis0, |
90 | &s5pv210_device_ac97, | 89 | &s5pv210_device_ac97, |
91 | &s5pv210_device_spdif, | 90 | &s5pv210_device_spdif, |
diff --git a/arch/arm/mach-s5pv210/mach-smdkv210.c b/arch/arm/mach-s5pv210/mach-smdkv210.c index 4cdb5bb7bbcf..6bc8404bf678 100644 --- a/arch/arm/mach-s5pv210/mach-smdkv210.c +++ b/arch/arm/mach-s5pv210/mach-smdkv210.c | |||
@@ -234,7 +234,6 @@ static struct platform_device *smdkv210_devices[] __initdata = { | |||
234 | &s5pv210_device_ac97, | 234 | &s5pv210_device_ac97, |
235 | &s5pv210_device_iis0, | 235 | &s5pv210_device_iis0, |
236 | &s5pv210_device_spdif, | 236 | &s5pv210_device_spdif, |
237 | &samsung_asoc_dma, | ||
238 | &samsung_asoc_idma, | 237 | &samsung_asoc_idma, |
239 | &samsung_device_keypad, | 238 | &samsung_device_keypad, |
240 | &smdkv210_dm9000, | 239 | &smdkv210_dm9000, |
diff --git a/arch/arm/plat-samsung/devs.c b/arch/arm/plat-samsung/devs.c index 03f654d55eff..7d27a241f984 100644 --- a/arch/arm/plat-samsung/devs.c +++ b/arch/arm/plat-samsung/devs.c | |||
@@ -146,15 +146,6 @@ struct platform_device s3c_device_camif = { | |||
146 | 146 | ||
147 | /* ASOC DMA */ | 147 | /* ASOC DMA */ |
148 | 148 | ||
149 | struct platform_device samsung_asoc_dma = { | ||
150 | .name = "samsung-audio", | ||
151 | .id = -1, | ||
152 | .dev = { | ||
153 | .dma_mask = &samsung_device_dma_mask, | ||
154 | .coherent_dma_mask = DMA_BIT_MASK(32), | ||
155 | } | ||
156 | }; | ||
157 | |||
158 | struct platform_device samsung_asoc_idma = { | 149 | struct platform_device samsung_asoc_idma = { |
159 | .name = "samsung-idma", | 150 | .name = "samsung-idma", |
160 | .id = -1, | 151 | .id = -1, |
diff --git a/arch/arm/plat-samsung/include/plat/devs.h b/arch/arm/plat-samsung/include/plat/devs.h index 5da4b4f38f40..c45f70cbbfb7 100644 --- a/arch/arm/plat-samsung/include/plat/devs.h +++ b/arch/arm/plat-samsung/include/plat/devs.h | |||
@@ -135,7 +135,6 @@ extern struct platform_device exynos4_device_spdif; | |||
135 | 135 | ||
136 | extern struct platform_device exynos_device_drm; | 136 | extern struct platform_device exynos_device_drm; |
137 | 137 | ||
138 | extern struct platform_device samsung_asoc_dma; | ||
139 | extern struct platform_device samsung_asoc_idma; | 138 | extern struct platform_device samsung_asoc_idma; |
140 | extern struct platform_device samsung_device_keypad; | 139 | extern struct platform_device samsung_device_keypad; |
141 | 140 | ||