summaryrefslogtreecommitdiffstats
path: root/sound/soc/s3c24xx
diff options
context:
space:
mode:
authorVasily Khoruzhick <anarsoul@gmail.com>2010-09-07 16:04:15 +0200
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-09-08 12:26:57 +0200
commitdedc3cf54eb746b05fef2e1ab51d3454d1b61c98 (patch)
treeddc5c3dea119ff7fb918c78f6c702b162d8e1d47 /sound/soc/s3c24xx
parentASoC: Remove export of CS4270 DAI (diff)
downloadlinux-dedc3cf54eb746b05fef2e1ab51d3454d1b61c98.tar.xz
linux-dedc3cf54eb746b05fef2e1ab51d3454d1b61c98.zip
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')
-rw-r--r--sound/soc/s3c24xx/rx1950_uda1380.c5
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 @@
#include <mach/regs-clock.h>
+#include <asm/mach-types.h>
+
#include "s3c-dma.h"
#include "s3c24xx-i2s.h"
#include "../codecs/uda1380.h"
@@ -274,6 +276,9 @@ static int __init rx1950_init(void)
{
int ret;
+ if (!machine_is_rx1950())
+ return -ENODEV;
+
/* configure some gpios */
ret = gpio_request(S3C2410_GPA(1), "speaker-power");
if (ret)