diff options
author | Vasily Khoruzhick <anarsoul@gmail.com> | 2010-09-07 10:04:15 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-09-08 06:26:57 -0400 |
commit | dedc3cf54eb746b05fef2e1ab51d3454d1b61c98 (patch) | |
tree | ddc5c3dea119ff7fb918c78f6c702b162d8e1d47 /sound/soc/s3c24xx/rx1950_uda1380.c | |
parent | df3c278eb3d6e65bd438130fb2ccc66249177b0e (diff) |
ASoC: rx1950: check that machine is rx1950 in glue driver
Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/s3c24xx/rx1950_uda1380.c')
-rw-r--r-- | sound/soc/s3c24xx/rx1950_uda1380.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sound/soc/s3c24xx/rx1950_uda1380.c b/sound/soc/s3c24xx/rx1950_uda1380.c index 2a16113231fd..0f6e806834bc 100644 --- a/sound/soc/s3c24xx/rx1950_uda1380.c +++ b/sound/soc/s3c24xx/rx1950_uda1380.c | |||
@@ -40,6 +40,8 @@ | |||
40 | 40 | ||
41 | #include <mach/regs-clock.h> | 41 | #include <mach/regs-clock.h> |
42 | 42 | ||
43 | #include <asm/mach-types.h> | ||
44 | |||
43 | #include "s3c-dma.h" | 45 | #include "s3c-dma.h" |
44 | #include "s3c24xx-i2s.h" | 46 | #include "s3c24xx-i2s.h" |
45 | #include "../codecs/uda1380.h" | 47 | #include "../codecs/uda1380.h" |
@@ -274,6 +276,9 @@ static int __init rx1950_init(void) | |||
274 | { | 276 | { |
275 | int ret; | 277 | int ret; |
276 | 278 | ||
279 | if (!machine_is_rx1950()) | ||
280 | return -ENODEV; | ||
281 | |||
277 | /* configure some gpios */ | 282 | /* configure some gpios */ |
278 | ret = gpio_request(S3C2410_GPA(1), "speaker-power"); | 283 | ret = gpio_request(S3C2410_GPA(1), "speaker-power"); |
279 | if (ret) | 284 | if (ret) |