mirror of
https://github.com/torvalds/linux.git
synced 2024-12-20 18:11:47 +00:00
3c27ea23ff
On Linux 5.9-rc1 I get the following warning with apq8016-sbc: WARNING: CPU: 2 PID: 69 at sound/core/init.c:207 snd_card_new+0x36c/0x3b0 [snd] CPU: 2 PID: 69 Comm: kworker/2:1 Not tainted 5.9.0-rc1 #1 Workqueue: events deferred_probe_work_func pc : snd_card_new+0x36c/0x3b0 [snd] lr : snd_card_new+0xf4/0x3b0 [snd] Call trace: snd_card_new+0x36c/0x3b0 [snd] snd_soc_bind_card+0x340/0x9a0 [snd_soc_core] snd_soc_register_card+0xf4/0x110 [snd_soc_core] devm_snd_soc_register_card+0x44/0xa0 [snd_soc_core] apq8016_sbc_platform_probe+0x11c/0x140 [snd_soc_apq8016_sbc] This warning was introduced in commit81033c6b58
("ALSA: core: Warn on empty module"). It looks like we are supposed to set card->owner to THIS_MODULE. Fix this for all the qcom ASoC drivers. Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> Fixes:79119c7986
("ASoC: qcom: Add Storm machine driver") Fixes:bdb052e81f
("ASoC: qcom: add apq8016 sound card support") Fixes:a6f933f63f
("ASoC: qcom: apq8096: Add db820c machine driver") Fixes:6b1687bf76
("ASoC: qcom: add sdm845 sound card support") Signed-off-by: Stephan Gerhold <stephan@gerhold.net> Link: https://lore.kernel.org/r/20200820154511.203072-1-stephan@gerhold.net Signed-off-by: Mark Brown <broonie@kernel.org>
145 lines
3.8 KiB
C
145 lines
3.8 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
// Copyright (c) 2018, Linaro Limited
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/of_device.h>
|
|
#include <sound/soc.h>
|
|
#include <sound/soc-dapm.h>
|
|
#include <sound/pcm.h>
|
|
#include "common.h"
|
|
|
|
#define SLIM_MAX_TX_PORTS 16
|
|
#define SLIM_MAX_RX_PORTS 16
|
|
#define WCD9335_DEFAULT_MCLK_RATE 9600000
|
|
|
|
static int apq8096_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
|
|
struct snd_pcm_hw_params *params)
|
|
{
|
|
struct snd_interval *rate = hw_param_interval(params,
|
|
SNDRV_PCM_HW_PARAM_RATE);
|
|
struct snd_interval *channels = hw_param_interval(params,
|
|
SNDRV_PCM_HW_PARAM_CHANNELS);
|
|
|
|
rate->min = rate->max = 48000;
|
|
channels->min = channels->max = 2;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int msm_snd_hw_params(struct snd_pcm_substream *substream,
|
|
struct snd_pcm_hw_params *params)
|
|
{
|
|
struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
|
|
struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0);
|
|
struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);
|
|
u32 rx_ch[SLIM_MAX_RX_PORTS], tx_ch[SLIM_MAX_TX_PORTS];
|
|
u32 rx_ch_cnt = 0, tx_ch_cnt = 0;
|
|
int ret = 0;
|
|
|
|
ret = snd_soc_dai_get_channel_map(codec_dai,
|
|
&tx_ch_cnt, tx_ch, &rx_ch_cnt, rx_ch);
|
|
if (ret != 0 && ret != -ENOTSUPP) {
|
|
pr_err("failed to get codec chan map, err:%d\n", ret);
|
|
goto end;
|
|
} else if (ret == -ENOTSUPP) {
|
|
return 0;
|
|
}
|
|
|
|
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
|
|
ret = snd_soc_dai_set_channel_map(cpu_dai, 0, NULL,
|
|
rx_ch_cnt, rx_ch);
|
|
else
|
|
ret = snd_soc_dai_set_channel_map(cpu_dai, tx_ch_cnt, tx_ch,
|
|
0, NULL);
|
|
if (ret != 0 && ret != -ENOTSUPP)
|
|
pr_err("Failed to set cpu chan map, err:%d\n", ret);
|
|
else if (ret == -ENOTSUPP)
|
|
ret = 0;
|
|
end:
|
|
return ret;
|
|
}
|
|
|
|
static struct snd_soc_ops apq8096_ops = {
|
|
.hw_params = msm_snd_hw_params,
|
|
};
|
|
|
|
static int apq8096_init(struct snd_soc_pcm_runtime *rtd)
|
|
{
|
|
struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0);
|
|
|
|
/*
|
|
* Codec SLIMBUS configuration
|
|
* RX1, RX2, RX3, RX4, RX5, RX6, RX7, RX8, RX9, RX10, RX11, RX12, RX13
|
|
* TX1, TX2, TX3, TX4, TX5, TX6, TX7, TX8, TX9, TX10, TX11, TX12, TX13
|
|
* TX14, TX15, TX16
|
|
*/
|
|
unsigned int rx_ch[SLIM_MAX_RX_PORTS] = {144, 145, 146, 147, 148, 149,
|
|
150, 151, 152, 153, 154, 155, 156};
|
|
unsigned int tx_ch[SLIM_MAX_TX_PORTS] = {128, 129, 130, 131, 132, 133,
|
|
134, 135, 136, 137, 138, 139,
|
|
140, 141, 142, 143};
|
|
|
|
snd_soc_dai_set_channel_map(codec_dai, ARRAY_SIZE(tx_ch),
|
|
tx_ch, ARRAY_SIZE(rx_ch), rx_ch);
|
|
|
|
snd_soc_dai_set_sysclk(codec_dai, 0, WCD9335_DEFAULT_MCLK_RATE,
|
|
SNDRV_PCM_STREAM_PLAYBACK);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void apq8096_add_be_ops(struct snd_soc_card *card)
|
|
{
|
|
struct snd_soc_dai_link *link;
|
|
int i;
|
|
|
|
for_each_card_prelinks(card, i, link) {
|
|
if (link->no_pcm == 1) {
|
|
link->be_hw_params_fixup = apq8096_be_hw_params_fixup;
|
|
link->init = apq8096_init;
|
|
link->ops = &apq8096_ops;
|
|
}
|
|
}
|
|
}
|
|
|
|
static int apq8096_platform_probe(struct platform_device *pdev)
|
|
{
|
|
struct snd_soc_card *card;
|
|
struct device *dev = &pdev->dev;
|
|
int ret;
|
|
|
|
card = devm_kzalloc(dev, sizeof(*card), GFP_KERNEL);
|
|
if (!card)
|
|
return -ENOMEM;
|
|
|
|
card->dev = dev;
|
|
card->owner = THIS_MODULE;
|
|
dev_set_drvdata(dev, card);
|
|
ret = qcom_snd_parse_of(card);
|
|
if (ret)
|
|
return ret;
|
|
|
|
apq8096_add_be_ops(card);
|
|
return devm_snd_soc_register_card(dev, card);
|
|
}
|
|
|
|
static const struct of_device_id msm_snd_apq8096_dt_match[] = {
|
|
{.compatible = "qcom,apq8096-sndcard"},
|
|
{}
|
|
};
|
|
|
|
MODULE_DEVICE_TABLE(of, msm_snd_apq8096_dt_match);
|
|
|
|
static struct platform_driver msm_snd_apq8096_driver = {
|
|
.probe = apq8096_platform_probe,
|
|
.driver = {
|
|
.name = "msm-snd-apq8096",
|
|
.of_match_table = msm_snd_apq8096_dt_match,
|
|
},
|
|
};
|
|
module_platform_driver(msm_snd_apq8096_driver);
|
|
MODULE_AUTHOR("Srinivas Kandagatla <srinivas.kandagatla@linaro.org");
|
|
MODULE_DESCRIPTION("APQ8096 ASoC Machine Driver");
|
|
MODULE_LICENSE("GPL v2");
|