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 ...
253 lines
6.6 KiB
C
253 lines
6.6 KiB
C
/*
|
|
* eukrea-tlv320.c -- SoC audio for eukrea_cpuimxXX in I2S mode
|
|
*
|
|
* Copyright 2010 Eric Bénard, Eukréa Electromatique <eric@eukrea.com>
|
|
*
|
|
* based on sound/soc/s3c24xx/s3c24xx_simtec_tlv320aic23.c
|
|
* which is Copyright 2009 Simtec Electronics
|
|
* and on sound/soc/imx/phycore-ac97.c which is
|
|
* Copyright 2009 Sascha Hauer, Pengutronix <s.hauer@pengutronix.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/errno.h>
|
|
#include <linux/module.h>
|
|
#include <linux/moduleparam.h>
|
|
#include <linux/of.h>
|
|
#include <linux/of_platform.h>
|
|
#include <linux/device.h>
|
|
#include <linux/i2c.h>
|
|
#include <sound/core.h>
|
|
#include <sound/pcm.h>
|
|
#include <sound/soc.h>
|
|
#include <asm/mach-types.h>
|
|
|
|
#include "../codecs/tlv320aic23.h"
|
|
#include "imx-ssi.h"
|
|
#include "fsl_ssi.h"
|
|
#include "imx-audmux.h"
|
|
|
|
#define CODEC_CLOCK 12000000
|
|
|
|
static int eukrea_tlv320_hw_params(struct snd_pcm_substream *substream,
|
|
struct snd_pcm_hw_params *params)
|
|
{
|
|
struct snd_soc_pcm_runtime *rtd = substream->private_data;
|
|
struct snd_soc_dai *codec_dai = rtd->codec_dai;
|
|
struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
|
|
int ret;
|
|
|
|
ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S |
|
|
SND_SOC_DAIFMT_NB_NF |
|
|
SND_SOC_DAIFMT_CBM_CFM);
|
|
/* fsl_ssi lacks the set_fmt ops. */
|
|
if (ret && ret != -ENOTSUPP) {
|
|
dev_err(cpu_dai->dev,
|
|
"Failed to set the cpu dai format.\n");
|
|
return ret;
|
|
}
|
|
|
|
ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S |
|
|
SND_SOC_DAIFMT_NB_NF |
|
|
SND_SOC_DAIFMT_CBM_CFM);
|
|
if (ret) {
|
|
dev_err(cpu_dai->dev,
|
|
"Failed to set the codec format.\n");
|
|
return ret;
|
|
}
|
|
|
|
ret = snd_soc_dai_set_sysclk(codec_dai, 0,
|
|
CODEC_CLOCK, SND_SOC_CLOCK_OUT);
|
|
if (ret) {
|
|
dev_err(cpu_dai->dev,
|
|
"Failed to set the codec sysclk.\n");
|
|
return ret;
|
|
}
|
|
|
|
snd_soc_dai_set_tdm_slot(cpu_dai, 0xffffffc, 0xffffffc, 2, 0);
|
|
|
|
ret = snd_soc_dai_set_sysclk(cpu_dai, IMX_SSP_SYS_CLK, 0,
|
|
SND_SOC_CLOCK_IN);
|
|
/* fsl_ssi lacks the set_sysclk ops */
|
|
if (ret && ret != -EINVAL) {
|
|
dev_err(cpu_dai->dev,
|
|
"Can't set the IMX_SSP_SYS_CLK CPU system clock.\n");
|
|
return ret;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static struct snd_soc_ops eukrea_tlv320_snd_ops = {
|
|
.hw_params = eukrea_tlv320_hw_params,
|
|
};
|
|
|
|
static struct snd_soc_dai_link eukrea_tlv320_dai = {
|
|
.name = "tlv320aic23",
|
|
.stream_name = "TLV320AIC23",
|
|
.codec_dai_name = "tlv320aic23-hifi",
|
|
.ops = &eukrea_tlv320_snd_ops,
|
|
};
|
|
|
|
static struct snd_soc_card eukrea_tlv320 = {
|
|
.owner = THIS_MODULE,
|
|
.dai_link = &eukrea_tlv320_dai,
|
|
.num_links = 1,
|
|
};
|
|
|
|
static int eukrea_tlv320_probe(struct platform_device *pdev)
|
|
{
|
|
int ret;
|
|
int int_port = 0, ext_port;
|
|
struct device_node *np = pdev->dev.of_node;
|
|
struct device_node *ssi_np = NULL, *codec_np = NULL;
|
|
|
|
eukrea_tlv320.dev = &pdev->dev;
|
|
if (np) {
|
|
ret = snd_soc_of_parse_card_name(&eukrea_tlv320,
|
|
"eukrea,model");
|
|
if (ret) {
|
|
dev_err(&pdev->dev,
|
|
"eukrea,model node missing or invalid.\n");
|
|
goto err;
|
|
}
|
|
|
|
ssi_np = of_parse_phandle(pdev->dev.of_node,
|
|
"ssi-controller", 0);
|
|
if (!ssi_np) {
|
|
dev_err(&pdev->dev,
|
|
"ssi-controller missing or invalid.\n");
|
|
ret = -ENODEV;
|
|
goto err;
|
|
}
|
|
|
|
codec_np = of_parse_phandle(ssi_np, "codec-handle", 0);
|
|
if (codec_np)
|
|
eukrea_tlv320_dai.codec_of_node = codec_np;
|
|
else
|
|
dev_err(&pdev->dev, "codec-handle node missing or invalid.\n");
|
|
|
|
ret = of_property_read_u32(np, "fsl,mux-int-port", &int_port);
|
|
if (ret) {
|
|
dev_err(&pdev->dev,
|
|
"fsl,mux-int-port node missing or invalid.\n");
|
|
return ret;
|
|
}
|
|
ret = of_property_read_u32(np, "fsl,mux-ext-port", &ext_port);
|
|
if (ret) {
|
|
dev_err(&pdev->dev,
|
|
"fsl,mux-ext-port node missing or invalid.\n");
|
|
return ret;
|
|
}
|
|
|
|
/*
|
|
* The port numbering in the hardware manual starts at 1, while
|
|
* the audmux API expects it starts at 0.
|
|
*/
|
|
int_port--;
|
|
ext_port--;
|
|
|
|
eukrea_tlv320_dai.cpu_of_node = ssi_np;
|
|
eukrea_tlv320_dai.platform_of_node = ssi_np;
|
|
} else {
|
|
eukrea_tlv320_dai.cpu_dai_name = "imx-ssi.0";
|
|
eukrea_tlv320_dai.platform_name = "imx-ssi.0";
|
|
eukrea_tlv320_dai.codec_name = "tlv320aic23-codec.0-001a";
|
|
eukrea_tlv320.name = "cpuimx-audio";
|
|
}
|
|
|
|
if (machine_is_eukrea_cpuimx27() ||
|
|
of_find_compatible_node(NULL, NULL, "fsl,imx21-audmux")) {
|
|
imx_audmux_v1_configure_port(MX27_AUDMUX_HPCR1_SSI0,
|
|
IMX_AUDMUX_V1_PCR_SYN |
|
|
IMX_AUDMUX_V1_PCR_TFSDIR |
|
|
IMX_AUDMUX_V1_PCR_TCLKDIR |
|
|
IMX_AUDMUX_V1_PCR_RFSDIR |
|
|
IMX_AUDMUX_V1_PCR_RCLKDIR |
|
|
IMX_AUDMUX_V1_PCR_TFCSEL(MX27_AUDMUX_HPCR3_SSI_PINS_4) |
|
|
IMX_AUDMUX_V1_PCR_RFCSEL(MX27_AUDMUX_HPCR3_SSI_PINS_4) |
|
|
IMX_AUDMUX_V1_PCR_RXDSEL(MX27_AUDMUX_HPCR3_SSI_PINS_4)
|
|
);
|
|
imx_audmux_v1_configure_port(MX27_AUDMUX_HPCR3_SSI_PINS_4,
|
|
IMX_AUDMUX_V1_PCR_SYN |
|
|
IMX_AUDMUX_V1_PCR_RXDSEL(MX27_AUDMUX_HPCR1_SSI0)
|
|
);
|
|
} else if (machine_is_eukrea_cpuimx25sd() ||
|
|
machine_is_eukrea_cpuimx35sd() ||
|
|
machine_is_eukrea_cpuimx51sd() ||
|
|
of_find_compatible_node(NULL, NULL, "fsl,imx31-audmux")) {
|
|
if (!np)
|
|
ext_port = machine_is_eukrea_cpuimx25sd() ?
|
|
4 : 3;
|
|
|
|
imx_audmux_v2_configure_port(int_port,
|
|
IMX_AUDMUX_V2_PTCR_SYN |
|
|
IMX_AUDMUX_V2_PTCR_TFSDIR |
|
|
IMX_AUDMUX_V2_PTCR_TFSEL(ext_port) |
|
|
IMX_AUDMUX_V2_PTCR_TCLKDIR |
|
|
IMX_AUDMUX_V2_PTCR_TCSEL(ext_port),
|
|
IMX_AUDMUX_V2_PDCR_RXDSEL(ext_port)
|
|
);
|
|
imx_audmux_v2_configure_port(ext_port,
|
|
IMX_AUDMUX_V2_PTCR_SYN,
|
|
IMX_AUDMUX_V2_PDCR_RXDSEL(int_port)
|
|
);
|
|
} else {
|
|
if (np) {
|
|
/* The eukrea,asoc-tlv320 driver was explicitely
|
|
* requested (through the device tree).
|
|
*/
|
|
dev_err(&pdev->dev,
|
|
"Missing or invalid audmux DT node.\n");
|
|
return -ENODEV;
|
|
} else {
|
|
/* Return happy.
|
|
* We might run on a totally different machine.
|
|
*/
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
ret = snd_soc_register_card(&eukrea_tlv320);
|
|
err:
|
|
if (ret)
|
|
dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n", ret);
|
|
of_node_put(ssi_np);
|
|
|
|
return ret;
|
|
}
|
|
|
|
static int eukrea_tlv320_remove(struct platform_device *pdev)
|
|
{
|
|
snd_soc_unregister_card(&eukrea_tlv320);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static const struct of_device_id imx_tlv320_dt_ids[] = {
|
|
{ .compatible = "eukrea,asoc-tlv320"},
|
|
{ /* sentinel */ }
|
|
};
|
|
MODULE_DEVICE_TABLE(of, imx_tlv320_dt_ids);
|
|
|
|
static struct platform_driver eukrea_tlv320_driver = {
|
|
.driver = {
|
|
.name = "eukrea_tlv320",
|
|
.of_match_table = imx_tlv320_dt_ids,
|
|
},
|
|
.probe = eukrea_tlv320_probe,
|
|
.remove = eukrea_tlv320_remove,
|
|
};
|
|
|
|
module_platform_driver(eukrea_tlv320_driver);
|
|
|
|
MODULE_AUTHOR("Eric Bénard <eric@eukrea.com>");
|
|
MODULE_DESCRIPTION("CPUIMX ALSA SoC driver");
|
|
MODULE_LICENSE("GPL");
|
|
MODULE_ALIAS("platform:eukrea_tlv320");
|