diff options
Diffstat (limited to 'sound/soc/samsung')
-rw-r--r-- | sound/soc/samsung/ac97.c | 4 | ||||
-rw-r--r-- | sound/soc/samsung/ac97.h | 21 | ||||
-rw-r--r-- | sound/soc/samsung/ln2440sbc_alc650.c | 1 | ||||
-rw-r--r-- | sound/soc/samsung/smdk2443_wm9710.c | 1 | ||||
-rw-r--r-- | sound/soc/samsung/smdk_wm9713.c | 1 |
5 files changed, 3 insertions, 25 deletions
diff --git a/sound/soc/samsung/ac97.c b/sound/soc/samsung/ac97.c index 4770a9550341..1e84ee01eaca 100644 --- a/sound/soc/samsung/ac97.c +++ b/sound/soc/samsung/ac97.c | |||
@@ -25,11 +25,13 @@ | |||
25 | #include <plat/audio.h> | 25 | #include <plat/audio.h> |
26 | 26 | ||
27 | #include "dma.h" | 27 | #include "dma.h" |
28 | #include "ac97.h" | ||
29 | 28 | ||
30 | #define AC_CMD_ADDR(x) (x << 16) | 29 | #define AC_CMD_ADDR(x) (x << 16) |
31 | #define AC_CMD_DATA(x) (x & 0xffff) | 30 | #define AC_CMD_DATA(x) (x & 0xffff) |
32 | 31 | ||
32 | #define S3C_AC97_DAI_PCM 0 | ||
33 | #define S3C_AC97_DAI_MIC 1 | ||
34 | |||
33 | struct s3c_ac97_info { | 35 | struct s3c_ac97_info { |
34 | struct clk *ac97_clk; | 36 | struct clk *ac97_clk; |
35 | void __iomem *regs; | 37 | void __iomem *regs; |
diff --git a/sound/soc/samsung/ac97.h b/sound/soc/samsung/ac97.h deleted file mode 100644 index 0d0e1b511457..000000000000 --- a/sound/soc/samsung/ac97.h +++ /dev/null | |||
@@ -1,21 +0,0 @@ | |||
1 | /* sound/soc/samsung/ac97.h | ||
2 | * | ||
3 | * ALSA SoC Audio Layer - S3C AC97 Controller driver | ||
4 | * Evolved from s3c2443-ac97.h | ||
5 | * | ||
6 | * Copyright (c) 2010 Samsung Electronics Co. Ltd | ||
7 | * Author: Jaswinder Singh <jassi.brar@samsung.com> | ||
8 | * Credits: Graeme Gregory, Sean Choi | ||
9 | * | ||
10 | * This program is free software; you can redistribute it and/or modify | ||
11 | * it under the terms of the GNU General Public License version 2 as | ||
12 | * published by the Free Software Foundation. | ||
13 | */ | ||
14 | |||
15 | #ifndef __S3C_AC97_H_ | ||
16 | #define __S3C_AC97_H_ | ||
17 | |||
18 | #define S3C_AC97_DAI_PCM 0 | ||
19 | #define S3C_AC97_DAI_MIC 1 | ||
20 | |||
21 | #endif /* __S3C_AC97_H_ */ | ||
diff --git a/sound/soc/samsung/ln2440sbc_alc650.c b/sound/soc/samsung/ln2440sbc_alc650.c index a2bb34def740..02414290169b 100644 --- a/sound/soc/samsung/ln2440sbc_alc650.c +++ b/sound/soc/samsung/ln2440sbc_alc650.c | |||
@@ -23,7 +23,6 @@ | |||
23 | #include <sound/soc.h> | 23 | #include <sound/soc.h> |
24 | 24 | ||
25 | #include "dma.h" | 25 | #include "dma.h" |
26 | #include "ac97.h" | ||
27 | 26 | ||
28 | static struct snd_soc_card ln2440sbc; | 27 | static struct snd_soc_card ln2440sbc; |
29 | 28 | ||
diff --git a/sound/soc/samsung/smdk2443_wm9710.c b/sound/soc/samsung/smdk2443_wm9710.c index 3be7e7e92d6e..4bd8c0b63966 100644 --- a/sound/soc/samsung/smdk2443_wm9710.c +++ b/sound/soc/samsung/smdk2443_wm9710.c | |||
@@ -19,7 +19,6 @@ | |||
19 | #include <sound/soc.h> | 19 | #include <sound/soc.h> |
20 | 20 | ||
21 | #include "dma.h" | 21 | #include "dma.h" |
22 | #include "ac97.h" | ||
23 | 22 | ||
24 | static struct snd_soc_card smdk2443; | 23 | static struct snd_soc_card smdk2443; |
25 | 24 | ||
diff --git a/sound/soc/samsung/smdk_wm9713.c b/sound/soc/samsung/smdk_wm9713.c index ae5fed6f772f..d58d86e7e19d 100644 --- a/sound/soc/samsung/smdk_wm9713.c +++ b/sound/soc/samsung/smdk_wm9713.c | |||
@@ -16,7 +16,6 @@ | |||
16 | #include <sound/soc.h> | 16 | #include <sound/soc.h> |
17 | 17 | ||
18 | #include "dma.h" | 18 | #include "dma.h" |
19 | #include "ac97.h" | ||
20 | 19 | ||
21 | static struct snd_soc_card smdk; | 20 | static struct snd_soc_card smdk; |
22 | 21 | ||