Commit 350a29b4 authored by Michal Piotrowski's avatar Michal Piotrowski Committed by Jaroslav Kysela

[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: default avatarMichal Piotrowski <michal.k.k.piotrowski@gmail.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@suse.cz>
parent 609bb2ea
...@@ -79,12 +79,6 @@ ...@@ -79,12 +79,6 @@
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/dma.h> #include <asm/dma.h>
#ifdef CONFIG_H3600_HAL
#include <asm/semaphore.h>
#include <asm/uaccess.h>
#include <asm/arch/h3600_hal.h>
#endif
#include <sound/core.h> #include <sound/core.h>
#include <sound/pcm.h> #include <sound/pcm.h>
#include <sound/initval.h> #include <sound/initval.h>
...@@ -100,9 +94,6 @@ ...@@ -100,9 +94,6 @@
* We use DMA stuff from 2.4.18-rmk3-hh24 here to be able to compile this * We use DMA stuff from 2.4.18-rmk3-hh24 here to be able to compile this
* module for Familiar 0.6.1 * module for Familiar 0.6.1
*/ */
#ifdef CONFIG_H3600_HAL
#define HH_VERSION 1
#endif
/* {{{ Type definitions */ /* {{{ Type definitions */
...@@ -238,11 +229,8 @@ static void sa11xx_uda1341_set_samplerate(struct sa11xx_uda1341 *sa11xx_uda1341, ...@@ -238,11 +229,8 @@ static void sa11xx_uda1341_set_samplerate(struct sa11xx_uda1341 *sa11xx_uda1341,
rate = 8000; rate = 8000;
/* Set the external clock generator */ /* Set the external clock generator */
#ifdef CONFIG_H3600_HAL
h3600_audio_clock(rate);
#else
sa11xx_uda1341_set_audio_clock(rate); sa11xx_uda1341_set_audio_clock(rate);
#endif
/* Select the clock divisor */ /* Select the clock divisor */
switch (rate) { switch (rate) {
...@@ -307,13 +295,10 @@ static void sa11xx_uda1341_audio_init(struct sa11xx_uda1341 *sa11xx_uda1341) ...@@ -307,13 +295,10 @@ static void sa11xx_uda1341_audio_init(struct sa11xx_uda1341 *sa11xx_uda1341)
local_irq_restore(flags); local_irq_restore(flags);
/* Enable the audio power */ /* Enable the audio power */
#ifdef CONFIG_H3600_HAL
h3600_audio_power(AUDIO_RATE_DEFAULT);
#else
clr_sa11xx_uda1341_egpio(IPAQ_EGPIO_CODEC_NRESET); clr_sa11xx_uda1341_egpio(IPAQ_EGPIO_CODEC_NRESET);
set_sa11xx_uda1341_egpio(IPAQ_EGPIO_AUDIO_ON); set_sa11xx_uda1341_egpio(IPAQ_EGPIO_AUDIO_ON);
set_sa11xx_uda1341_egpio(IPAQ_EGPIO_QMUTE); set_sa11xx_uda1341_egpio(IPAQ_EGPIO_QMUTE);
#endif
/* Wait for the UDA1341 to wake up */ /* Wait for the UDA1341 to wake up */
mdelay(1); //FIXME - was removed by Perex - Why? mdelay(1); //FIXME - was removed by Perex - Why?
...@@ -331,21 +316,13 @@ static void sa11xx_uda1341_audio_init(struct sa11xx_uda1341 *sa11xx_uda1341) ...@@ -331,21 +316,13 @@ static void sa11xx_uda1341_audio_init(struct sa11xx_uda1341 *sa11xx_uda1341)
/* make the left and right channels unswapped (flip the WS latch) */ /* make the left and right channels unswapped (flip the WS latch) */
Ser4SSDR = 0; Ser4SSDR = 0;
#ifdef CONFIG_H3600_HAL clr_sa11xx_uda1341_egpio(IPAQ_EGPIO_QMUTE);
h3600_audio_mute(0);
#else
clr_sa11xx_uda1341_egpio(IPAQ_EGPIO_QMUTE);
#endif
} }
static void sa11xx_uda1341_audio_shutdown(struct sa11xx_uda1341 *sa11xx_uda1341) static void sa11xx_uda1341_audio_shutdown(struct sa11xx_uda1341 *sa11xx_uda1341)
{ {
/* mute on */ /* mute on */
#ifdef CONFIG_H3600_HAL
h3600_audio_mute(1);
#else
set_sa11xx_uda1341_egpio(IPAQ_EGPIO_QMUTE); set_sa11xx_uda1341_egpio(IPAQ_EGPIO_QMUTE);
#endif
/* disable the audio power and all signals leading to the audio chip */ /* disable the audio power and all signals leading to the audio chip */
l3_close(sa11xx_uda1341->uda1341); l3_close(sa11xx_uda1341->uda1341);
...@@ -354,13 +331,9 @@ static void sa11xx_uda1341_audio_shutdown(struct sa11xx_uda1341 *sa11xx_uda1341) ...@@ -354,13 +331,9 @@ static void sa11xx_uda1341_audio_shutdown(struct sa11xx_uda1341 *sa11xx_uda1341)
/* power off and mute off */ /* power off and mute off */
/* FIXME - is muting off necesary??? */ /* FIXME - is muting off necesary??? */
#ifdef CONFIG_H3600_HAL
h3600_audio_power(0);
h3600_audio_mute(0);
#else
clr_sa11xx_uda1341_egpio(IPAQ_EGPIO_AUDIO_ON); clr_sa11xx_uda1341_egpio(IPAQ_EGPIO_AUDIO_ON);
clr_sa11xx_uda1341_egpio(IPAQ_EGPIO_QMUTE); clr_sa11xx_uda1341_egpio(IPAQ_EGPIO_QMUTE);
#endif
} }
/* }}} */ /* }}} */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment