aboutsummaryrefslogtreecommitdiffstats
path: root/sound/arm
diff options
context:
space:
mode:
authorMichal Piotrowski <michal.k.k.piotrowski@gmail.com>2007-08-02 08:26:43 -0400
committerJaroslav Kysela <perex@perex.cz>2007-10-16 09:58:24 -0400
commit350a29b457de480ee517dbb194a934421b2e9f37 (patch)
tree3e4f8617cbdf202ed83c14b0d36b217a1f7a9aa2 /sound/arm
parent609bb2ea397cd9947d8898f6077d33c1fa81b24f (diff)
[ALSA] Get rid of dead code in sound/arm/sa11xx-uda1341.c
File /home/devel/linux-rdc/sound/arm/sa11xx-uda1341.c line 82 Unknown CONFIG option! CONFIG_H3600_HAL File /home/devel/linux-rdc/sound/arm/sa11xx-uda1341.c line 103 Unknown CONFIG option! CONFIG_H3600_HAL File /home/devel/linux-rdc/sound/arm/sa11xx-uda1341.c line 241 Unknown CONFIG option! CONFIG_H3600_HAL File /home/devel/linux-rdc/sound/arm/sa11xx-uda1341.c line 310 Unknown CONFIG option! CONFIG_H3600_HAL File /home/devel/linux-rdc/sound/arm/sa11xx-uda1341.c line 334 Unknown CONFIG option! CONFIG_H3600_HAL File /home/devel/linux-rdc/sound/arm/sa11xx-uda1341.c line 344 Unknown CONFIG option! CONFIG_H3600_HAL File /home/devel/linux-rdc/sound/arm/sa11xx-uda1341.c line 357 Unknown CONFIG option! CONFIG_H3600_HAL Signed-off-by: Michal Piotrowski <michal.k.k.piotrowski@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/arm')
-rw-r--r--sound/arm/sa11xx-uda1341.c35
1 files changed, 4 insertions, 31 deletions
diff --git a/sound/arm/sa11xx-uda1341.c b/sound/arm/sa11xx-uda1341.c
index e7ed868fa7c0..81c64b09d359 100644
--- a/sound/arm/sa11xx-uda1341.c
+++ b/sound/arm/sa11xx-uda1341.c
@@ -79,12 +79,6 @@
79#include <asm/mach-types.h> 79#include <asm/mach-types.h>
80#include <asm/dma.h> 80#include <asm/dma.h>
81 81
82#ifdef CONFIG_H3600_HAL
83#include <asm/semaphore.h>
84#include <asm/uaccess.h>
85#include <asm/arch/h3600_hal.h>
86#endif
87
88#include <sound/core.h> 82#include <sound/core.h>
89#include <sound/pcm.h> 83#include <sound/pcm.h>
90#include <sound/initval.h> 84#include <sound/initval.h>
@@ -100,9 +94,6 @@
100 * We use DMA stuff from 2.4.18-rmk3-hh24 here to be able to compile this 94 * We use DMA stuff from 2.4.18-rmk3-hh24 here to be able to compile this
101 * module for Familiar 0.6.1 95 * module for Familiar 0.6.1
102 */ 96 */
103#ifdef CONFIG_H3600_HAL
104#define HH_VERSION 1
105#endif
106 97
107/* {{{ Type definitions */ 98/* {{{ Type definitions */
108 99
@@ -238,11 +229,8 @@ static void sa11xx_uda1341_set_samplerate(struct sa11xx_uda1341 *sa11xx_uda1341,
238 rate = 8000; 229 rate = 8000;
239 230
240 /* Set the external clock generator */ 231 /* Set the external clock generator */
241#ifdef CONFIG_H3600_HAL 232
242 h3600_audio_clock(rate);
243#else
244 sa11xx_uda1341_set_audio_clock(rate); 233 sa11xx_uda1341_set_audio_clock(rate);
245#endif
246 234
247 /* Select the clock divisor */ 235 /* Select the clock divisor */
248 switch (rate) { 236 switch (rate) {
@@ -307,13 +295,10 @@ static void sa11xx_uda1341_audio_init(struct sa11xx_uda1341 *sa11xx_uda1341)
307 local_irq_restore(flags); 295 local_irq_restore(flags);
308 296
309 /* Enable the audio power */ 297 /* Enable the audio power */
310#ifdef CONFIG_H3600_HAL 298
311 h3600_audio_power(AUDIO_RATE_DEFAULT);
312#else
313 clr_sa11xx_uda1341_egpio(IPAQ_EGPIO_CODEC_NRESET); 299 clr_sa11xx_uda1341_egpio(IPAQ_EGPIO_CODEC_NRESET);
314 set_sa11xx_uda1341_egpio(IPAQ_EGPIO_AUDIO_ON); 300 set_sa11xx_uda1341_egpio(IPAQ_EGPIO_AUDIO_ON);
315 set_sa11xx_uda1341_egpio(IPAQ_EGPIO_QMUTE); 301 set_sa11xx_uda1341_egpio(IPAQ_EGPIO_QMUTE);
316#endif
317 302
318 /* Wait for the UDA1341 to wake up */ 303 /* Wait for the UDA1341 to wake up */
319 mdelay(1); //FIXME - was removed by Perex - Why? 304 mdelay(1); //FIXME - was removed by Perex - Why?
@@ -331,21 +316,13 @@ static void sa11xx_uda1341_audio_init(struct sa11xx_uda1341 *sa11xx_uda1341)
331 /* make the left and right channels unswapped (flip the WS latch) */ 316 /* make the left and right channels unswapped (flip the WS latch) */
332 Ser4SSDR = 0; 317 Ser4SSDR = 0;
333 318
334#ifdef CONFIG_H3600_HAL 319 clr_sa11xx_uda1341_egpio(IPAQ_EGPIO_QMUTE);
335 h3600_audio_mute(0);
336#else
337 clr_sa11xx_uda1341_egpio(IPAQ_EGPIO_QMUTE);
338#endif
339} 320}
340 321
341static void sa11xx_uda1341_audio_shutdown(struct sa11xx_uda1341 *sa11xx_uda1341) 322static void sa11xx_uda1341_audio_shutdown(struct sa11xx_uda1341 *sa11xx_uda1341)
342{ 323{
343 /* mute on */ 324 /* mute on */
344#ifdef CONFIG_H3600_HAL
345 h3600_audio_mute(1);
346#else
347 set_sa11xx_uda1341_egpio(IPAQ_EGPIO_QMUTE); 325 set_sa11xx_uda1341_egpio(IPAQ_EGPIO_QMUTE);
348#endif
349 326
350 /* disable the audio power and all signals leading to the audio chip */ 327 /* disable the audio power and all signals leading to the audio chip */
351 l3_close(sa11xx_uda1341->uda1341); 328 l3_close(sa11xx_uda1341->uda1341);
@@ -354,13 +331,9 @@ static void sa11xx_uda1341_audio_shutdown(struct sa11xx_uda1341 *sa11xx_uda1341)
354 331
355 /* power off and mute off */ 332 /* power off and mute off */
356 /* FIXME - is muting off necesary??? */ 333 /* FIXME - is muting off necesary??? */
357#ifdef CONFIG_H3600_HAL 334
358 h3600_audio_power(0);
359 h3600_audio_mute(0);
360#else
361 clr_sa11xx_uda1341_egpio(IPAQ_EGPIO_AUDIO_ON); 335 clr_sa11xx_uda1341_egpio(IPAQ_EGPIO_AUDIO_ON);
362 clr_sa11xx_uda1341_egpio(IPAQ_EGPIO_QMUTE); 336 clr_sa11xx_uda1341_egpio(IPAQ_EGPIO_QMUTE);
363#endif
364} 337}
365 338
366/* }}} */ 339/* }}} */