mirror of
https://github.com/torvalds/linux.git
synced 2024-11-13 23:51:39 +00:00
e6b5be2be4
Here's the set of driver core patches for 3.19-rc1. They are dominated by the removal of the .owner field in platform drivers. They touch a lot of files, but they are "simple" changes, just removing a line in a structure. Other than that, a few minor driver core and debugfs changes. There are some ath9k patches coming in through this tree that have been acked by the wireless maintainers as they relied on the debugfs changes. Everything has been in linux-next for a while. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iEYEABECAAYFAlSOD20ACgkQMUfUDdst+ylLPACg2QrW1oHhdTMT9WI8jihlHVRM 53kAoLeteByQ3iVwWurwwseRPiWa8+MI =OVRS -----END PGP SIGNATURE----- Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core Pull driver core update from Greg KH: "Here's the set of driver core patches for 3.19-rc1. They are dominated by the removal of the .owner field in platform drivers. They touch a lot of files, but they are "simple" changes, just removing a line in a structure. Other than that, a few minor driver core and debugfs changes. There are some ath9k patches coming in through this tree that have been acked by the wireless maintainers as they relied on the debugfs changes. Everything has been in linux-next for a while" * tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (324 commits) Revert "ath: ath9k: use debugfs_create_devm_seqfile() helper for seq_file entries" fs: debugfs: add forward declaration for struct device type firmware class: Deletion of an unnecessary check before the function call "vunmap" firmware loader: fix hung task warning dump devcoredump: provide a one-way disable function device: Add dev_<level>_once variants ath: ath9k: use debugfs_create_devm_seqfile() helper for seq_file entries ath: use seq_file api for ath9k debugfs files debugfs: add helper function to create device related seq_file drivers/base: cacheinfo: remove noisy error boot message Revert "core: platform: add warning if driver has no owner" drivers: base: support cpu cache information interface to userspace via sysfs drivers: base: add cpu_device_create to support per-cpu devices topology: replace custom attribute macros with standard DEVICE_ATTR* cpumask: factor out show_cpumap into separate helper function driver core: Fix unbalanced device reference in drivers_probe driver core: fix race with userland in device_add() sysfs/kernfs: make read requests on pre-alloc files use the buffer. sysfs/kernfs: allow attributes to request write buffer be pre-allocated. fs: sysfs: return EGBIG on write if offset is larger than file size ...
275 lines
6.9 KiB
C
275 lines
6.9 KiB
C
/*
|
|
* linux/sound/pxa2xx-ac97.c -- AC97 support for the Intel PXA2xx chip.
|
|
*
|
|
* Author: Nicolas Pitre
|
|
* Created: Dec 02, 2004
|
|
* Copyright: MontaVista Software Inc.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*/
|
|
|
|
#include <linux/init.h>
|
|
#include <linux/io.h>
|
|
#include <linux/module.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/dmaengine.h>
|
|
|
|
#include <sound/core.h>
|
|
#include <sound/ac97_codec.h>
|
|
#include <sound/soc.h>
|
|
#include <sound/pxa2xx-lib.h>
|
|
#include <sound/dmaengine_pcm.h>
|
|
|
|
#include <mach/hardware.h>
|
|
#include <mach/regs-ac97.h>
|
|
#include <mach/audio.h>
|
|
|
|
#include "pxa2xx-ac97.h"
|
|
|
|
static void pxa2xx_ac97_warm_reset(struct snd_ac97 *ac97)
|
|
{
|
|
pxa2xx_ac97_try_warm_reset(ac97);
|
|
|
|
pxa2xx_ac97_finish_reset(ac97);
|
|
}
|
|
|
|
static void pxa2xx_ac97_cold_reset(struct snd_ac97 *ac97)
|
|
{
|
|
pxa2xx_ac97_try_cold_reset(ac97);
|
|
|
|
pxa2xx_ac97_finish_reset(ac97);
|
|
}
|
|
|
|
static struct snd_ac97_bus_ops pxa2xx_ac97_ops = {
|
|
.read = pxa2xx_ac97_read,
|
|
.write = pxa2xx_ac97_write,
|
|
.warm_reset = pxa2xx_ac97_warm_reset,
|
|
.reset = pxa2xx_ac97_cold_reset,
|
|
};
|
|
|
|
static unsigned long pxa2xx_ac97_pcm_stereo_in_req = 12;
|
|
static struct snd_dmaengine_dai_dma_data pxa2xx_ac97_pcm_stereo_in = {
|
|
.addr = __PREG(PCDR),
|
|
.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES,
|
|
.maxburst = 32,
|
|
.filter_data = &pxa2xx_ac97_pcm_stereo_in_req,
|
|
};
|
|
|
|
static unsigned long pxa2xx_ac97_pcm_stereo_out_req = 11;
|
|
static struct snd_dmaengine_dai_dma_data pxa2xx_ac97_pcm_stereo_out = {
|
|
.addr = __PREG(PCDR),
|
|
.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES,
|
|
.maxburst = 32,
|
|
.filter_data = &pxa2xx_ac97_pcm_stereo_out_req,
|
|
};
|
|
|
|
static unsigned long pxa2xx_ac97_pcm_aux_mono_out_req = 10;
|
|
static struct snd_dmaengine_dai_dma_data pxa2xx_ac97_pcm_aux_mono_out = {
|
|
.addr = __PREG(MODR),
|
|
.addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES,
|
|
.maxburst = 16,
|
|
.filter_data = &pxa2xx_ac97_pcm_aux_mono_out_req,
|
|
};
|
|
|
|
static unsigned long pxa2xx_ac97_pcm_aux_mono_in_req = 9;
|
|
static struct snd_dmaengine_dai_dma_data pxa2xx_ac97_pcm_aux_mono_in = {
|
|
.addr = __PREG(MODR),
|
|
.addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES,
|
|
.maxburst = 16,
|
|
.filter_data = &pxa2xx_ac97_pcm_aux_mono_in_req,
|
|
};
|
|
|
|
static unsigned long pxa2xx_ac97_pcm_aux_mic_mono_req = 8;
|
|
static struct snd_dmaengine_dai_dma_data pxa2xx_ac97_pcm_mic_mono_in = {
|
|
.addr = __PREG(MCDR),
|
|
.addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES,
|
|
.maxburst = 16,
|
|
.filter_data = &pxa2xx_ac97_pcm_aux_mic_mono_req,
|
|
};
|
|
|
|
static int pxa2xx_ac97_hw_params(struct snd_pcm_substream *substream,
|
|
struct snd_pcm_hw_params *params,
|
|
struct snd_soc_dai *cpu_dai)
|
|
{
|
|
struct snd_dmaengine_dai_dma_data *dma_data;
|
|
|
|
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
|
|
dma_data = &pxa2xx_ac97_pcm_stereo_out;
|
|
else
|
|
dma_data = &pxa2xx_ac97_pcm_stereo_in;
|
|
|
|
snd_soc_dai_set_dma_data(cpu_dai, substream, dma_data);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int pxa2xx_ac97_hw_aux_params(struct snd_pcm_substream *substream,
|
|
struct snd_pcm_hw_params *params,
|
|
struct snd_soc_dai *cpu_dai)
|
|
{
|
|
struct snd_dmaengine_dai_dma_data *dma_data;
|
|
|
|
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
|
|
dma_data = &pxa2xx_ac97_pcm_aux_mono_out;
|
|
else
|
|
dma_data = &pxa2xx_ac97_pcm_aux_mono_in;
|
|
|
|
snd_soc_dai_set_dma_data(cpu_dai, substream, dma_data);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int pxa2xx_ac97_hw_mic_params(struct snd_pcm_substream *substream,
|
|
struct snd_pcm_hw_params *params,
|
|
struct snd_soc_dai *cpu_dai)
|
|
{
|
|
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
|
|
return -ENODEV;
|
|
else
|
|
snd_soc_dai_set_dma_data(cpu_dai, substream,
|
|
&pxa2xx_ac97_pcm_mic_mono_in);
|
|
|
|
return 0;
|
|
}
|
|
|
|
#define PXA2XX_AC97_RATES (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 |\
|
|
SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_44100 | \
|
|
SNDRV_PCM_RATE_48000)
|
|
|
|
static const struct snd_soc_dai_ops pxa_ac97_hifi_dai_ops = {
|
|
.hw_params = pxa2xx_ac97_hw_params,
|
|
};
|
|
|
|
static const struct snd_soc_dai_ops pxa_ac97_aux_dai_ops = {
|
|
.hw_params = pxa2xx_ac97_hw_aux_params,
|
|
};
|
|
|
|
static const struct snd_soc_dai_ops pxa_ac97_mic_dai_ops = {
|
|
.hw_params = pxa2xx_ac97_hw_mic_params,
|
|
};
|
|
|
|
/*
|
|
* There is only 1 physical AC97 interface for pxa2xx, but it
|
|
* has extra fifo's that can be used for aux DACs and ADCs.
|
|
*/
|
|
static struct snd_soc_dai_driver pxa_ac97_dai_driver[] = {
|
|
{
|
|
.name = "pxa2xx-ac97",
|
|
.bus_control = true,
|
|
.playback = {
|
|
.stream_name = "AC97 Playback",
|
|
.channels_min = 2,
|
|
.channels_max = 2,
|
|
.rates = PXA2XX_AC97_RATES,
|
|
.formats = SNDRV_PCM_FMTBIT_S16_LE,},
|
|
.capture = {
|
|
.stream_name = "AC97 Capture",
|
|
.channels_min = 2,
|
|
.channels_max = 2,
|
|
.rates = PXA2XX_AC97_RATES,
|
|
.formats = SNDRV_PCM_FMTBIT_S16_LE,},
|
|
.ops = &pxa_ac97_hifi_dai_ops,
|
|
},
|
|
{
|
|
.name = "pxa2xx-ac97-aux",
|
|
.bus_control = true,
|
|
.playback = {
|
|
.stream_name = "AC97 Aux Playback",
|
|
.channels_min = 1,
|
|
.channels_max = 1,
|
|
.rates = PXA2XX_AC97_RATES,
|
|
.formats = SNDRV_PCM_FMTBIT_S16_LE,},
|
|
.capture = {
|
|
.stream_name = "AC97 Aux Capture",
|
|
.channels_min = 1,
|
|
.channels_max = 1,
|
|
.rates = PXA2XX_AC97_RATES,
|
|
.formats = SNDRV_PCM_FMTBIT_S16_LE,},
|
|
.ops = &pxa_ac97_aux_dai_ops,
|
|
},
|
|
{
|
|
.name = "pxa2xx-ac97-mic",
|
|
.bus_control = true,
|
|
.capture = {
|
|
.stream_name = "AC97 Mic Capture",
|
|
.channels_min = 1,
|
|
.channels_max = 1,
|
|
.rates = PXA2XX_AC97_RATES,
|
|
.formats = SNDRV_PCM_FMTBIT_S16_LE,},
|
|
.ops = &pxa_ac97_mic_dai_ops,
|
|
},
|
|
};
|
|
|
|
static const struct snd_soc_component_driver pxa_ac97_component = {
|
|
.name = "pxa-ac97",
|
|
};
|
|
|
|
static int pxa2xx_ac97_dev_probe(struct platform_device *pdev)
|
|
{
|
|
int ret;
|
|
|
|
if (pdev->id != -1) {
|
|
dev_err(&pdev->dev, "PXA2xx has only one AC97 port.\n");
|
|
return -ENXIO;
|
|
}
|
|
|
|
ret = pxa2xx_ac97_hw_probe(pdev);
|
|
if (ret) {
|
|
dev_err(&pdev->dev, "PXA2xx AC97 hw probe error (%d)\n", ret);
|
|
return ret;
|
|
}
|
|
|
|
ret = snd_soc_set_ac97_ops(&pxa2xx_ac97_ops);
|
|
if (ret != 0)
|
|
return ret;
|
|
|
|
/* Punt most of the init to the SoC probe; we may need the machine
|
|
* driver to do interesting things with the clocking to get us up
|
|
* and running.
|
|
*/
|
|
return snd_soc_register_component(&pdev->dev, &pxa_ac97_component,
|
|
pxa_ac97_dai_driver, ARRAY_SIZE(pxa_ac97_dai_driver));
|
|
}
|
|
|
|
static int pxa2xx_ac97_dev_remove(struct platform_device *pdev)
|
|
{
|
|
snd_soc_unregister_component(&pdev->dev);
|
|
snd_soc_set_ac97_ops(NULL);
|
|
pxa2xx_ac97_hw_remove(pdev);
|
|
return 0;
|
|
}
|
|
|
|
#ifdef CONFIG_PM_SLEEP
|
|
static int pxa2xx_ac97_dev_suspend(struct device *dev)
|
|
{
|
|
return pxa2xx_ac97_hw_suspend();
|
|
}
|
|
|
|
static int pxa2xx_ac97_dev_resume(struct device *dev)
|
|
{
|
|
return pxa2xx_ac97_hw_resume();
|
|
}
|
|
|
|
static SIMPLE_DEV_PM_OPS(pxa2xx_ac97_pm_ops,
|
|
pxa2xx_ac97_dev_suspend, pxa2xx_ac97_dev_resume);
|
|
#endif
|
|
|
|
static struct platform_driver pxa2xx_ac97_driver = {
|
|
.probe = pxa2xx_ac97_dev_probe,
|
|
.remove = pxa2xx_ac97_dev_remove,
|
|
.driver = {
|
|
.name = "pxa2xx-ac97",
|
|
#ifdef CONFIG_PM_SLEEP
|
|
.pm = &pxa2xx_ac97_pm_ops,
|
|
#endif
|
|
},
|
|
};
|
|
|
|
module_platform_driver(pxa2xx_ac97_driver);
|
|
|
|
MODULE_AUTHOR("Nicolas Pitre");
|
|
MODULE_DESCRIPTION("AC97 driver for the Intel PXA2xx chip");
|
|
MODULE_LICENSE("GPL");
|