mirror of
https://github.com/torvalds/linux.git
synced 2024-12-15 15:41:58 +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>
312 lines
7.3 KiB
C
312 lines
7.3 KiB
C
/*
|
|
* AK4104 ALSA SoC (ASoC) driver
|
|
*
|
|
* Copyright (c) 2009 Daniel Mack <daniel@caiaq.de>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms of the GNU General Public License as published by the
|
|
* Free Software Foundation; either version 2 of the License, or (at your
|
|
* option) any later version.
|
|
*/
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/slab.h>
|
|
#include <sound/core.h>
|
|
#include <sound/soc.h>
|
|
#include <sound/initval.h>
|
|
#include <linux/spi/spi.h>
|
|
#include <sound/asoundef.h>
|
|
|
|
/* AK4104 registers addresses */
|
|
#define AK4104_REG_CONTROL1 0x00
|
|
#define AK4104_REG_RESERVED 0x01
|
|
#define AK4104_REG_CONTROL2 0x02
|
|
#define AK4104_REG_TX 0x03
|
|
#define AK4104_REG_CHN_STATUS(x) ((x) + 0x04)
|
|
#define AK4104_NUM_REGS 10
|
|
|
|
#define AK4104_REG_MASK 0x1f
|
|
#define AK4104_READ 0xc0
|
|
#define AK4104_WRITE 0xe0
|
|
#define AK4104_RESERVED_VAL 0x5b
|
|
|
|
/* Bit masks for AK4104 registers */
|
|
#define AK4104_CONTROL1_RSTN (1 << 0)
|
|
#define AK4104_CONTROL1_PW (1 << 1)
|
|
#define AK4104_CONTROL1_DIF0 (1 << 2)
|
|
#define AK4104_CONTROL1_DIF1 (1 << 3)
|
|
|
|
#define AK4104_CONTROL2_SEL0 (1 << 0)
|
|
#define AK4104_CONTROL2_SEL1 (1 << 1)
|
|
#define AK4104_CONTROL2_MODE (1 << 2)
|
|
|
|
#define AK4104_TX_TXE (1 << 0)
|
|
#define AK4104_TX_V (1 << 1)
|
|
|
|
#define DRV_NAME "ak4104-codec"
|
|
|
|
struct ak4104_private {
|
|
enum snd_soc_control_type control_type;
|
|
void *control_data;
|
|
};
|
|
|
|
static int ak4104_fill_cache(struct snd_soc_codec *codec)
|
|
{
|
|
int i;
|
|
u8 *reg_cache = codec->reg_cache;
|
|
struct spi_device *spi = codec->control_data;
|
|
|
|
for (i = 0; i < codec->driver->reg_cache_size; i++) {
|
|
int ret = spi_w8r8(spi, i | AK4104_READ);
|
|
if (ret < 0) {
|
|
dev_err(&spi->dev, "SPI write failure\n");
|
|
return ret;
|
|
}
|
|
|
|
reg_cache[i] = ret;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static unsigned int ak4104_read_reg_cache(struct snd_soc_codec *codec,
|
|
unsigned int reg)
|
|
{
|
|
u8 *reg_cache = codec->reg_cache;
|
|
|
|
if (reg >= codec->driver->reg_cache_size)
|
|
return -EINVAL;
|
|
|
|
return reg_cache[reg];
|
|
}
|
|
|
|
static int ak4104_spi_write(struct snd_soc_codec *codec, unsigned int reg,
|
|
unsigned int value)
|
|
{
|
|
u8 *cache = codec->reg_cache;
|
|
struct spi_device *spi = codec->control_data;
|
|
|
|
if (reg >= codec->driver->reg_cache_size)
|
|
return -EINVAL;
|
|
|
|
/* only write to the hardware if value has changed */
|
|
if (cache[reg] != value) {
|
|
u8 tmp[2] = { (reg & AK4104_REG_MASK) | AK4104_WRITE, value };
|
|
|
|
if (spi_write(spi, tmp, sizeof(tmp))) {
|
|
dev_err(&spi->dev, "SPI write failed\n");
|
|
return -EIO;
|
|
}
|
|
|
|
cache[reg] = value;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int ak4104_set_dai_fmt(struct snd_soc_dai *codec_dai,
|
|
unsigned int format)
|
|
{
|
|
struct snd_soc_codec *codec = codec_dai->codec;
|
|
int val = 0;
|
|
|
|
val = ak4104_read_reg_cache(codec, AK4104_REG_CONTROL1);
|
|
if (val < 0)
|
|
return val;
|
|
|
|
val &= ~(AK4104_CONTROL1_DIF0 | AK4104_CONTROL1_DIF1);
|
|
|
|
/* set DAI format */
|
|
switch (format & SND_SOC_DAIFMT_FORMAT_MASK) {
|
|
case SND_SOC_DAIFMT_RIGHT_J:
|
|
break;
|
|
case SND_SOC_DAIFMT_LEFT_J:
|
|
val |= AK4104_CONTROL1_DIF0;
|
|
break;
|
|
case SND_SOC_DAIFMT_I2S:
|
|
val |= AK4104_CONTROL1_DIF0 | AK4104_CONTROL1_DIF1;
|
|
break;
|
|
default:
|
|
dev_err(codec->dev, "invalid dai format\n");
|
|
return -EINVAL;
|
|
}
|
|
|
|
/* This device can only be slave */
|
|
if ((format & SND_SOC_DAIFMT_MASTER_MASK) != SND_SOC_DAIFMT_CBS_CFS)
|
|
return -EINVAL;
|
|
|
|
return ak4104_spi_write(codec, AK4104_REG_CONTROL1, val);
|
|
}
|
|
|
|
static int ak4104_hw_params(struct snd_pcm_substream *substream,
|
|
struct snd_pcm_hw_params *params,
|
|
struct snd_soc_dai *dai)
|
|
{
|
|
struct snd_soc_pcm_runtime *rtd = substream->private_data;
|
|
struct snd_soc_codec *codec = rtd->codec;
|
|
int val = 0;
|
|
|
|
/* set the IEC958 bits: consumer mode, no copyright bit */
|
|
val |= IEC958_AES0_CON_NOT_COPYRIGHT;
|
|
ak4104_spi_write(codec, AK4104_REG_CHN_STATUS(0), val);
|
|
|
|
val = 0;
|
|
|
|
switch (params_rate(params)) {
|
|
case 44100:
|
|
val |= IEC958_AES3_CON_FS_44100;
|
|
break;
|
|
case 48000:
|
|
val |= IEC958_AES3_CON_FS_48000;
|
|
break;
|
|
case 32000:
|
|
val |= IEC958_AES3_CON_FS_32000;
|
|
break;
|
|
default:
|
|
dev_err(codec->dev, "unsupported sampling rate\n");
|
|
return -EINVAL;
|
|
}
|
|
|
|
return ak4104_spi_write(codec, AK4104_REG_CHN_STATUS(3), val);
|
|
}
|
|
|
|
static struct snd_soc_dai_ops ak4101_dai_ops = {
|
|
.hw_params = ak4104_hw_params,
|
|
.set_fmt = ak4104_set_dai_fmt,
|
|
};
|
|
|
|
static struct snd_soc_dai_driver ak4104_dai = {
|
|
.name = "ak4104-hifi",
|
|
.playback = {
|
|
.stream_name = "Playback",
|
|
.channels_min = 2,
|
|
.channels_max = 2,
|
|
.rates = SNDRV_PCM_RATE_8000_192000,
|
|
.formats = SNDRV_PCM_FMTBIT_S16_LE |
|
|
SNDRV_PCM_FMTBIT_S24_3LE |
|
|
SNDRV_PCM_FMTBIT_S24_LE
|
|
},
|
|
.ops = &ak4101_dai_ops,
|
|
};
|
|
|
|
static int ak4104_probe(struct snd_soc_codec *codec)
|
|
{
|
|
struct ak4104_private *ak4104 = snd_soc_codec_get_drvdata(codec);
|
|
int ret, val;
|
|
|
|
codec->control_data = ak4104->control_data;
|
|
|
|
/* read all regs and fill the cache */
|
|
ret = ak4104_fill_cache(codec);
|
|
if (ret < 0) {
|
|
dev_err(codec->dev, "failed to fill register cache\n");
|
|
return ret;
|
|
}
|
|
|
|
/* read the 'reserved' register - according to the datasheet, it
|
|
* should contain 0x5b. Not a good way to verify the presence of
|
|
* the device, but there is no hardware ID register. */
|
|
if (ak4104_read_reg_cache(codec, AK4104_REG_RESERVED) !=
|
|
AK4104_RESERVED_VAL)
|
|
return -ENODEV;
|
|
|
|
/* set power-up and non-reset bits */
|
|
val = ak4104_read_reg_cache(codec, AK4104_REG_CONTROL1);
|
|
val |= AK4104_CONTROL1_PW | AK4104_CONTROL1_RSTN;
|
|
ret = ak4104_spi_write(codec, AK4104_REG_CONTROL1, val);
|
|
if (ret < 0)
|
|
return ret;
|
|
|
|
/* enable transmitter */
|
|
val = ak4104_read_reg_cache(codec, AK4104_REG_TX);
|
|
val |= AK4104_TX_TXE;
|
|
ret = ak4104_spi_write(codec, AK4104_REG_TX, val);
|
|
if (ret < 0)
|
|
return ret;
|
|
|
|
dev_info(codec->dev, "SPI device initialized\n");
|
|
return 0;
|
|
}
|
|
|
|
static int ak4104_remove(struct snd_soc_codec *codec)
|
|
{
|
|
int val, ret;
|
|
|
|
val = ak4104_read_reg_cache(codec, AK4104_REG_CONTROL1);
|
|
if (val < 0)
|
|
return val;
|
|
|
|
/* clear power-up and non-reset bits */
|
|
val &= ~(AK4104_CONTROL1_PW | AK4104_CONTROL1_RSTN);
|
|
ret = ak4104_spi_write(codec, AK4104_REG_CONTROL1, val);
|
|
|
|
return ret;
|
|
}
|
|
|
|
static struct snd_soc_codec_driver soc_codec_device_ak4104 = {
|
|
.probe = ak4104_probe,
|
|
.remove = ak4104_remove,
|
|
.reg_cache_size = AK4104_NUM_REGS,
|
|
.reg_word_size = sizeof(u16),
|
|
};
|
|
|
|
static int ak4104_spi_probe(struct spi_device *spi)
|
|
{
|
|
struct ak4104_private *ak4104;
|
|
int ret;
|
|
|
|
spi->bits_per_word = 8;
|
|
spi->mode = SPI_MODE_0;
|
|
ret = spi_setup(spi);
|
|
if (ret < 0)
|
|
return ret;
|
|
|
|
ak4104 = kzalloc(sizeof(struct ak4104_private), GFP_KERNEL);
|
|
if (ak4104 == NULL)
|
|
return -ENOMEM;
|
|
|
|
ak4104->control_data = spi;
|
|
ak4104->control_type = SND_SOC_SPI;
|
|
spi_set_drvdata(spi, ak4104);
|
|
|
|
ret = snd_soc_register_codec(&spi->dev,
|
|
&soc_codec_device_ak4104, &ak4104_dai, 1);
|
|
if (ret < 0)
|
|
kfree(ak4104);
|
|
return ret;
|
|
}
|
|
|
|
static int __devexit ak4104_spi_remove(struct spi_device *spi)
|
|
{
|
|
snd_soc_unregister_codec(&spi->dev);
|
|
kfree(spi_get_drvdata(spi));
|
|
return 0;
|
|
}
|
|
|
|
static struct spi_driver ak4104_spi_driver = {
|
|
.driver = {
|
|
.name = DRV_NAME,
|
|
.owner = THIS_MODULE,
|
|
},
|
|
.probe = ak4104_spi_probe,
|
|
.remove = __devexit_p(ak4104_spi_remove),
|
|
};
|
|
|
|
static int __init ak4104_init(void)
|
|
{
|
|
pr_info("Asahi Kasei AK4104 ALSA SoC Codec Driver\n");
|
|
return spi_register_driver(&ak4104_spi_driver);
|
|
}
|
|
module_init(ak4104_init);
|
|
|
|
static void __exit ak4104_exit(void)
|
|
{
|
|
spi_unregister_driver(&ak4104_spi_driver);
|
|
}
|
|
module_exit(ak4104_exit);
|
|
|
|
MODULE_AUTHOR("Daniel Mack <daniel@caiaq.de>");
|
|
MODULE_DESCRIPTION("Asahi Kasei AK4104 ALSA SoC driver");
|
|
MODULE_LICENSE("GPL");
|
|
|