*
* 2005-07-29 INdT Kernel Team - Alsa driver for omap osk. Creation of new
* file omap-aic23.c
+ *
+ * 2005-12-18 Dirk Behme - Added L/R Channel Interchange fix as proposed by Ajaya Babu
*/
#include <linux/config.h>
#include <linux/ioctl.h>
#include <linux/delay.h>
#include <linux/slab.h>
+#include <linux/clk.h>
#ifdef CONFIG_PM
#include <linux/pm.h>
#include <asm/mach-types.h>
#include <asm/arch/dma.h>
#include <asm/arch/aic23.h>
-#include <asm/hardware/clock.h>
#include <asm/arch/mcbsp.h>
+#include <asm/arch/clock.h>
#include <sound/core.h>
#include <sound/pcm.h>
static char *id = NULL;
MODULE_PARM_DESC(id, "OMAP OSK ALSA Driver for AIC23 chip.");
-static struct snd_card_omap_aic23 *omap_aic23 = NULL;
+static struct snd_card_omap_codec *omap_aic23 = NULL;
static struct clk *aic23_mclk = 0;
.mask = 0,
};
+/*
+ * HW interface start and stop helper functions
+ */
+static int audio_ifc_start(void)
+{
+ omap_mcbsp_start(AUDIO_MCBSP);
+ return 0;
+}
+
+static int audio_ifc_stop(void)
+{
+ omap_mcbsp_stop(AUDIO_MCBSP);
+ return 0;
+}
/*
* Codec/mcbsp init and configuration section
/*
* Sample rate changing
*/
-static void omap_aic23_set_samplerate(struct snd_card_omap_aic23
+static void omap_aic23_set_samplerate(struct snd_card_omap_codec
*omap_aic23, long rate)
{
u8 count = 0;
}
-static void omap_aic23_audio_init(struct snd_card_omap_aic23 *omap_aic23)
+static void omap_aic23_audio_init(struct snd_card_omap_codec *omap_aic23)
{
/* Setup DMA stuff */
omap_aic23->s[SNDRV_PCM_STREAM_PLAYBACK].id = "Alsa AIC23 out";
SNDRV_PCM_STREAM_PLAYBACK;
omap_aic23->s[SNDRV_PCM_STREAM_PLAYBACK].dma_dev =
OMAP_DMA_MCBSP1_TX;
+ omap_aic23->s[SNDRV_PCM_STREAM_PLAYBACK].hw_start =
+ audio_ifc_start;
+ omap_aic23->s[SNDRV_PCM_STREAM_PLAYBACK].hw_stop =
+ audio_ifc_stop;
omap_aic23->s[SNDRV_PCM_STREAM_CAPTURE].id = "Alsa AIC23 in";
omap_aic23->s[SNDRV_PCM_STREAM_CAPTURE].stream_id =
SNDRV_PCM_STREAM_CAPTURE;
omap_aic23->s[SNDRV_PCM_STREAM_CAPTURE].dma_dev =
OMAP_DMA_MCBSP1_RX;
+ omap_aic23->s[SNDRV_PCM_STREAM_CAPTURE].hw_start =
+ audio_ifc_start;
+ omap_aic23->s[SNDRV_PCM_STREAM_CAPTURE].hw_stop =
+ audio_ifc_stop;
/* configuring the McBSP */
omap_mcbsp_request(AUDIO_MCBSP);
{
int err;
- err = omap_request_sound_dma(s->dma_dev, s->id, s, &s->lch);
+ err = omap_request_alsa_sound_dma(s->dma_dev, s->id, s, &s->lch);
if (err < 0)
printk(KERN_ERR "unable to grab audio dma 0x%x\n",
s->dma_dev);
{
int err = 0;
- err = omap_free_sound_dma(s, &s->lch);
+ err = omap_free_alsa_sound_dma(s, &s->lch);
if (err < 0)
printk(KERN_ERR "Unable to free audio dma channels!\n");
return err;
s->periods = 0;
/* this stops the dma channel and clears the buffer ptrs */
- omap_audio_stop_dma(s);
+ /* this stops the dma channel and clears the buffer ptrs */
+ omap_stop_alsa_sound_dma(s);
- omap_clear_sound_dma(s);
+ omap_clear_alsa_sound_dma(s);
spin_unlock_irqrestore(&s->dma_lock, flags);
}
dma_size = frames_to_bytes(runtime, runtime->period_size);
offset = dma_size * s->period;
snd_assert(dma_size <= DMA_BUF_SIZE,);
- ret =
- omap_start_sound_dma(s,
+ ret = omap_start_alsa_sound_dma(s,
(dma_addr_t) runtime->dma_area +
offset, dma_size);
if (ret) {
/*
* This is called when dma IRQ occurs at the end of each transmited block
*/
-void audio_dma_callback(void *data)
+void callback_omap_alsa_sound_dma(void *data)
{
struct audio_stream *s = data;
* PCM settings and callbacks
*/
-static int snd_omap_aic23_trigger(snd_pcm_substream_t * substream, int cmd)
+static int snd_omap_alsa_trigger(snd_pcm_substream_t * substream, int cmd)
{
- struct snd_card_omap_aic23 *chip =
+ struct snd_card_omap_codec *chip =
snd_pcm_substream_chip(substream);
int stream_id = substream->pstr->stream;
struct audio_stream *s = &chip->s[stream_id];
return err;
}
-static int snd_omap_aic23_prepare(snd_pcm_substream_t * substream)
+static int snd_omap_alsa_prepare(snd_pcm_substream_t * substream)
{
- struct snd_card_omap_aic23 *chip =
+ struct snd_card_omap_codec *chip =
snd_pcm_substream_chip(substream);
snd_pcm_runtime_t *runtime = substream->runtime;
struct audio_stream *s = &chip->s[substream->pstr->stream];
return 0;
}
-static snd_pcm_uframes_t snd_omap_aic23_pointer(snd_pcm_substream_t *
+static snd_pcm_uframes_t snd_omap_alsa_pointer(snd_pcm_substream_t *
substream)
{
- struct snd_card_omap_aic23 *chip =
+ struct snd_card_omap_codec *chip =
snd_pcm_substream_chip(substream);
return audio_get_dma_pos(&chip->s[substream->pstr->stream]);
/* Hardware capabilities */
-static snd_pcm_hardware_t snd_omap_aic23_capture = {
+static snd_pcm_hardware_t snd_omap_alsa_capture = {
.info = (SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER |
SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID),
.formats = (SNDRV_PCM_FMTBIT_S16_LE),
.fifo_size = 0,
};
-static snd_pcm_hardware_t snd_omap_aic23_playback = {
+static snd_pcm_hardware_t snd_omap_alsa_playback = {
.info = (SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER |
SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID),
.formats = (SNDRV_PCM_FMTBIT_S16_LE),
.fifo_size = 0,
};
-static int snd_card_omap_aic23_open(snd_pcm_substream_t * substream)
+static int snd_card_omap_alsa_open(snd_pcm_substream_t * substream)
{
- struct snd_card_omap_aic23 *chip =
+ struct snd_card_omap_codec *chip =
snd_pcm_substream_chip(substream);
snd_pcm_runtime_t *runtime = substream->runtime;
int stream_id = substream->pstr->stream;
omap_aic23_clock_on();
if (stream_id == SNDRV_PCM_STREAM_PLAYBACK)
- runtime->hw = snd_omap_aic23_playback;
+ runtime->hw = snd_omap_alsa_playback;
else
- runtime->hw = snd_omap_aic23_capture;
+ runtime->hw = snd_omap_alsa_capture;
if ((err =
snd_pcm_hw_constraint_integer(runtime,
SNDRV_PCM_HW_PARAM_PERIODS)) <
return 0;
}
-static int snd_card_omap_aic23_close(snd_pcm_substream_t * substream)
+static int snd_card_omap_alsa_close(snd_pcm_substream_t * substream)
{
- struct snd_card_omap_aic23 *chip =
+ struct snd_card_omap_codec *chip =
snd_pcm_substream_chip(substream);
ADEBUG();
/* HW params & free */
-static int snd_omap_aic23_hw_params(snd_pcm_substream_t * substream,
+static int snd_omap_alsa_hw_params(snd_pcm_substream_t * substream,
snd_pcm_hw_params_t * hw_params)
{
return snd_pcm_lib_malloc_pages(substream,
params_buffer_bytes(hw_params));
}
-static int snd_omap_aic23_hw_free(snd_pcm_substream_t * substream)
+static int snd_omap_alsa_hw_free(snd_pcm_substream_t * substream)
{
return snd_pcm_lib_free_pages(substream);
}
/* pcm operations */
-
-static snd_pcm_ops_t snd_card_omap_aic23_playback_ops = {
- .open = snd_card_omap_aic23_open,
- .close = snd_card_omap_aic23_close,
+static snd_pcm_ops_t snd_card_omap_alsa_playback_ops = {
+ .open = snd_card_omap_alsa_open,
+ .close = snd_card_omap_alsa_close,
.ioctl = snd_pcm_lib_ioctl,
- .hw_params = snd_omap_aic23_hw_params,
- .hw_free = snd_omap_aic23_hw_free,
- .prepare = snd_omap_aic23_prepare,
- .trigger = snd_omap_aic23_trigger,
- .pointer = snd_omap_aic23_pointer,
+ .hw_params = snd_omap_alsa_hw_params,
+ .hw_free = snd_omap_alsa_hw_free,
+ .prepare = snd_omap_alsa_prepare,
+ .trigger = snd_omap_alsa_trigger,
+ .pointer = snd_omap_alsa_pointer,
};
-static snd_pcm_ops_t snd_card_omap_aic23_capture_ops = {
- .open = snd_card_omap_aic23_open,
- .close = snd_card_omap_aic23_close,
+static snd_pcm_ops_t snd_card_omap_alsa_capture_ops = {
+ .open = snd_card_omap_alsa_open,
+ .close = snd_card_omap_alsa_close,
.ioctl = snd_pcm_lib_ioctl,
- .hw_params = snd_omap_aic23_hw_params,
- .hw_free = snd_omap_aic23_hw_free,
- .prepare = snd_omap_aic23_prepare,
- .trigger = snd_omap_aic23_trigger,
- .pointer = snd_omap_aic23_pointer,
+ .hw_params = snd_omap_alsa_hw_params,
+ .hw_free = snd_omap_alsa_hw_free,
+ .prepare = snd_omap_alsa_prepare,
+ .trigger = snd_omap_alsa_trigger,
+ .pointer = snd_omap_alsa_pointer,
};
/*
*
* Inits pcm alsa structures, allocate the alsa buffer, suspend, resume
*/
-static int __init snd_card_omap_aic23_pcm(struct snd_card_omap_aic23
- *omap_aic23, int device)
+static int __init snd_card_omap_alsa_pcm(struct snd_card_omap_codec *omap_alsa,
+ int device)
{
snd_pcm_t *pcm;
int err;
128 * 1024, 128 * 1024);
snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK,
- &snd_card_omap_aic23_playback_ops);
+ &snd_card_omap_alsa_playback_ops);
snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE,
- &snd_card_omap_aic23_capture_ops);
+ &snd_card_omap_alsa_capture_ops);
pcm->private_data = omap_aic23;
pcm->info_flags = 0;
strcpy(pcm->name, "omap aic23 pcm");
/* setup DMA controller */
audio_dma_request(&omap_aic23->s[SNDRV_PCM_STREAM_PLAYBACK],
- audio_dma_callback);
+ callback_omap_alsa_sound_dma);
audio_dma_request(&omap_aic23->s[SNDRV_PCM_STREAM_CAPTURE],
- audio_dma_callback);
+ callback_omap_alsa_sound_dma);
omap_aic23->pcm = pcm;
return 0;
}
-
#ifdef CONFIG_PM
-
-static int snd_omap_aic23_suspend(snd_card_t * card, pm_message_t state)
-{
- struct snd_card_omap_aic23 *chip = card->pm_private_data;
- ADEBUG();
-
- if (chip->card->power_state != SNDRV_CTL_POWER_D3hot) {
- snd_power_change_state(chip->card, SNDRV_CTL_POWER_D3hot);
- snd_pcm_suspend_all(chip->pcm);
- /* Mutes and turn clock off */
- omap_aic23_clock_off();
- snd_omap_suspend_mixer();
- }
-
- return 0;
-}
-
-/*
- * Prepare hardware for resume
- */
-static int snd_omap_aic23_resume(snd_card_t * card)
-{
- struct snd_card_omap_aic23 *chip = card->pm_private_data;
- ADEBUG();
-
- if (chip->card->power_state != SNDRV_CTL_POWER_D0) {
- snd_power_change_state(chip->card, SNDRV_CTL_POWER_D0);
- omap_aic23_clock_on();
- snd_omap_resume_mixer();
- }
-
- return 0;
-}
-
/*
* Driver suspend/resume - calls alsa functions. Some hints from aaci.c
*/
-static int omap_aic23_suspend(struct platform_device *pdev, pm_message_t state)
+int snd_omap_alsa_suspend(struct platform_device *pdev, pm_message_t state)
{
+ struct snd_card_omap_codec *chip;
snd_card_t *card = platform_get_drvdata(pdev);
if (card->power_state != SNDRV_CTL_POWER_D3hot) {
- snd_omap_aic23_suspend(card, PMSG_SUSPEND);
+ chip = card->private_data;
+ if (chip->card->power_state != SNDRV_CTL_POWER_D3hot) {
+ snd_power_change_state(chip->card, SNDRV_CTL_POWER_D3hot);
+ snd_pcm_suspend_all(chip->pcm);
+ /* Mutes and turn clock off */
+ omap_aic23_clock_off();
+ snd_omap_suspend_mixer();
+ }
}
return 0;
}
-static int omap_aic23_resume(struct platform_device *pdev)
+int snd_omap_alsa_resume(struct platform_device *pdev)
{
+ struct snd_card_omap_codec *chip;
snd_card_t *card = platform_get_drvdata(pdev);
if (card->power_state != SNDRV_CTL_POWER_D0) {
- snd_omap_aic23_resume(card);
+ chip = card->private_data;
+ if (chip->card->power_state != SNDRV_CTL_POWER_D0) {
+ snd_power_change_state(chip->card, SNDRV_CTL_POWER_D0);
+ omap_aic23_clock_on();
+ snd_omap_resume_mixer();
+ }
}
return 0;
}
#else
-#define snd_omap_aic23_suspend NULL
-#define snd_omap_aic23_resume NULL
-#define omap_aic23_suspend NULL
-#define omap_aic23_resume NULL
-
+#define snd_omap_alsa_suspend NULL
+#define snd_omap_alsa_resume NULL
#endif /* CONFIG_PM */
/*
*/
-void snd_omap_aic23_free(snd_card_t * card)
+void snd_omap_alsa_free(snd_card_t * card)
{
- struct snd_card_omap_aic23 *chip = card->private_data;
+ struct snd_card_omap_codec *chip = card->private_data;
ADEBUG();
/*
return -ECANCELED;
}
- clk_use(aic23_mclk);
+ clk_enable(aic23_mclk);
printk(KERN_DEBUG
"MCLK = %d [%d], usecount = %d\n",
CODEC_CLOCK);
}
- clk_unuse(aic23_mclk);
+ clk_disable(aic23_mclk);
}
audio_aic23_write(POWER_DOWN_CONTROL_ADDR,
/*
* Inits alsa soudcard structure
*/
-static int __init snd_omap_aic23_probe(struct platform_device *pdev)
+static int __init snd_omap_alsa_aic23_probe(struct platform_device *pdev)
{
int err = 0;
snd_card_t *card;
return -ENOMEM;
card->private_data = (void *) omap_aic23;
- card->private_free = snd_omap_aic23_free;
+ card->private_free = snd_omap_alsa_free;
omap_aic23->card = card;
omap_aic23->samplerate = AUDIO_RATE_DEFAULT;
goto nodev;
/* PCM */
- if ((err = snd_card_omap_aic23_pcm(omap_aic23, 0)) < 0)
+ if ((err = snd_card_omap_alsa_pcm(omap_aic23, 0)) < 0)
goto nodev;
- snd_card_set_pm_callback(card, snd_omap_aic23_suspend,
- snd_omap_aic23_resume, omap_aic23);
-
strcpy(card->driver, "AIC23");
strcpy(card->shortname, "OSK AIC23");
sprintf(card->longname, "OMAP OSK with AIC23");
snd_omap_init_mixer();
+
+ snd_card_set_dev(card, &pdev->dev);
if ((err = snd_card_register(card)) == 0) {
printk(KERN_INFO "OSK audio support initialized\n");
}
nodev:
- snd_omap_aic23_free(card);
+ snd_card_free(card);
return err;
}
-static int snd_omap_aic23_remove(struct platform_device *pdev)
+static int snd_omap_alsa_remove(struct platform_device *pdev)
{
snd_card_t *card = platform_get_drvdata(pdev);
- struct snd_card_omap_aic23 *chip = card->private_data;
+ struct snd_card_omap_codec *chip = card->private_data;
snd_card_free(card);
}
static struct platform_driver omap_alsa_driver = {
- .probe = snd_omap_aic23_probe,
- .remove = snd_omap_aic23_remove,
- .suspend = omap_aic23_suspend,
- .resume = omap_aic23_resume,
+ .probe = snd_omap_alsa_aic23_probe,
+ .remove = snd_omap_alsa_remove,
+ .suspend = snd_omap_alsa_suspend,
+ .resume = snd_omap_alsa_resume,
.driver = {
.name = "omap_mcbsp",
},
};
-static int __init omap_aic23_init(void)
+static int __init omap_alsa_aic23_init(void)
{
int err;
ADEBUG();
return err;
}
-static void __exit omap_aic23_exit(void)
+static void __exit omap_alsa_aic23_exit(void)
{
ADEBUG();
platform_driver_unregister(&omap_alsa_driver);
}
-module_init(omap_aic23_init);
-module_exit(omap_aic23_exit);
+module_init(omap_alsa_aic23_init);
+module_exit(omap_alsa_aic23_exit);
projects / linux-2.6-omap-h63xx.git / blobdiff