aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorKukjin Kim <kgene.kim@samsung.com>2013-01-02 13:18:58 -0500
committerKukjin Kim <kgene.kim@samsung.com>2013-01-10 13:45:35 -0500
commit232910d6bf8d9565a20824aea0d4393b5772e985 (patch)
treeb49225dce7bfc390216a4d9ff05876a048a66c92 /sound
parentb2ca78717cea921151baf4af5ac9322eacf872c6 (diff)
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 3870e9678b5d..15a3817aa5c8 100644
--- a/sound/soc/samsung/h1940_uda1380.c
+++ b/sound/soc/samsung/h1940_uda1380.c
@@ -21,7 +21,6 @@
21#include <sound/jack.h> 21#include <sound/jack.h>
22 22
23#include <plat/regs-iis.h> 23#include <plat/regs-iis.h>
24#include <mach/h1940-latch.h>
25#include <asm/mach-types.h> 24#include <asm/mach-types.h>
26 25
27#include "s3c24xx-i2s.h" 26#include "s3c24xx-i2s.h"
@@ -147,9 +146,9 @@ static int h1940_spk_power(struct snd_soc_dapm_widget *w,
147 struct snd_kcontrol *kcontrol, int event) 146 struct snd_kcontrol *kcontrol, int event)
148{ 147{
149 if (SND_SOC_DAPM_EVENT_ON(event)) 148 if (SND_SOC_DAPM_EVENT_ON(event))
150 gpio_set_value(H1940_LATCH_AUDIO_POWER, 1); 149 gpio_set_value(S3C_GPIO_END + 9, 1);
151 else 150 else
152 gpio_set_value(H1940_LATCH_AUDIO_POWER, 0); 151 gpio_set_value(S3C_GPIO_END + 9, 0);
153 152
154 return 0; 153 return 0;
155} 154}
@@ -233,11 +232,11 @@ static int __init h1940_init(void)
233 return -ENODEV; 232 return -ENODEV;
234 233
235 /* configure some gpios */ 234 /* configure some gpios */
236 ret = gpio_request(H1940_LATCH_AUDIO_POWER, "speaker-power"); 235 ret = gpio_request(S3C_GPIO_END + 9, "speaker-power");
237 if (ret) 236 if (ret)
238 goto err_out; 237 goto err_out;
239 238
240 ret = gpio_direction_output(H1940_LATCH_AUDIO_POWER, 0); 239 ret = gpio_direction_output(S3C_GPIO_END + 9, 0);
241 if (ret) 240 if (ret)
242 goto err_gpio; 241 goto err_gpio;
243 242
@@ -258,7 +257,7 @@ static int __init h1940_init(void)
258err_plat: 257err_plat:
259 platform_device_put(s3c24xx_snd_device); 258 platform_device_put(s3c24xx_snd_device);
260err_gpio: 259err_gpio:
261 gpio_free(H1940_LATCH_AUDIO_POWER); 260 gpio_free(S3C_GPIO_END + 9);
262 261
263err_out: 262err_out:
264 return ret; 263 return ret;
@@ -269,7 +268,7 @@ static void __exit h1940_exit(void)
269 platform_device_unregister(s3c24xx_snd_device); 268 platform_device_unregister(s3c24xx_snd_device);
270 snd_soc_jack_free_gpios(&hp_jack, ARRAY_SIZE(hp_jack_gpios), 269 snd_soc_jack_free_gpios(&hp_jack, ARRAY_SIZE(hp_jack_gpios),
271 hp_jack_gpios); 270 hp_jack_gpios);
272 gpio_free(H1940_LATCH_AUDIO_POWER); 271 gpio_free(S3C_GPIO_END + 9);
273} 272}
274 273
275module_init(h1940_init); 274module_init(h1940_init);