summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorKukjin Kim <kgene.kim@samsung.com>2013-01-02 10:18:58 -0800
committerKukjin Kim <kgene.kim@samsung.com>2013-01-10 10:45:35 -0800
commit232910d6bf8d9565a20824aea0d4393b5772e985 (patch)
treeb49225dce7bfc390216a4d9ff05876a048a66c92 /sound
parentb2ca78717cea921151baf4af5ac9322eacf872c6 (diff)
downloadop-kernel-dev-232910d6bf8d9565a20824aea0d4393b5772e985.zip
op-kernel-dev-232910d6bf8d9565a20824aea0d4393b5772e985.tar.gz
ARM: S3C24XX: make h1940.h and h1940-latch.h local
The headers can be local in mach-s3c24xx/. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/samsung/h1940_uda1380.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/sound/soc/samsung/h1940_uda1380.c b/sound/soc/samsung/h1940_uda1380.c
index 3870e96..15a3817 100644
--- a/sound/soc/samsung/h1940_uda1380.c
+++ b/sound/soc/samsung/h1940_uda1380.c
@@ -21,7 +21,6 @@
#include <sound/jack.h>
#include <plat/regs-iis.h>
-#include <mach/h1940-latch.h>
#include <asm/mach-types.h>
#include "s3c24xx-i2s.h"
@@ -147,9 +146,9 @@ static int h1940_spk_power(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *kcontrol, int event)
{
if (SND_SOC_DAPM_EVENT_ON(event))
- gpio_set_value(H1940_LATCH_AUDIO_POWER, 1);
+ gpio_set_value(S3C_GPIO_END + 9, 1);
else
- gpio_set_value(H1940_LATCH_AUDIO_POWER, 0);
+ gpio_set_value(S3C_GPIO_END + 9, 0);
return 0;
}
@@ -233,11 +232,11 @@ static int __init h1940_init(void)
return -ENODEV;
/* configure some gpios */
- ret = gpio_request(H1940_LATCH_AUDIO_POWER, "speaker-power");
+ ret = gpio_request(S3C_GPIO_END + 9, "speaker-power");
if (ret)
goto err_out;
- ret = gpio_direction_output(H1940_LATCH_AUDIO_POWER, 0);
+ ret = gpio_direction_output(S3C_GPIO_END + 9, 0);
if (ret)
goto err_gpio;
@@ -258,7 +257,7 @@ static int __init h1940_init(void)
err_plat:
platform_device_put(s3c24xx_snd_device);
err_gpio:
- gpio_free(H1940_LATCH_AUDIO_POWER);
+ gpio_free(S3C_GPIO_END + 9);
err_out:
return ret;
@@ -269,7 +268,7 @@ static void __exit h1940_exit(void)
platform_device_unregister(s3c24xx_snd_device);
snd_soc_jack_free_gpios(&hp_jack, ARRAY_SIZE(hp_jack_gpios),
hp_jack_gpios);
- gpio_free(H1940_LATCH_AUDIO_POWER);
+ gpio_free(S3C_GPIO_END + 9);
}
module_init(h1940_init);
OpenPOWER on IntegriCloud