summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-s3c64xx/dev-audio.c
diff options
context:
space:
mode:
authorMark Brown2010-01-20 13:05:55 +0100
committerBen Dooks2010-01-21 05:55:15 +0100
commit1c24522c05f25b89cc4df5a875d8a005a774f570 (patch)
treede9a255cd2eb797315a0741078ad94810f067733 /arch/arm/plat-s3c64xx/dev-audio.c
parentARM: SMDK6410: Set up interrupt range for WM835x on 1190-EV1 PMIC board (diff)
downloadkernel-qcow2-linux-1c24522c05f25b89cc4df5a875d8a005a774f570.tar.gz
kernel-qcow2-linux-1c24522c05f25b89cc4df5a875d8a005a774f570.tar.xz
kernel-qcow2-linux-1c24522c05f25b89cc4df5a875d8a005a774f570.zip
ARM: S3C64XX: Fix dev-audio build
As reported when the patch was posted commit 71269364 ("ARM: S3C64XX: Add I2S resources in platform code") uses pin names for the IISv4 data output pins which are not present in mainline, causing dev-audio to fail to build. Fix this by using the defines which are actually present in the kernel source. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch/arm/plat-s3c64xx/dev-audio.c')
-rw-r--r--arch/arm/plat-s3c64xx/dev-audio.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/plat-s3c64xx/dev-audio.c b/arch/arm/plat-s3c64xx/dev-audio.c
index cdba3a77ea19..5b89344779f0 100644
--- a/arch/arm/plat-s3c64xx/dev-audio.c
+++ b/arch/arm/plat-s3c64xx/dev-audio.c
@@ -51,9 +51,9 @@ static int s3c64xx_i2sv3_cfg_gpio(struct platform_device *pdev)
static int s3c64xx_i2sv4_cfg_gpio(struct platform_device *pdev)
{
- s3c_gpio_cfgpin(S3C64XX_GPC(4), S3C64XX_GPC4_I2S0_V40_DO);
- s3c_gpio_cfgpin(S3C64XX_GPC(5), S3C64XX_GPC5_I2S1_V40_DO);
- s3c_gpio_cfgpin(S3C64XX_GPC(7), S3C64XX_GPC7_I2S2_V40_DO);
+ s3c_gpio_cfgpin(S3C64XX_GPC(4), S3C64XX_GPC4_I2S_V40_DO0);
+ s3c_gpio_cfgpin(S3C64XX_GPC(5), S3C64XX_GPC5_I2S_V40_DO1);
+ s3c_gpio_cfgpin(S3C64XX_GPC(7), S3C64XX_GPC7_I2S_V40_DO2);
s3c_gpio_cfgpin(S3C64XX_GPH(6), S3C64XX_GPH6_I2S_V40_BCLK);
s3c_gpio_cfgpin(S3C64XX_GPH(7), S3C64XX_GPH7_I2S_V40_CDCLK);
s3c_gpio_cfgpin(S3C64XX_GPH(8), S3C64XX_GPH8_I2S_V40_LRCLK);