mirror of
https://github.com/torvalds/linux.git
synced 2024-12-23 11:21:33 +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 ...
215 lines
5.6 KiB
C
215 lines
5.6 KiB
C
/*
|
|
* Copyright 2012 Freescale Semiconductor, Inc.
|
|
* Copyright 2012 Linaro Ltd.
|
|
*
|
|
* The code contained herein is licensed under the GNU General Public
|
|
* License. You may obtain a copy of the GNU General Public License
|
|
* Version 2 or later at the following locations:
|
|
*
|
|
* http://www.opensource.org/licenses/gpl-license.html
|
|
* http://www.gnu.org/copyleft/gpl.html
|
|
*/
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/of.h>
|
|
#include <linux/of_platform.h>
|
|
#include <linux/i2c.h>
|
|
#include <linux/clk.h>
|
|
#include <sound/soc.h>
|
|
|
|
#include "../codecs/sgtl5000.h"
|
|
#include "imx-audmux.h"
|
|
|
|
#define DAI_NAME_SIZE 32
|
|
|
|
struct imx_sgtl5000_data {
|
|
struct snd_soc_dai_link dai;
|
|
struct snd_soc_card card;
|
|
char codec_dai_name[DAI_NAME_SIZE];
|
|
char platform_name[DAI_NAME_SIZE];
|
|
struct clk *codec_clk;
|
|
unsigned int clk_frequency;
|
|
};
|
|
|
|
static int imx_sgtl5000_dai_init(struct snd_soc_pcm_runtime *rtd)
|
|
{
|
|
struct imx_sgtl5000_data *data = snd_soc_card_get_drvdata(rtd->card);
|
|
struct device *dev = rtd->card->dev;
|
|
int ret;
|
|
|
|
ret = snd_soc_dai_set_sysclk(rtd->codec_dai, SGTL5000_SYSCLK,
|
|
data->clk_frequency, SND_SOC_CLOCK_IN);
|
|
if (ret) {
|
|
dev_err(dev, "could not set codec driver clock params\n");
|
|
return ret;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static const struct snd_soc_dapm_widget imx_sgtl5000_dapm_widgets[] = {
|
|
SND_SOC_DAPM_MIC("Mic Jack", NULL),
|
|
SND_SOC_DAPM_LINE("Line In Jack", NULL),
|
|
SND_SOC_DAPM_HP("Headphone Jack", NULL),
|
|
SND_SOC_DAPM_SPK("Line Out Jack", NULL),
|
|
SND_SOC_DAPM_SPK("Ext Spk", NULL),
|
|
};
|
|
|
|
static int imx_sgtl5000_probe(struct platform_device *pdev)
|
|
{
|
|
struct device_node *np = pdev->dev.of_node;
|
|
struct device_node *ssi_np, *codec_np;
|
|
struct platform_device *ssi_pdev;
|
|
struct i2c_client *codec_dev;
|
|
struct imx_sgtl5000_data *data = NULL;
|
|
int int_port, ext_port;
|
|
int ret;
|
|
|
|
ret = of_property_read_u32(np, "mux-int-port", &int_port);
|
|
if (ret) {
|
|
dev_err(&pdev->dev, "mux-int-port missing or invalid\n");
|
|
return ret;
|
|
}
|
|
ret = of_property_read_u32(np, "mux-ext-port", &ext_port);
|
|
if (ret) {
|
|
dev_err(&pdev->dev, "mux-ext-port 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--;
|
|
ret = imx_audmux_v2_configure_port(int_port,
|
|
IMX_AUDMUX_V2_PTCR_SYN |
|
|
IMX_AUDMUX_V2_PTCR_TFSEL(ext_port) |
|
|
IMX_AUDMUX_V2_PTCR_TCSEL(ext_port) |
|
|
IMX_AUDMUX_V2_PTCR_TFSDIR |
|
|
IMX_AUDMUX_V2_PTCR_TCLKDIR,
|
|
IMX_AUDMUX_V2_PDCR_RXDSEL(ext_port));
|
|
if (ret) {
|
|
dev_err(&pdev->dev, "audmux internal port setup failed\n");
|
|
return ret;
|
|
}
|
|
ret = imx_audmux_v2_configure_port(ext_port,
|
|
IMX_AUDMUX_V2_PTCR_SYN,
|
|
IMX_AUDMUX_V2_PDCR_RXDSEL(int_port));
|
|
if (ret) {
|
|
dev_err(&pdev->dev, "audmux external port setup failed\n");
|
|
return ret;
|
|
}
|
|
|
|
ssi_np = of_parse_phandle(pdev->dev.of_node, "ssi-controller", 0);
|
|
codec_np = of_parse_phandle(pdev->dev.of_node, "audio-codec", 0);
|
|
if (!ssi_np || !codec_np) {
|
|
dev_err(&pdev->dev, "phandle missing or invalid\n");
|
|
ret = -EINVAL;
|
|
goto fail;
|
|
}
|
|
|
|
ssi_pdev = of_find_device_by_node(ssi_np);
|
|
if (!ssi_pdev) {
|
|
dev_err(&pdev->dev, "failed to find SSI platform device\n");
|
|
ret = -EPROBE_DEFER;
|
|
goto fail;
|
|
}
|
|
codec_dev = of_find_i2c_device_by_node(codec_np);
|
|
if (!codec_dev) {
|
|
dev_err(&pdev->dev, "failed to find codec platform device\n");
|
|
return -EPROBE_DEFER;
|
|
}
|
|
|
|
data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
|
|
if (!data) {
|
|
ret = -ENOMEM;
|
|
goto fail;
|
|
}
|
|
|
|
data->codec_clk = clk_get(&codec_dev->dev, NULL);
|
|
if (IS_ERR(data->codec_clk)) {
|
|
ret = PTR_ERR(data->codec_clk);
|
|
goto fail;
|
|
}
|
|
|
|
data->clk_frequency = clk_get_rate(data->codec_clk);
|
|
|
|
data->dai.name = "HiFi";
|
|
data->dai.stream_name = "HiFi";
|
|
data->dai.codec_dai_name = "sgtl5000";
|
|
data->dai.codec_of_node = codec_np;
|
|
data->dai.cpu_of_node = ssi_np;
|
|
data->dai.platform_of_node = ssi_np;
|
|
data->dai.init = &imx_sgtl5000_dai_init;
|
|
data->dai.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
|
|
SND_SOC_DAIFMT_CBM_CFM;
|
|
|
|
data->card.dev = &pdev->dev;
|
|
ret = snd_soc_of_parse_card_name(&data->card, "model");
|
|
if (ret)
|
|
goto fail;
|
|
ret = snd_soc_of_parse_audio_routing(&data->card, "audio-routing");
|
|
if (ret)
|
|
goto fail;
|
|
data->card.num_links = 1;
|
|
data->card.owner = THIS_MODULE;
|
|
data->card.dai_link = &data->dai;
|
|
data->card.dapm_widgets = imx_sgtl5000_dapm_widgets;
|
|
data->card.num_dapm_widgets = ARRAY_SIZE(imx_sgtl5000_dapm_widgets);
|
|
|
|
platform_set_drvdata(pdev, &data->card);
|
|
snd_soc_card_set_drvdata(&data->card, data);
|
|
|
|
ret = devm_snd_soc_register_card(&pdev->dev, &data->card);
|
|
if (ret) {
|
|
dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n", ret);
|
|
goto fail;
|
|
}
|
|
|
|
of_node_put(ssi_np);
|
|
of_node_put(codec_np);
|
|
|
|
return 0;
|
|
|
|
fail:
|
|
if (data && !IS_ERR(data->codec_clk))
|
|
clk_put(data->codec_clk);
|
|
of_node_put(ssi_np);
|
|
of_node_put(codec_np);
|
|
|
|
return ret;
|
|
}
|
|
|
|
static int imx_sgtl5000_remove(struct platform_device *pdev)
|
|
{
|
|
struct snd_soc_card *card = platform_get_drvdata(pdev);
|
|
struct imx_sgtl5000_data *data = snd_soc_card_get_drvdata(card);
|
|
|
|
clk_put(data->codec_clk);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static const struct of_device_id imx_sgtl5000_dt_ids[] = {
|
|
{ .compatible = "fsl,imx-audio-sgtl5000", },
|
|
{ /* sentinel */ }
|
|
};
|
|
MODULE_DEVICE_TABLE(of, imx_sgtl5000_dt_ids);
|
|
|
|
static struct platform_driver imx_sgtl5000_driver = {
|
|
.driver = {
|
|
.name = "imx-sgtl5000",
|
|
.pm = &snd_soc_pm_ops,
|
|
.of_match_table = imx_sgtl5000_dt_ids,
|
|
},
|
|
.probe = imx_sgtl5000_probe,
|
|
.remove = imx_sgtl5000_remove,
|
|
};
|
|
module_platform_driver(imx_sgtl5000_driver);
|
|
|
|
MODULE_AUTHOR("Shawn Guo <shawn.guo@linaro.org>");
|
|
MODULE_DESCRIPTION("Freescale i.MX SGTL5000 ASoC machine driver");
|
|
MODULE_LICENSE("GPL v2");
|
|
MODULE_ALIAS("platform:imx-sgtl5000");
|