mirror of
https://github.com/torvalds/linux.git
synced 2024-11-05 19:41:54 +00:00
f0fba2ad1b
This patch extends the ASoC API to allow sound cards to have more than one CODEC and more than one platform DMA controller. This is achieved by dividing some current ASoC structures that contain both driver data and device data into structures that only either contain device data or driver data. i.e. struct snd_soc_codec ---> struct snd_soc_codec (device data) +-> struct snd_soc_codec_driver (driver data) struct snd_soc_platform ---> struct snd_soc_platform (device data) +-> struct snd_soc_platform_driver (driver data) struct snd_soc_dai ---> struct snd_soc_dai (device data) +-> struct snd_soc_dai_driver (driver data) struct snd_soc_device ---> deleted This now allows ASoC to be more tightly aligned with the Linux driver model and also means that every ASoC codec, platform and (platform) DAI is a kernel device. ASoC component private data is now stored as device private data. The ASoC sound card struct snd_soc_card has also been updated to store lists of it's components rather than a pointer to a codec and platform. The PCM runtime struct soc_pcm_runtime now has pointers to all its components. This patch adds DAPM support for ASoC multi-component and removes struct snd_soc_socdev from DAPM core. All DAPM calls are now made on a card, codec or runtime PCM level basis rather than using snd_soc_socdev. Other notable multi-component changes:- * Stream operations now de-reference less structures. * close_delayed work() now runs on a DAI basis rather than looping all DAIs in a card. * PM suspend()/resume() operations can now handle N CODECs and Platforms per sound card. * Added soc_bind_dai_link() to bind the component devices to the sound card. * Added soc_dai_link_probe() and soc_dai_link_remove() to probe and remove DAI link components. * sysfs entries can now be registered per component per card. * snd_soc_new_pcms() functionailty rolled into dai_link_probe(). * snd_soc_register_codec() now does all the codec list and mutex init. This patch changes the probe() and remove() of the CODEC drivers as follows:- o Make CODEC driver a platform driver o Moved all struct snd_soc_codec list, mutex, etc initialiasation to core. o Removed all static codec pointers (drivers now support > 1 codec dev) o snd_soc_register_pcms() now done by core. o snd_soc_register_dai() folded into snd_soc_register_codec(). CS4270 portions: Acked-by: Timur Tabi <timur@freescale.com> Some TLV320aic23 and Cirrus platform fixes. Signed-off-by: Ryan Mallon <ryan@bluewatersys.com> TI CODEC and OMAP fixes Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com> Signed-off-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl> Signed-off-by: Jarkko Nikula <jhnikula@gmail.com> Samsung platform and misc fixes :- Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com> Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Reviewed-by: Jassi Brar <jassi.brar@samsung.com> Signed-off-by: Seungwhan Youn <sw.youn@samsung.com> MPC8610 and PPC fixes. Signed-off-by: Timur Tabi <timur@freescale.com> i.MX fixes and some core fixes. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> J4740 platform fixes:- Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> CC: Tony Lindgren <tony@atomide.com> CC: Nicolas Ferre <nicolas.ferre@atmel.com> CC: Kevin Hilman <khilman@deeprootsystems.com> CC: Sascha Hauer <s.hauer@pengutronix.de> CC: Atsushi Nemoto <anemo@mba.ocn.ne.jp> CC: Kuninori Morimoto <morimoto.kuninori@renesas.com> CC: Daniel Gloeckner <dg@emlix.com> CC: Manuel Lauss <mano@roarinelk.homelinux.net> CC: Mike Frysinger <vapier.adi@gmail.com> CC: Arnaud Patard <apatard@mandriva.com> CC: Wan ZongShun <mcuos.com@gmail.com> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
243 lines
6.4 KiB
C
243 lines
6.4 KiB
C
/*
|
|
* TXx9 ACLC AC97 driver
|
|
*
|
|
* Copyright (C) 2009 Atsushi Nemoto
|
|
*
|
|
* Based on RBTX49xx patch from CELF patch archive.
|
|
* (C) Copyright TOSHIBA CORPORATION 2004-2006
|
|
*
|
|
* 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/module.h>
|
|
#include <linux/delay.h>
|
|
#include <linux/interrupt.h>
|
|
#include <linux/io.h>
|
|
#include <linux/gfp.h>
|
|
#include <sound/core.h>
|
|
#include <sound/pcm.h>
|
|
#include <sound/soc.h>
|
|
#include "txx9aclc.h"
|
|
|
|
#define AC97_DIR \
|
|
(SND_SOC_DAIDIR_PLAYBACK | SND_SOC_DAIDIR_CAPTURE)
|
|
|
|
#define AC97_RATES \
|
|
SNDRV_PCM_RATE_8000_48000
|
|
|
|
#ifdef __BIG_ENDIAN
|
|
#define AC97_FMTS SNDRV_PCM_FMTBIT_S16_BE
|
|
#else
|
|
#define AC97_FMTS SNDRV_PCM_FMTBIT_S16_LE
|
|
#endif
|
|
|
|
static DECLARE_WAIT_QUEUE_HEAD(ac97_waitq);
|
|
|
|
/* REVISIT: How to find txx9aclc_drvdata from snd_ac97? */
|
|
static struct txx9aclc_plat_drvdata *txx9aclc_drvdata;
|
|
|
|
static int txx9aclc_regready(struct txx9aclc_plat_drvdata *drvdata)
|
|
{
|
|
return __raw_readl(drvdata->base + ACINTSTS) & ACINT_REGACCRDY;
|
|
}
|
|
|
|
/* AC97 controller reads codec register */
|
|
static unsigned short txx9aclc_ac97_read(struct snd_ac97 *ac97,
|
|
unsigned short reg)
|
|
{
|
|
struct txx9aclc_plat_drvdata *drvdata = txx9aclc_drvdata;
|
|
void __iomem *base = drvdata->base;
|
|
u32 dat;
|
|
|
|
if (!(__raw_readl(base + ACINTSTS) & ACINT_CODECRDY(ac97->num)))
|
|
return 0xffff;
|
|
reg |= ac97->num << 7;
|
|
dat = (reg << ACREGACC_REG_SHIFT) | ACREGACC_READ;
|
|
__raw_writel(dat, base + ACREGACC);
|
|
__raw_writel(ACINT_REGACCRDY, base + ACINTEN);
|
|
if (!wait_event_timeout(ac97_waitq, txx9aclc_regready(txx9aclc_drvdata), HZ)) {
|
|
__raw_writel(ACINT_REGACCRDY, base + ACINTDIS);
|
|
printk(KERN_ERR "ac97 read timeout (reg %#x)\n", reg);
|
|
dat = 0xffff;
|
|
goto done;
|
|
}
|
|
dat = __raw_readl(base + ACREGACC);
|
|
if (((dat >> ACREGACC_REG_SHIFT) & 0xff) != reg) {
|
|
printk(KERN_ERR "reg mismatch %x with %x\n",
|
|
dat, reg);
|
|
dat = 0xffff;
|
|
goto done;
|
|
}
|
|
dat = (dat >> ACREGACC_DAT_SHIFT) & 0xffff;
|
|
done:
|
|
__raw_writel(ACINT_REGACCRDY, base + ACINTDIS);
|
|
return dat;
|
|
}
|
|
|
|
/* AC97 controller writes to codec register */
|
|
static void txx9aclc_ac97_write(struct snd_ac97 *ac97, unsigned short reg,
|
|
unsigned short val)
|
|
{
|
|
struct txx9aclc_plat_drvdata *drvdata = txx9aclc_drvdata;
|
|
void __iomem *base = drvdata->base;
|
|
|
|
__raw_writel(((reg | (ac97->num << 7)) << ACREGACC_REG_SHIFT) |
|
|
(val << ACREGACC_DAT_SHIFT),
|
|
base + ACREGACC);
|
|
__raw_writel(ACINT_REGACCRDY, base + ACINTEN);
|
|
if (!wait_event_timeout(ac97_waitq, txx9aclc_regready(txx9aclc_drvdata), HZ)) {
|
|
printk(KERN_ERR
|
|
"ac97 write timeout (reg %#x)\n", reg);
|
|
}
|
|
__raw_writel(ACINT_REGACCRDY, base + ACINTDIS);
|
|
}
|
|
|
|
static void txx9aclc_ac97_cold_reset(struct snd_ac97 *ac97)
|
|
{
|
|
struct txx9aclc_plat_drvdata *drvdata = txx9aclc_drvdata;
|
|
void __iomem *base = drvdata->base;
|
|
u32 ready = ACINT_CODECRDY(ac97->num) | ACINT_REGACCRDY;
|
|
|
|
__raw_writel(ACCTL_ENLINK, base + ACCTLDIS);
|
|
mmiowb();
|
|
udelay(1);
|
|
__raw_writel(ACCTL_ENLINK, base + ACCTLEN);
|
|
/* wait for primary codec ready status */
|
|
__raw_writel(ready, base + ACINTEN);
|
|
if (!wait_event_timeout(ac97_waitq,
|
|
(__raw_readl(base + ACINTSTS) & ready) == ready,
|
|
HZ)) {
|
|
dev_err(&ac97->dev, "primary codec is not ready "
|
|
"(status %#x)\n",
|
|
__raw_readl(base + ACINTSTS));
|
|
}
|
|
__raw_writel(ACINT_REGACCRDY, base + ACINTSTS);
|
|
__raw_writel(ready, base + ACINTDIS);
|
|
}
|
|
|
|
/* AC97 controller operations */
|
|
struct snd_ac97_bus_ops soc_ac97_ops = {
|
|
.read = txx9aclc_ac97_read,
|
|
.write = txx9aclc_ac97_write,
|
|
.reset = txx9aclc_ac97_cold_reset,
|
|
};
|
|
EXPORT_SYMBOL_GPL(soc_ac97_ops);
|
|
|
|
static irqreturn_t txx9aclc_ac97_irq(int irq, void *dev_id)
|
|
{
|
|
struct txx9aclc_plat_drvdata *drvdata = dev_id;
|
|
void __iomem *base = drvdata->base;
|
|
|
|
__raw_writel(__raw_readl(base + ACINTMSTS), base + ACINTDIS);
|
|
wake_up(&ac97_waitq);
|
|
return IRQ_HANDLED;
|
|
}
|
|
|
|
static int txx9aclc_ac97_probe(struct snd_soc_dai *dai)
|
|
{
|
|
txx9aclc_drvdata = snd_soc_dai_get_drvdata(dai);
|
|
return 0;
|
|
}
|
|
|
|
static int txx9aclc_ac97_remove(struct snd_soc_dai *dai)
|
|
{
|
|
struct txx9aclc_plat_drvdata *drvdata = snd_soc_dai_get_drvdata(dai);
|
|
|
|
/* disable AC-link */
|
|
__raw_writel(ACCTL_ENLINK, drvdata->base + ACCTLDIS);
|
|
txx9aclc_drvdata = NULL;
|
|
return 0;
|
|
}
|
|
|
|
static struct snd_soc_dai_driver txx9aclc_ac97_dai = {
|
|
.ac97_control = 1,
|
|
.probe = txx9aclc_ac97_probe,
|
|
.remove = txx9aclc_ac97_remove,
|
|
.playback = {
|
|
.rates = AC97_RATES,
|
|
.formats = AC97_FMTS,
|
|
.channels_min = 2,
|
|
.channels_max = 2,
|
|
},
|
|
.capture = {
|
|
.rates = AC97_RATES,
|
|
.formats = AC97_FMTS,
|
|
.channels_min = 2,
|
|
.channels_max = 2,
|
|
},
|
|
};
|
|
|
|
static int __devinit txx9aclc_ac97_dev_probe(struct platform_device *pdev)
|
|
{
|
|
struct txx9aclc_plat_drvdata *drvdata;
|
|
struct resource *r;
|
|
int err;
|
|
int irq;
|
|
|
|
irq = platform_get_irq(pdev, 0);
|
|
if (irq < 0)
|
|
return irq;
|
|
r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
|
if (!r)
|
|
return -EBUSY;
|
|
|
|
if (!devm_request_mem_region(&pdev->dev, r->start, resource_size(r),
|
|
dev_name(&pdev->dev)))
|
|
return -EBUSY;
|
|
|
|
drvdata = devm_kzalloc(&pdev->dev, sizeof(*drvdata), GFP_KERNEL);
|
|
if (!drvdata)
|
|
return -ENOMEM;
|
|
platform_set_drvdata(pdev, drvdata);
|
|
drvdata->physbase = r->start;
|
|
if (sizeof(drvdata->physbase) > sizeof(r->start) &&
|
|
r->start >= TXX9_DIRECTMAP_BASE &&
|
|
r->start < TXX9_DIRECTMAP_BASE + 0x400000)
|
|
drvdata->physbase |= 0xf00000000ull;
|
|
drvdata->base = devm_ioremap(&pdev->dev, r->start, resource_size(r));
|
|
if (!drvdata->base)
|
|
return -EBUSY;
|
|
err = devm_request_irq(&pdev->dev, irq, txx9aclc_ac97_irq,
|
|
IRQF_DISABLED, dev_name(&pdev->dev), drvdata);
|
|
if (err < 0)
|
|
return err;
|
|
|
|
return snd_soc_register_dai(&pdev->dev, &txx9aclc_ac97_dai);
|
|
}
|
|
|
|
static int __devexit txx9aclc_ac97_dev_remove(struct platform_device *pdev)
|
|
{
|
|
snd_soc_unregister_dai(&pdev->dev);
|
|
return 0;
|
|
}
|
|
|
|
static struct platform_driver txx9aclc_ac97_driver = {
|
|
.probe = txx9aclc_ac97_dev_probe,
|
|
.remove = __devexit_p(txx9aclc_ac97_dev_remove),
|
|
.driver = {
|
|
.name = "txx9aclc-ac97",
|
|
.owner = THIS_MODULE,
|
|
},
|
|
};
|
|
|
|
static int __init txx9aclc_ac97_init(void)
|
|
{
|
|
return platform_driver_register(&txx9aclc_ac97_driver);
|
|
}
|
|
|
|
static void __exit txx9aclc_ac97_exit(void)
|
|
{
|
|
platform_driver_unregister(&txx9aclc_ac97_driver);
|
|
}
|
|
|
|
module_init(txx9aclc_ac97_init);
|
|
module_exit(txx9aclc_ac97_exit);
|
|
|
|
MODULE_AUTHOR("Atsushi Nemoto <anemo@mba.ocn.ne.jp>");
|
|
MODULE_DESCRIPTION("TXx9 ACLC AC97 driver");
|
|
MODULE_LICENSE("GPL");
|
|
MODULE_ALIAS("platform:txx9aclc-ac97");
|