aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/samsung
diff options
context:
space:
mode:
authorKukjin Kim <kgene.kim@samsung.com>2013-01-02 12:57:59 -0500
committerKukjin Kim <kgene.kim@samsung.com>2013-01-10 13:45:35 -0500
commitb2ca78717cea921151baf4af5ac9322eacf872c6 (patch)
treecefe98d438248f9a3d481360ba1785dc82c9768a /sound/soc/samsung
parentbbd7e5e1e90954761f766400000a8f4c882d1202 (diff)
ARM: S3C24XX: make gta02.h local
The header can be local in mach-s3c24xx/ and sort out inclusions. Accordingly, the GTA02_ macro in driver can be replaced. Cc: Sangbeom Kim <sbkim73@samsung.com> Cc: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'sound/soc/samsung')
-rw-r--r--sound/soc/samsung/neo1973_wm8753.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/samsung/neo1973_wm8753.c b/sound/soc/samsung/neo1973_wm8753.c
index c7e965f80d2e..a301d8cfaa34 100644
--- a/sound/soc/samsung/neo1973_wm8753.c
+++ b/sound/soc/samsung/neo1973_wm8753.c
@@ -237,7 +237,7 @@ static int lm4853_set_spk(struct snd_kcontrol *kcontrol,
237{ 237{
238 gta02_speaker_enabled = ucontrol->value.integer.value[0]; 238 gta02_speaker_enabled = ucontrol->value.integer.value[0];
239 239
240 gpio_set_value(GTA02_GPIO_HP_IN, !gta02_speaker_enabled); 240 gpio_set_value(S3C2410_GPJ(2), !gta02_speaker_enabled);
241 241
242 return 0; 242 return 0;
243} 243}
@@ -252,7 +252,7 @@ static int lm4853_get_spk(struct snd_kcontrol *kcontrol,
252static int lm4853_event(struct snd_soc_dapm_widget *w, 252static int lm4853_event(struct snd_soc_dapm_widget *w,
253 struct snd_kcontrol *k, int event) 253 struct snd_kcontrol *k, int event)
254{ 254{
255 gpio_set_value(GTA02_GPIO_AMP_SHUT, SND_SOC_DAPM_EVENT_OFF(event)); 255 gpio_set_value(S3C2410_GPJ(1), SND_SOC_DAPM_EVENT_OFF(event));
256 256
257 return 0; 257 return 0;
258} 258}
@@ -396,8 +396,8 @@ static struct snd_soc_codec_conf neo1973_codec_conf[] = {
396}; 396};
397 397
398static const struct gpio neo1973_gta02_gpios[] = { 398static const struct gpio neo1973_gta02_gpios[] = {
399 { GTA02_GPIO_HP_IN, GPIOF_OUT_INIT_HIGH, "GTA02_HP_IN" }, 399 { S3C2410_GPJ(2), GPIOF_OUT_INIT_HIGH, "GTA02_HP_IN" },
400 { GTA02_GPIO_AMP_SHUT, GPIOF_OUT_INIT_HIGH, "GTA02_AMP_SHUT" }, 400 { S3C2410_GPJ(1), GPIOF_OUT_INIT_HIGH, "GTA02_AMP_SHUT" },
401}; 401};
402 402
403static struct snd_soc_card neo1973 = { 403static struct snd_soc_card neo1973 = {