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 ...
202 lines
5.3 KiB
C
202 lines
5.3 KiB
C
/*
|
|
* Copyright 2011 Freescale Semiconductor, Inc.
|
|
*
|
|
* 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.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along
|
|
* with this program; if not, write to the Free Software Foundation, Inc.,
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
*/
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/device.h>
|
|
#include <linux/of.h>
|
|
#include <linux/of_device.h>
|
|
#include <sound/core.h>
|
|
#include <sound/pcm.h>
|
|
#include <sound/soc.h>
|
|
#include <sound/jack.h>
|
|
#include <sound/soc-dapm.h>
|
|
|
|
#include "../codecs/sgtl5000.h"
|
|
#include "mxs-saif.h"
|
|
|
|
static int mxs_sgtl5000_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;
|
|
unsigned int rate = params_rate(params);
|
|
u32 dai_format, mclk;
|
|
int ret;
|
|
|
|
/* sgtl5000 does not support 512*rate when in 96000 fs */
|
|
switch (rate) {
|
|
case 96000:
|
|
mclk = 256 * rate;
|
|
break;
|
|
default:
|
|
mclk = 512 * rate;
|
|
break;
|
|
}
|
|
|
|
/* Set SGTL5000's SYSCLK (provided by SAIF MCLK) */
|
|
ret = snd_soc_dai_set_sysclk(codec_dai, SGTL5000_SYSCLK, mclk, 0);
|
|
if (ret) {
|
|
dev_err(codec_dai->dev, "Failed to set sysclk to %u.%03uMHz\n",
|
|
mclk / 1000000, mclk / 1000 % 1000);
|
|
return ret;
|
|
}
|
|
|
|
/* The SAIF MCLK should be the same as SGTL5000_SYSCLK */
|
|
ret = snd_soc_dai_set_sysclk(cpu_dai, MXS_SAIF_MCLK, mclk, 0);
|
|
if (ret) {
|
|
dev_err(cpu_dai->dev, "Failed to set sysclk to %u.%03uMHz\n",
|
|
mclk / 1000000, mclk / 1000 % 1000);
|
|
return ret;
|
|
}
|
|
|
|
/* set codec to slave mode */
|
|
dai_format = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
|
|
SND_SOC_DAIFMT_CBS_CFS;
|
|
|
|
/* set codec DAI configuration */
|
|
ret = snd_soc_dai_set_fmt(codec_dai, dai_format);
|
|
if (ret) {
|
|
dev_err(codec_dai->dev, "Failed to set dai format to %08x\n",
|
|
dai_format);
|
|
return ret;
|
|
}
|
|
|
|
/* set cpu DAI configuration */
|
|
ret = snd_soc_dai_set_fmt(cpu_dai, dai_format);
|
|
if (ret) {
|
|
dev_err(cpu_dai->dev, "Failed to set dai format to %08x\n",
|
|
dai_format);
|
|
return ret;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static struct snd_soc_ops mxs_sgtl5000_hifi_ops = {
|
|
.hw_params = mxs_sgtl5000_hw_params,
|
|
};
|
|
|
|
static struct snd_soc_dai_link mxs_sgtl5000_dai[] = {
|
|
{
|
|
.name = "HiFi Tx",
|
|
.stream_name = "HiFi Playback",
|
|
.codec_dai_name = "sgtl5000",
|
|
.ops = &mxs_sgtl5000_hifi_ops,
|
|
.playback_only = true,
|
|
}, {
|
|
.name = "HiFi Rx",
|
|
.stream_name = "HiFi Capture",
|
|
.codec_dai_name = "sgtl5000",
|
|
.ops = &mxs_sgtl5000_hifi_ops,
|
|
.capture_only = true,
|
|
},
|
|
};
|
|
|
|
static struct snd_soc_card mxs_sgtl5000 = {
|
|
.name = "mxs_sgtl5000",
|
|
.owner = THIS_MODULE,
|
|
.dai_link = mxs_sgtl5000_dai,
|
|
.num_links = ARRAY_SIZE(mxs_sgtl5000_dai),
|
|
};
|
|
|
|
static int mxs_sgtl5000_probe(struct platform_device *pdev)
|
|
{
|
|
struct snd_soc_card *card = &mxs_sgtl5000;
|
|
int ret, i;
|
|
struct device_node *np = pdev->dev.of_node;
|
|
struct device_node *saif_np[2], *codec_np;
|
|
|
|
saif_np[0] = of_parse_phandle(np, "saif-controllers", 0);
|
|
saif_np[1] = of_parse_phandle(np, "saif-controllers", 1);
|
|
codec_np = of_parse_phandle(np, "audio-codec", 0);
|
|
if (!saif_np[0] || !saif_np[1] || !codec_np) {
|
|
dev_err(&pdev->dev, "phandle missing or invalid\n");
|
|
return -EINVAL;
|
|
}
|
|
|
|
for (i = 0; i < 2; i++) {
|
|
mxs_sgtl5000_dai[i].codec_name = NULL;
|
|
mxs_sgtl5000_dai[i].codec_of_node = codec_np;
|
|
mxs_sgtl5000_dai[i].cpu_dai_name = NULL;
|
|
mxs_sgtl5000_dai[i].cpu_of_node = saif_np[i];
|
|
mxs_sgtl5000_dai[i].platform_name = NULL;
|
|
mxs_sgtl5000_dai[i].platform_of_node = saif_np[i];
|
|
}
|
|
|
|
of_node_put(codec_np);
|
|
of_node_put(saif_np[0]);
|
|
of_node_put(saif_np[1]);
|
|
|
|
/*
|
|
* Set an init clock(11.28Mhz) for sgtl5000 initialization(i2c r/w).
|
|
* The Sgtl5000 sysclk is derived from saif0 mclk and it's range
|
|
* should be >= 8MHz and <= 27M.
|
|
*/
|
|
ret = mxs_saif_get_mclk(0, 44100 * 256, 44100);
|
|
if (ret) {
|
|
dev_err(&pdev->dev, "failed to get mclk\n");
|
|
return ret;
|
|
}
|
|
|
|
card->dev = &pdev->dev;
|
|
platform_set_drvdata(pdev, card);
|
|
|
|
ret = snd_soc_register_card(card);
|
|
if (ret) {
|
|
dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n",
|
|
ret);
|
|
return ret;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int mxs_sgtl5000_remove(struct platform_device *pdev)
|
|
{
|
|
struct snd_soc_card *card = platform_get_drvdata(pdev);
|
|
|
|
mxs_saif_put_mclk(0);
|
|
|
|
snd_soc_unregister_card(card);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static const struct of_device_id mxs_sgtl5000_dt_ids[] = {
|
|
{ .compatible = "fsl,mxs-audio-sgtl5000", },
|
|
{ /* sentinel */ }
|
|
};
|
|
MODULE_DEVICE_TABLE(of, mxs_sgtl5000_dt_ids);
|
|
|
|
static struct platform_driver mxs_sgtl5000_audio_driver = {
|
|
.driver = {
|
|
.name = "mxs-sgtl5000",
|
|
.of_match_table = mxs_sgtl5000_dt_ids,
|
|
},
|
|
.probe = mxs_sgtl5000_probe,
|
|
.remove = mxs_sgtl5000_remove,
|
|
};
|
|
|
|
module_platform_driver(mxs_sgtl5000_audio_driver);
|
|
|
|
MODULE_AUTHOR("Freescale Semiconductor, Inc.");
|
|
MODULE_DESCRIPTION("MXS ALSA SoC Machine driver");
|
|
MODULE_LICENSE("GPL");
|
|
MODULE_ALIAS("platform:mxs-sgtl5000");
|