mirror of
https://github.com/torvalds/linux.git
synced 2024-12-26 21:02:19 +00:00
47cf84e17e
The commit1abe729
(ASoC: fsl: Add missing pm to current machine drivers) enables pm support for a few IMX machine drivers. But it does not update dev drvdata to be the pointer to 'card'. This causes the kernel dump below in system suspend, because snd_soc_suspend() expects that the dev drvdata points to 'card', while it still points to the private data of machine driver. This patch fixes imx-sgtl5000 and imx-wm8962 by attaching 'card' to dev drvdata and private data to card drvdata. For imx-mc13783, I simply revert the pm change because it must be broken for the same reason and I don't have hardware to test pm enabling code. $ echo mem > /sys/power/state PM: Syncing filesystems ... done. PM: Preparing system for mem sleep mmc1: card e624 removed Freezing user space processes ... (elapsed 0.002 seconds) done. Freezing remaining freezable tasks ... (elapsed 0.002 seconds) done. PM: Entering mem sleep INFO: trying to register non-static key. the code is fine but needs lockdep annotation. turning off the locking correctness validator. CPU: 0 PID: 1861 Comm: bash Not tainted 3.14.0-rc1+ #1648 Backtrace: [<80012144>] (dump_backtrace) from [<800122e4>] (show_stack+0x18/0x1c) r6:8079c77c r5:00000c5a r4:00000000 r3:00000000 [<800122cc>] (show_stack) from [<80637ac0>] (dump_stack+0x78/0x94) [<80637a48>] (dump_stack) from [<80028918>] (warn_slowpath_common+0x6c/0x8c) r4:bdb21c38 r3:be62df00 [<800288ac>] (warn_slowpath_common) from [<800289dc>] (warn_slowpath_fmt+0x38/0x40) r8:be62e3a8 r7:bf122960 r6:00000005 r5:00000000 r4:00000000 [<800289a8>] (warn_slowpath_fmt) from [<8006518c>] (__lock_acquire+0x1ae0/0x1ce0) r3:8079d598 r2:80799e70 [<800636ac>] (__lock_acquire) from [<80065894>] (lock_acquire+0x68/0x7c) r10:bdb20000 r9:be62df00 r8:00000000 r7:00000000 r6:60000013 r5:bdb20000 r4:00000000 [<8006582c>] (lock_acquire) from [<8063c938>] (mutex_lock_nested+0x5c/0x3b8) r7:00000000 r6:80dfc78c r5:804be444 r4:bf122928 [<8063c8dc>] (mutex_lock_nested) from [<804be444>] (snd_soc_suspend+0x34/0x42c) r10:00000000 r9:00000000 r8:00000000 r7:bf1c4444 r6:bf1c4410 r5:be978150 r4:be978010 [<804be410>] (snd_soc_suspend) from [<8034392c>] (platform_pm_suspend+0x34/0x64) r10:00000000 r8:00000000 r7:bf1c4444 r6:bf1c4410 r5:803438f8 r4:bf1c4410 [<803438f8>] (platform_pm_suspend) from [<80348e18>] (dpm_run_callback.isra.7+0x34/0x6c) [<80348de4>] (dpm_run_callback.isra.7) from [<80349354>] (__device_suspend+0x10c/0x220) r9:808dd974 r8:808c4a5c r6:00000002 r5:80e5001c r4:bf1c4410 [<80349248>] (__device_suspend) from [<8034a338>] (dpm_suspend+0x60/0x220) r7:bf1c4410 r6:808dd90c r5:80e5001c r4:bf1c44c0 [<8034a2d8>] (dpm_suspend) from [<8034a790>] (dpm_suspend_start+0x60/0x68) r10:8079a818 r9:00000000 r8:00000004 r7:80dfbe90 r6:80641eec r5:00000000 r4:00000002 [<8034a730>] (dpm_suspend_start) from [<8006a788>] (suspend_devices_and_enter+0x74/0x318) r4:00000003 r3:80dfbe98 [<8006a714>] (suspend_devices_and_enter) from [<8006abd8>] (pm_suspend+0x1ac/0x244) r10:8079a818 r8:00000004 r7:00000003 r6:80641eec r5:00000000 r4:00000003 [<8006aa2c>] (pm_suspend) from [<80069a4c>] (state_store+0x70/0xc0) r5:00000003 r4:bd85ea40 [<800699dc>] (state_store) from [<80294034>] (kobj_attr_store+0x1c/0x28) r10:beb9fe08 r8:00000000 r7:bdb21f78 r6:bd85ea40 r5:00000004 r4:beb9fe00 [<80294018>] (kobj_attr_store) from [<80140f90>] (sysfs_kf_write+0x54/0x58) [<80140f3c>] (sysfs_kf_write) from [<8014474c>] (kernfs_fop_write+0xc4/0x160) r6:bd85ea40 r5:beb9fe00 r4:00000004 r3:80140f3c [<80144688>] (kernfs_fop_write) from [<800dfa14>] (vfs_write+0xbc/0x184) r10:00000000 r9:00000000 r8:00000000 r7:bdb21f78 r6:00500c08 r5:00000004 r4:be782600 [<800df958>] (vfs_write) from [<800dfe00>] (SyS_write+0x48/0x70) r10:00000000 r8:00000000 r7:00000004 r6:00500c08 r5:00000000 r4:be782600 [<800dfdb8>] (SyS_write) from [<8000e800>] (ret_fast_syscall+0x0/0x48) r9:bdb20000 r8:8000e9c4 r7:00000004 r6:00500c08 r5:00000004 r4:76eb65e0 Fixes:1abe729
(ASoC: fsl: Add missing pm to current machine drivers) Cc: stable@vger.kernel.org Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Signed-off-by: Mark Brown <broonie@linaro.org>
218 lines
5.7 KiB
C
218 lines
5.7 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);
|
|
if (ssi_np)
|
|
of_node_put(ssi_np);
|
|
if (codec_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",
|
|
.owner = THIS_MODULE,
|
|
.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");
|