diff options
author | Ben Dooks <ben@simtec.co.uk> | 2009-10-12 16:17:09 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-10-13 08:33:53 -0400 |
commit | ed9d040d40942e9c48167f9f37f86fab8e0e5e17 (patch) | |
tree | 21b0d18f6053d4e9460f239217f249d5c12247c5 | |
parent | 814b7963e50e331f129acc25ad92bd4db45c300f (diff) |
ASoC: S3C: Remove <plat/audio.h>
Remove the <plat/audio.h> include from arch/arm/plat-s3c/include/plat/audio.h
as it provides nothing to the current kernel and is not in any future plans
for the system.
Signed-off-by: Ben Dooks <ben@simtec.co.uk>
Signed-off-by: Simtec Linux Team <linux@simtec.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r-- | arch/arm/plat-s3c/include/plat/audio.h | 45 | ||||
-rw-r--r-- | sound/soc/s3c24xx/neo1973_wm8753.c | 1 | ||||
-rw-r--r-- | sound/soc/s3c24xx/s3c-i2s-v2.c | 1 | ||||
-rw-r--r-- | sound/soc/s3c24xx/s3c2412-i2s.c | 1 | ||||
-rw-r--r-- | sound/soc/s3c24xx/s3c2443-ac97.c | 1 | ||||
-rw-r--r-- | sound/soc/s3c24xx/s3c24xx-i2s.c | 2 | ||||
-rw-r--r-- | sound/soc/s3c24xx/s3c24xx-pcm.c | 1 | ||||
-rw-r--r-- | sound/soc/s3c24xx/s3c64xx-i2s.c | 1 |
8 files changed, 1 insertions, 52 deletions
diff --git a/arch/arm/plat-s3c/include/plat/audio.h b/arch/arm/plat-s3c/include/plat/audio.h deleted file mode 100644 index de0e8da48bc3..000000000000 --- a/arch/arm/plat-s3c/include/plat/audio.h +++ /dev/null | |||
@@ -1,45 +0,0 @@ | |||
1 | /* arch/arm/mach-s3c2410/include/mach/audio.h | ||
2 | * | ||
3 | * Copyright (c) 2004-2005 Simtec Electronics | ||
4 | * http://www.simtec.co.uk/products/SWLINUX/ | ||
5 | * Ben Dooks <ben@simtec.co.uk> | ||
6 | * | ||
7 | * S3C24XX - Audio platfrom_device info | ||
8 | * | ||
9 | * This program is free software; you can redistribute it and/or modify | ||
10 | * it under the terms of the GNU General Public License version 2 as | ||
11 | * published by the Free Software Foundation. | ||
12 | */ | ||
13 | |||
14 | #ifndef __ASM_ARCH_AUDIO_H | ||
15 | #define __ASM_ARCH_AUDIO_H __FILE__ | ||
16 | |||
17 | /* struct s3c24xx_iis_ops | ||
18 | * | ||
19 | * called from the s3c24xx audio core to deal with the architecture | ||
20 | * or the codec's setup and control. | ||
21 | * | ||
22 | * the pointer to itself is passed through in case the caller wants to | ||
23 | * embed this in an larger structure for easy reference to it's context. | ||
24 | */ | ||
25 | |||
26 | struct s3c24xx_iis_ops { | ||
27 | struct module *owner; | ||
28 | |||
29 | int (*startup)(struct s3c24xx_iis_ops *me); | ||
30 | void (*shutdown)(struct s3c24xx_iis_ops *me); | ||
31 | int (*suspend)(struct s3c24xx_iis_ops *me); | ||
32 | int (*resume)(struct s3c24xx_iis_ops *me); | ||
33 | |||
34 | int (*open)(struct s3c24xx_iis_ops *me, struct snd_pcm_substream *strm); | ||
35 | int (*close)(struct s3c24xx_iis_ops *me, struct snd_pcm_substream *strm); | ||
36 | int (*prepare)(struct s3c24xx_iis_ops *me, struct snd_pcm_substream *strm, struct snd_pcm_runtime *rt); | ||
37 | }; | ||
38 | |||
39 | struct s3c24xx_platdata_iis { | ||
40 | const char *codec_clk; | ||
41 | struct s3c24xx_iis_ops *ops; | ||
42 | int (*match_dev)(struct device *dev); | ||
43 | }; | ||
44 | |||
45 | #endif /* __ASM_ARCH_AUDIO_H */ | ||
diff --git a/sound/soc/s3c24xx/neo1973_wm8753.c b/sound/soc/s3c24xx/neo1973_wm8753.c index c9b794843a70..77de6c5127d2 100644 --- a/sound/soc/s3c24xx/neo1973_wm8753.c +++ b/sound/soc/s3c24xx/neo1973_wm8753.c | |||
@@ -29,7 +29,6 @@ | |||
29 | #include <mach/regs-clock.h> | 29 | #include <mach/regs-clock.h> |
30 | #include <mach/regs-gpio.h> | 30 | #include <mach/regs-gpio.h> |
31 | #include <mach/hardware.h> | 31 | #include <mach/hardware.h> |
32 | #include <plat/audio.h> | ||
33 | #include <linux/io.h> | 32 | #include <linux/io.h> |
34 | #include <mach/spi-gpio.h> | 33 | #include <mach/spi-gpio.h> |
35 | 34 | ||
diff --git a/sound/soc/s3c24xx/s3c-i2s-v2.c b/sound/soc/s3c24xx/s3c-i2s-v2.c index 11c45a37c631..28b0ab255096 100644 --- a/sound/soc/s3c24xx/s3c-i2s-v2.c +++ b/sound/soc/s3c24xx/s3c-i2s-v2.c | |||
@@ -32,7 +32,6 @@ | |||
32 | 32 | ||
33 | #include <plat/regs-s3c2412-iis.h> | 33 | #include <plat/regs-s3c2412-iis.h> |
34 | 34 | ||
35 | #include <plat/audio.h> | ||
36 | #include <mach/dma.h> | 35 | #include <mach/dma.h> |
37 | 36 | ||
38 | #include "s3c-i2s-v2.h" | 37 | #include "s3c-i2s-v2.h" |
diff --git a/sound/soc/s3c24xx/s3c2412-i2s.c b/sound/soc/s3c24xx/s3c2412-i2s.c index a587ec40b449..ac5e47b082fb 100644 --- a/sound/soc/s3c24xx/s3c2412-i2s.c +++ b/sound/soc/s3c24xx/s3c2412-i2s.c | |||
@@ -34,7 +34,6 @@ | |||
34 | 34 | ||
35 | #include <plat/regs-s3c2412-iis.h> | 35 | #include <plat/regs-s3c2412-iis.h> |
36 | 36 | ||
37 | #include <plat/audio.h> | ||
38 | #include <mach/regs-gpio.h> | 37 | #include <mach/regs-gpio.h> |
39 | #include <mach/dma.h> | 38 | #include <mach/dma.h> |
40 | 39 | ||
diff --git a/sound/soc/s3c24xx/s3c2443-ac97.c b/sound/soc/s3c24xx/s3c2443-ac97.c index fc1beb0930b9..b25e9f968df9 100644 --- a/sound/soc/s3c24xx/s3c2443-ac97.c +++ b/sound/soc/s3c24xx/s3c2443-ac97.c | |||
@@ -32,7 +32,6 @@ | |||
32 | #include <plat/regs-ac97.h> | 32 | #include <plat/regs-ac97.h> |
33 | #include <mach/regs-gpio.h> | 33 | #include <mach/regs-gpio.h> |
34 | #include <mach/regs-clock.h> | 34 | #include <mach/regs-clock.h> |
35 | #include <plat/audio.h> | ||
36 | #include <asm/dma.h> | 35 | #include <asm/dma.h> |
37 | #include <mach/dma.h> | 36 | #include <mach/dma.h> |
38 | 37 | ||
diff --git a/sound/soc/s3c24xx/s3c24xx-i2s.c b/sound/soc/s3c24xx/s3c24xx-i2s.c index 40e2c4790f0d..c76b8bb214bc 100644 --- a/sound/soc/s3c24xx/s3c24xx-i2s.c +++ b/sound/soc/s3c24xx/s3c24xx-i2s.c | |||
@@ -32,7 +32,7 @@ | |||
32 | #include <mach/hardware.h> | 32 | #include <mach/hardware.h> |
33 | #include <mach/regs-gpio.h> | 33 | #include <mach/regs-gpio.h> |
34 | #include <mach/regs-clock.h> | 34 | #include <mach/regs-clock.h> |
35 | #include <plat/audio.h> | 35 | |
36 | #include <asm/dma.h> | 36 | #include <asm/dma.h> |
37 | #include <mach/dma.h> | 37 | #include <mach/dma.h> |
38 | 38 | ||
diff --git a/sound/soc/s3c24xx/s3c24xx-pcm.c b/sound/soc/s3c24xx/s3c24xx-pcm.c index 5cbbdc80fde3..27cf097c2b1d 100644 --- a/sound/soc/s3c24xx/s3c24xx-pcm.c +++ b/sound/soc/s3c24xx/s3c24xx-pcm.c | |||
@@ -29,7 +29,6 @@ | |||
29 | #include <asm/dma.h> | 29 | #include <asm/dma.h> |
30 | #include <mach/hardware.h> | 30 | #include <mach/hardware.h> |
31 | #include <mach/dma.h> | 31 | #include <mach/dma.h> |
32 | #include <plat/audio.h> | ||
33 | 32 | ||
34 | #include "s3c24xx-pcm.h" | 33 | #include "s3c24xx-pcm.h" |
35 | 34 | ||
diff --git a/sound/soc/s3c24xx/s3c64xx-i2s.c b/sound/soc/s3c24xx/s3c64xx-i2s.c index 43fb253a3429..b67eed59666a 100644 --- a/sound/soc/s3c24xx/s3c64xx-i2s.c +++ b/sound/soc/s3c24xx/s3c64xx-i2s.c | |||
@@ -31,7 +31,6 @@ | |||
31 | #include <plat/gpio-bank-d.h> | 31 | #include <plat/gpio-bank-d.h> |
32 | #include <plat/gpio-bank-e.h> | 32 | #include <plat/gpio-bank-e.h> |
33 | #include <plat/gpio-cfg.h> | 33 | #include <plat/gpio-cfg.h> |
34 | #include <plat/audio.h> | ||
35 | 34 | ||
36 | #include <mach/map.h> | 35 | #include <mach/map.h> |
37 | #include <mach/dma.h> | 36 | #include <mach/dma.h> |