aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xsound/soc/codecs/wm8994_samsung.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/sound/soc/codecs/wm8994_samsung.c b/sound/soc/codecs/wm8994_samsung.c
index a9e569b..c1f2bf2 100755
--- a/sound/soc/codecs/wm8994_samsung.c
+++ b/sound/soc/codecs/wm8994_samsung.c
@@ -40,6 +40,7 @@
#include <plat/gpio-cfg.h>
#include <mach/regs-clock.h>
#include "wm8994_samsung.h"
+#include "../../../arch/arm/mach-s5pv210/herring.h"
#define WM8994_VERSION "0.1"
#define SUBJECT "wm8994_samsung.c"
@@ -3010,11 +3011,12 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec)
}
gpio_direction_output(pdata->ear_sel, 0);
}
- s3c_gpio_setpull(pdata->ear_sel, S3C_GPIO_PULL_NONE);
-
- s3c_gpio_slp_cfgpin(pdata->ear_sel, S3C_GPIO_SLP_PREV);
- s3c_gpio_slp_setpull_updown(pdata->ear_sel, S3C_GPIO_PULL_NONE);
+ if (!herring_is_cdma_wimax_dev()) {
+ s3c_gpio_setpull(pdata->ear_sel, S3C_GPIO_PULL_NONE);
+ s3c_gpio_slp_cfgpin(pdata->ear_sel, S3C_GPIO_SLP_PREV);
+ s3c_gpio_slp_setpull_updown(pdata->ear_sel, S3C_GPIO_PULL_NONE);
+ }
wm8994_ldo_control(pdata, 1);
codec->hw_write = (hw_write_t) i2c_master_send;