[alsa-devel] [PATCH v5 0/9] ASoC: rockchip: Parse dai links from dts
Currently we are using a fixed list of dai links in the driver. This serial of patches would let the driver parse dai links from dts, so that we can make some of them optional for future boards.
Tested on my chromebook bob(with cros 4.4 kernel), it still works after disabled rt5514 codecs in the dts.
Changes in v5: Allow searching for dai driver name in snd_soc_find_dai, instead of hacking non-zero device id to avoid legay dai naming.
Changes in v4: Use non-zero drv id to avoid legacy dai naming instead of switching to snd_soc_register_codec.
Changes in v3: Use compatible to match audio codecs -- Suggested-by Matthias Kaehlcke mka@chromium.org
Changes in v2: Let rockchip,codec-names be a required property, because we plan to add more supported codecs to the fixed dai link list in the driver.
Jeffy Chen (9): ASoC: rockchip: Remove obsolete dmic-delay ASoC: soc-core: Allow searching dai driver name in snd_soc_find_dai ASoC: rockchip: Use codec of_node and dai_name for rt5514 dsp arm64: dts: rockchip: Add rt5514 dsp for Gru arm64: dts: rockchip: Update rt5514 devices' compatible for Gru ASoC: rockchip: Parse dai links from dts ASoC: rockchip: Add support for DP codec ASoC: rockchip: Add support for DMIC codec dt-bindings: ASoC: rockchip: Update description of rockchip,codec
.../bindings/sound/rockchip,rk3399-gru-sound.txt | 9 +- arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 7 +- sound/soc/rockchip/Kconfig | 2 + sound/soc/rockchip/rk3399_gru_sound.c | 263 ++++++++++++++------- sound/soc/soc-core.c | 5 +- 5 files changed, 185 insertions(+), 101 deletions(-)
This property is no longer used.
Signed-off-by: Jeffy Chen jeffy.chen@rock-chips.com Acked-by: Rob Herring robh@kernel.org
---
Changes in v5: None Changes in v4: Use non-zero drv id to avoid legacy dai naming instead of switching to snd_soc_register_codec.
Changes in v3: None Changes in v2: None
.../bindings/sound/rockchip,rk3399-gru-sound.txt | 7 ------- sound/soc/rockchip/rk3399_gru_sound.c | 14 -------------- 2 files changed, 21 deletions(-)
diff --git a/Documentation/devicetree/bindings/sound/rockchip,rk3399-gru-sound.txt b/Documentation/devicetree/bindings/sound/rockchip,rk3399-gru-sound.txt index eac91db07178..f19b6c830a34 100644 --- a/Documentation/devicetree/bindings/sound/rockchip,rk3399-gru-sound.txt +++ b/Documentation/devicetree/bindings/sound/rockchip,rk3399-gru-sound.txt @@ -6,17 +6,10 @@ Required properties: connected to the codecs - rockchip,codec: The phandle of the MAX98357A/RT5514/DA7219 codecs
-Optional properties: -- dmic-wakeup-delay-ms : specify delay time (ms) for DMIC ready. - If this option is specified, which means it's required dmic need - delay for DMIC to ready so that rt5514 can avoid recording before - DMIC send valid data - Example:
sound { compatible = "rockchip,rk3399-gru-sound"; rockchip,cpu = <&i2s0>; rockchip,codec = <&max98357a &rt5514 &da7219>; - dmic-wakeup-delay-ms = <20>; }; diff --git a/sound/soc/rockchip/rk3399_gru_sound.c b/sound/soc/rockchip/rk3399_gru_sound.c index 3475c61a5fa0..70876d3c34e6 100644 --- a/sound/soc/rockchip/rk3399_gru_sound.c +++ b/sound/soc/rockchip/rk3399_gru_sound.c @@ -38,8 +38,6 @@
#define SOUND_FS 256
-static unsigned int rt5514_dmic_delay; - static struct snd_soc_jack rockchip_sound_jack;
static const struct snd_soc_dapm_widget rockchip_dapm_widgets[] = { @@ -125,9 +123,6 @@ static int rockchip_sound_rt5514_hw_params(struct snd_pcm_substream *substream, return ret; }
- /* Wait for DMIC stable */ - msleep(rt5514_dmic_delay); - return 0; }
@@ -348,15 +343,6 @@ static int rockchip_sound_probe(struct platform_device *pdev) return -ENODEV; }
- /* Set DMIC delay */ - ret = device_property_read_u32(&pdev->dev, "dmic-delay", - &rt5514_dmic_delay); - if (ret) { - rt5514_dmic_delay = 0; - dev_dbg(&pdev->dev, - "no optional property 'dmic-delay' found, default: no delay\n"); - } - rockchip_dailinks[DAILINK_RT5514_DSP].cpu_name = kstrdup_const(dev_name(dev), GFP_KERNEL); rockchip_dailinks[DAILINK_RT5514_DSP].cpu_dai_name = kstrdup_const(dev_name(dev), GFP_KERNEL); rockchip_dailinks[DAILINK_RT5514_DSP].platform_name = kstrdup_const(dev_name(dev), GFP_KERNEL);
On Tue, Aug 22, 2017 at 03:57:20PM +0800, Jeffy Chen wrote:
This property is no longer used.
I would still rather keep the existing property documented (the binding does need to be fixed) than remove it. It's better practice and it's not costing a huge amount.
Hi Mark,
On 08/22/2017 06:32 PM, Mark Brown wrote:
On Tue, Aug 22, 2017 at 03:57:20PM +0800, Jeffy Chen wrote:
This property is no longer used.
I would still rather keep the existing property documented (the binding does need to be fixed) than remove it. It's better practice and it's not costing a huge amount.
sorry, i should explain more in the commit msg...
just to clarify, this property is replaced by "realtek,dmic-init-delay-ms" in rt5514 driver:
a5461fd6c8f7 ASoC: rt5514: Add the DMIC initial delay to wait it ready.
which does exactly the same thing as the old one: perform a delay after set clk...
i can do that if you still insist to keep it, since it's harmless :)
Currently we are searching dai name in snd_soc_find_dai, which could either be dai driver name or component device name(for legacy naming).
Allow searching dai driver name in snd_soc_find_dai too, so that we can use dai driver name to find legacy naming dais.
Signed-off-by: Jeffy Chen jeffy.chen@rock-chips.com ---
Changes in v5: Allow searching for dai driver name in snd_soc_find_dai, instead of hacking non-zero device id to avoid legay dai naming.
Changes in v4: None Changes in v3: None Changes in v2: None
sound/soc/soc-core.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 004daaa82102..77e7e2a11af0 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -950,7 +950,7 @@ static struct snd_soc_component *soc_find_component( /** * snd_soc_find_dai - Find a registered DAI * - * @dlc: name of the DAI and optional component info to match + * @dlc: name of the DAI or the DAI driver and optional component info to match * * This function will search all registered components and their DAIs to * find the DAI of the same name. The component's of_node and name @@ -978,7 +978,8 @@ struct snd_soc_dai *snd_soc_find_dai( if (dlc->name && strcmp(component->name, dlc->name)) continue; list_for_each_entry(dai, &component->dai_list, list) { - if (dlc->dai_name && strcmp(dai->name, dlc->dai_name)) + if (dlc->dai_name && strcmp(dai->name, dlc->dai_name) + && strcmp(dai->driver->name, dlc->dai_name)) continue;
return dai;
The patch
ASoC: soc-core: Allow searching dai driver name in snd_soc_find_dai
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks, Mark
From 4958471b0d2110a34df0b45803e6f24ed89b857b Mon Sep 17 00:00:00 2001
From: Jeffy Chen jeffy.chen@rock-chips.com Date: Tue, 22 Aug 2017 15:57:21 +0800 Subject: [PATCH] ASoC: soc-core: Allow searching dai driver name in snd_soc_find_dai
Currently we are searching dai name in snd_soc_find_dai, which could either be dai driver name or component device name(for legacy naming).
Allow searching dai driver name in snd_soc_find_dai too, so that we can use dai driver name to find legacy naming dais.
Signed-off-by: Jeffy Chen jeffy.chen@rock-chips.com Signed-off-by: Mark Brown broonie@kernel.org --- sound/soc/soc-core.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 50c8dba54649..6fab0ff213ef 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1000,7 +1000,7 @@ static struct snd_soc_component *soc_find_component( /** * snd_soc_find_dai - Find a registered DAI * - * @dlc: name of the DAI and optional component info to match + * @dlc: name of the DAI or the DAI driver and optional component info to match * * This function will search all registered components and their DAIs to * find the DAI of the same name. The component's of_node and name @@ -1028,7 +1028,8 @@ struct snd_soc_dai *snd_soc_find_dai( if (dlc->name && strcmp(component->name, dlc->name)) continue; list_for_each_entry(dai, &component->dai_list, list) { - if (dlc->dai_name && strcmp(dai->name, dlc->dai_name)) + if (dlc->dai_name && strcmp(dai->name, dlc->dai_name) + && strcmp(dai->driver->name, dlc->dai_name)) continue;
return dai;
Hi jeffy,
On Tue, Aug 22, 2017 at 3:57 PM, Jeffy Chen jeffy.chen@rock-chips.com wrote:
@@ -978,7 +978,8 @@ struct snd_soc_dai *snd_soc_find_dai( if (dlc->name && strcmp(component->name, dlc->name)) continue; list_for_each_entry(dai, &component->dai_list, list) {
if (dlc->dai_name && strcmp(dai->name, dlc->dai_name))
if (dlc->dai_name && strcmp(dai->name, dlc->dai_name)&& strcmp(dai->driver->name, dlc->dai_name))
In case that dai->driver->name is NULL, strcmp(dai->driver->name, dlc->dai_name) will cause segmentation fault. so I think that we can change it as the follows:
if (dlc->dai_name && strcmp(dai->name, dlc->dai_name) && dai->driver->name && strcmp(dai->driver->name, dlc->dai_name))
continue; return dai;-- 2.11.0
On Tue, Aug 22, 2017 at 09:24:32PM +0800, Donglin Peng wrote:
In case that dai->driver->name is NULL, strcmp(dai->driver->name, dlc->dai_name) will cause segmentation fault. so I think that we can change it as the follows:
We should be already verifying that drivers have a name, we assume one elsewhere.
On Tue, Aug 22, 2017 at 10:02 PM, Mark Brown broonie@kernel.org wrote:
On Tue, Aug 22, 2017 at 09:24:32PM +0800, Donglin Peng wrote:
In case that dai->driver->name is NULL, strcmp(dai->driver->name, dlc->dai_name) will cause segmentation fault. so I think that we can change it as the follows:
We should be already verifying that drivers have a name, we assume one elsewhere.
But I can't find any codes that set or check dai_driver->name in function snd_soc_register_codec or snd_soc_register_component.
On Tue, Aug 22, 2017 at 10:15:32PM +0800, Donglin Peng wrote:
On Tue, Aug 22, 2017 at 10:02 PM, Mark Brown broonie@kernel.org wrote:
We should be already verifying that drivers have a name, we assume one elsewhere.
But I can't find any codes that set or check dai_driver->name in function snd_soc_register_codec or snd_soc_register_component.
We should fix that then.
On Tue, 22 Aug 2017 16:21:11 +0200, Mark Brown wrote:
On Tue, Aug 22, 2017 at 10:15:32PM +0800, Donglin Peng wrote:
On Tue, Aug 22, 2017 at 10:02 PM, Mark Brown broonie@kernel.org wrote:
We should be already verifying that drivers have a name, we assume one elsewhere.
But I can't find any codes that set or check dai_driver->name in function snd_soc_register_codec or snd_soc_register_component.
We should fix that then.
Hmm, as far as I read the code, the NULL dai driver name is valid for a single component. The dai name is determined by fmt_single_name().
Takashi
On Tue, Aug 22, 2017 at 04:26:59PM +0200, Takashi Iwai wrote:
Mark Brown wrote:
We should fix that then.
Hmm, as far as I read the code, the NULL dai driver name is valid for a single component. The dai name is determined by fmt_single_name().
We'll end up using it in debug stuff at some point, it's better to just require something be there. I don't expect us to require it for matching.
Hi guys,
On 08/22/2017 10:26 PM, Takashi Iwai wrote:
On Tue, 22 Aug 2017 16:21:11 +0200, Mark Brown wrote:
On Tue, Aug 22, 2017 at 10:15:32PM +0800, Donglin Peng wrote:
On Tue, Aug 22, 2017 at 10:02 PM, Mark Brown broonie@kernel.org wrote:
We should be already verifying that drivers have a name, we assume one elsewhere.
But I can't find any codes that set or check dai_driver->name in function snd_soc_register_codec or snd_soc_register_component.
We should fix that then.
Hmm, as far as I read the code, the NULL dai driver name is valid for a single component. The dai name is determined by fmt_single_name().
Takashi
sorry, i though that is checked too... new patch is coming, thanks for noticing :)
Currently we are using codec name for rt5514 dsp dai link, use codec of_node instead.
Signed-off-by: Jeffy Chen jeffy.chen@rock-chips.com ---
Changes in v5: None Changes in v4: None Changes in v3: None Changes in v2: None
sound/soc/rockchip/rk3399_gru_sound.c | 34 ++-------------------------------- 1 file changed, 2 insertions(+), 32 deletions(-)
diff --git a/sound/soc/rockchip/rk3399_gru_sound.c b/sound/soc/rockchip/rk3399_gru_sound.c index 70876d3c34e6..9b7e28703bfb 100644 --- a/sound/soc/rockchip/rk3399_gru_sound.c +++ b/sound/soc/rockchip/rk3399_gru_sound.c @@ -242,8 +242,6 @@ enum { DAILINK_RT5514_DSP, };
-#define DAILINK_ENTITIES (DAILINK_DA7219 + 1) - static struct snd_soc_dai_link rockchip_dailinks[] = { [DAILINK_MAX98357A] = { .name = "MAX98357A", @@ -277,8 +275,7 @@ static struct snd_soc_dai_link rockchip_dailinks[] = { [DAILINK_RT5514_DSP] = { .name = "RT5514 DSP", .stream_name = "Wake on Voice", - .codec_name = "snd-soc-dummy", - .codec_dai_name = "snd-soc-dummy-dai", + .codec_dai_name = "rt5514-dsp-cpu-dai", }, };
@@ -295,17 +292,10 @@ static struct snd_soc_card rockchip_sound_card = { .num_controls = ARRAY_SIZE(rockchip_controls), };
-static int rockchip_sound_match_stub(struct device *dev, void *data) -{ - return 1; -} - static int rockchip_sound_probe(struct platform_device *pdev) { struct snd_soc_card *card = &rockchip_sound_card; struct device_node *cpu_node; - struct device *dev; - struct device_driver *drv; int i, ret;
cpu_node = of_parse_phandle(pdev->dev.of_node, "rockchip,cpu", 0); @@ -314,7 +304,7 @@ static int rockchip_sound_probe(struct platform_device *pdev) return -EINVAL; }
- for (i = 0; i < DAILINK_ENTITIES; i++) { + for (i = 0; i < ARRAY_SIZE(rockchip_dailinks); i++) { rockchip_dailinks[i].platform_of_node = cpu_node; rockchip_dailinks[i].cpu_of_node = cpu_node;
@@ -327,26 +317,6 @@ static int rockchip_sound_probe(struct platform_device *pdev) } }
- /** - * To acquire the spi driver of the rt5514 and set the dai-links names - * for soc_bind_dai_link - */ - drv = driver_find("rt5514", &spi_bus_type); - if (!drv) { - dev_err(&pdev->dev, "Can not find the rt5514 driver at the spi bus\n"); - return -EINVAL; - } - - dev = driver_find_device(drv, NULL, NULL, rockchip_sound_match_stub); - if (!dev) { - dev_err(&pdev->dev, "Can not find the rt5514 device\n"); - return -ENODEV; - } - - rockchip_dailinks[DAILINK_RT5514_DSP].cpu_name = kstrdup_const(dev_name(dev), GFP_KERNEL); - rockchip_dailinks[DAILINK_RT5514_DSP].cpu_dai_name = kstrdup_const(dev_name(dev), GFP_KERNEL); - rockchip_dailinks[DAILINK_RT5514_DSP].platform_name = kstrdup_const(dev_name(dev), GFP_KERNEL); - card->dev = &pdev->dev; platform_set_drvdata(pdev, card);
Refactor rockchip_sound_probe, parse dai links from dts instead of hard coding them.
Signed-off-by: Jeffy Chen jeffy.chen@rock-chips.com Reviewed-by: Matthias Kaehlcke mka@chromium.org Tested-by: Matthias Kaehlcke mka@chromium.org ---
Changes in v5: None Changes in v4: None Changes in v3: Use compatible to match audio codecs -- Suggested-by Matthias Kaehlcke mka@chromium.org
Changes in v2: Let rockchip,codec-names be a required property, because we plan to add more supported codecs to the fixed dai link list in the driver.
sound/soc/rockchip/rk3399_gru_sound.c | 139 ++++++++++++++++++++++------------ 1 file changed, 91 insertions(+), 48 deletions(-)
diff --git a/sound/soc/rockchip/rk3399_gru_sound.c b/sound/soc/rockchip/rk3399_gru_sound.c index 9b7e28703bfb..d532336871d7 100644 --- a/sound/soc/rockchip/rk3399_gru_sound.c +++ b/sound/soc/rockchip/rk3399_gru_sound.c @@ -235,14 +235,42 @@ static const struct snd_soc_ops rockchip_sound_da7219_ops = { .hw_params = rockchip_sound_da7219_hw_params, };
+static struct snd_soc_card rockchip_sound_card = { + .name = "rk3399-gru-sound", + .owner = THIS_MODULE, + .dapm_widgets = rockchip_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(rockchip_dapm_widgets), + .dapm_routes = rockchip_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(rockchip_dapm_routes), + .controls = rockchip_controls, + .num_controls = ARRAY_SIZE(rockchip_controls), +}; + enum { + DAILINK_DA7219, DAILINK_MAX98357A, DAILINK_RT5514, - DAILINK_DA7219, DAILINK_RT5514_DSP, };
-static struct snd_soc_dai_link rockchip_dailinks[] = { +static const char * const dailink_compat[] = { + [DAILINK_DA7219] = "dlg,da7219", + [DAILINK_MAX98357A] = "maxim,max98357a", + [DAILINK_RT5514] = "realtek,rt5514-i2c", + [DAILINK_RT5514_DSP] = "realtek,rt5514-spi", +}; + +static const struct snd_soc_dai_link rockchip_dais[] = { + [DAILINK_DA7219] = { + .name = "DA7219", + .stream_name = "DA7219 PCM", + .codec_dai_name = "da7219-hifi", + .init = rockchip_sound_da7219_init, + .ops = &rockchip_sound_da7219_ops, + /* set da7219 as slave */ + .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | + SND_SOC_DAIFMT_CBS_CFS, + }, [DAILINK_MAX98357A] = { .name = "MAX98357A", .stream_name = "MAX98357A PCM", @@ -261,16 +289,6 @@ static struct snd_soc_dai_link rockchip_dailinks[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS, }, - [DAILINK_DA7219] = { - .name = "DA7219", - .stream_name = "DA7219 PCM", - .codec_dai_name = "da7219-hifi", - .init = rockchip_sound_da7219_init, - .ops = &rockchip_sound_da7219_ops, - /* set da7219 as slave */ - .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | - SND_SOC_DAIFMT_CBS_CFS, - }, /* RT5514 DSP for voice wakeup via spi bus */ [DAILINK_RT5514_DSP] = { .name = "RT5514 DSP", @@ -279,53 +297,78 @@ static struct snd_soc_dai_link rockchip_dailinks[] = { }, };
-static struct snd_soc_card rockchip_sound_card = { - .name = "rk3399-gru-sound", - .owner = THIS_MODULE, - .dai_link = rockchip_dailinks, - .num_links = ARRAY_SIZE(rockchip_dailinks), - .dapm_widgets = rockchip_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(rockchip_dapm_widgets), - .dapm_routes = rockchip_dapm_routes, - .num_dapm_routes = ARRAY_SIZE(rockchip_dapm_routes), - .controls = rockchip_controls, - .num_controls = ARRAY_SIZE(rockchip_controls), -}; - -static int rockchip_sound_probe(struct platform_device *pdev) +static int rockchip_sound_codec_node_match(struct device_node *np_codec) { - struct snd_soc_card *card = &rockchip_sound_card; - struct device_node *cpu_node; - int i, ret; + int i;
- cpu_node = of_parse_phandle(pdev->dev.of_node, "rockchip,cpu", 0); - if (!cpu_node) { - dev_err(&pdev->dev, "Property 'rockchip,cpu' missing or invalid\n"); - return -EINVAL; + for (i = 0; i < ARRAY_SIZE(dailink_compat); i++) { + if (of_device_is_compatible(np_codec, dailink_compat[i])) + return i; } + return -1; +}
- for (i = 0; i < ARRAY_SIZE(rockchip_dailinks); i++) { - rockchip_dailinks[i].platform_of_node = cpu_node; - rockchip_dailinks[i].cpu_of_node = cpu_node; - - rockchip_dailinks[i].codec_of_node = - of_parse_phandle(pdev->dev.of_node, "rockchip,codec", i); - if (!rockchip_dailinks[i].codec_of_node) { - dev_err(&pdev->dev, - "Property[%d] 'rockchip,codec' missing or invalid\n", i); +static int rockchip_sound_of_parse_dais(struct device *dev, + struct snd_soc_card *card) +{ + struct device_node *np_cpu; + struct device_node *np_codec; + struct snd_soc_dai_link *dai; + int i, index; + + card->dai_link = devm_kzalloc(dev, sizeof(rockchip_dais), + GFP_KERNEL); + if (!card->dai_link) + return -ENOMEM; + + np_cpu = of_parse_phandle(dev->of_node, "rockchip,cpu", 0); + + card->num_links = 0; + for (i = 0; i < ARRAY_SIZE(rockchip_dais); i++) { + np_codec = of_parse_phandle(dev->of_node, + "rockchip,codec", i); + if (!np_codec) + break; + + if (!of_device_is_available(np_codec)) + continue; + + index = rockchip_sound_codec_node_match(np_codec); + if (index < 0) + continue; + + if (!np_cpu) { + dev_err(dev, "Missing 'rockchip,cpu' for %s\n", + rockchip_dais[index].name); return -EINVAL; } + + dai = &card->dai_link[card->num_links++]; + *dai = rockchip_dais[index]; + + dai->codec_of_node = np_codec; + dai->platform_of_node = np_cpu; + dai->cpu_of_node = np_cpu; + } + + return 0; +} + +static int rockchip_sound_probe(struct platform_device *pdev) +{ + struct snd_soc_card *card = &rockchip_sound_card; + int ret; + + ret = rockchip_sound_of_parse_dais(&pdev->dev, card); + if (ret < 0) { + dev_err(&pdev->dev, "Failed to parse dais: %d\n", ret); + return ret; }
card->dev = &pdev->dev; platform_set_drvdata(pdev, card);
- ret = devm_snd_soc_register_card(&pdev->dev, card); - if (ret) - dev_err(&pdev->dev, "%s snd_soc_register_card fail %d\n", - __func__, ret); - - return ret; + return devm_snd_soc_register_card(&pdev->dev, card); }
static const struct of_device_id rockchip_sound_of_match[] = {
On Tue, Aug 22, 2017 at 3:57 PM, Jeffy Chen jeffy.chen@rock-chips.com wrote:
Refactor rockchip_sound_probe, parse dai links from dts instead of hard coding them.
Signed-off-by: Jeffy Chen jeffy.chen@rock-chips.com Reviewed-by: Matthias Kaehlcke mka@chromium.org Tested-by: Matthias Kaehlcke mka@chromium.org
Changes in v5: None Changes in v4: None Changes in v3: Use compatible to match audio codecs -- Suggested-by Matthias Kaehlcke mka@chromium.org
Changes in v2: Let rockchip,codec-names be a required property, because we plan to add more supported codecs to the fixed dai link list in the driver.
sound/soc/rockchip/rk3399_gru_sound.c | 139 ++++++++++++++++++++++------------ 1 file changed, 91 insertions(+), 48 deletions(-)
diff --git a/sound/soc/rockchip/rk3399_gru_sound.c b/sound/soc/rockchip/rk3399_gru_sound.c index 9b7e28703bfb..d532336871d7 100644 --- a/sound/soc/rockchip/rk3399_gru_sound.c +++ b/sound/soc/rockchip/rk3399_gru_sound.c @@ -235,14 +235,42 @@ static const struct snd_soc_ops rockchip_sound_da7219_ops = { .hw_params = rockchip_sound_da7219_hw_params, };
+static struct snd_soc_card rockchip_sound_card = {
.name = "rk3399-gru-sound",.owner = THIS_MODULE,.dapm_widgets = rockchip_dapm_widgets,.num_dapm_widgets = ARRAY_SIZE(rockchip_dapm_widgets),.dapm_routes = rockchip_dapm_routes,.num_dapm_routes = ARRAY_SIZE(rockchip_dapm_routes),.controls = rockchip_controls,.num_controls = ARRAY_SIZE(rockchip_controls),+};
enum {
DAILINK_DA7219, DAILINK_MAX98357A, DAILINK_RT5514,
DAILINK_DA7219, DAILINK_RT5514_DSP,};
-static struct snd_soc_dai_link rockchip_dailinks[] = { +static const char * const dailink_compat[] = {
[DAILINK_DA7219] = "dlg,da7219",[DAILINK_MAX98357A] = "maxim,max98357a",[DAILINK_RT5514] = "realtek,rt5514-i2c",[DAILINK_RT5514_DSP] = "realtek,rt5514-spi",+};
+static const struct snd_soc_dai_link rockchip_dais[] = {
[DAILINK_DA7219] = {.name = "DA7219",.stream_name = "DA7219 PCM",.codec_dai_name = "da7219-hifi",.init = rockchip_sound_da7219_init,.ops = &rockchip_sound_da7219_ops,/* set da7219 as slave */.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |SND_SOC_DAIFMT_CBS_CFS,}, [DAILINK_MAX98357A] = { .name = "MAX98357A", .stream_name = "MAX98357A PCM",@@ -261,16 +289,6 @@ static struct snd_soc_dai_link rockchip_dailinks[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS, },
[DAILINK_DA7219] = {.name = "DA7219",.stream_name = "DA7219 PCM",.codec_dai_name = "da7219-hifi",.init = rockchip_sound_da7219_init,.ops = &rockchip_sound_da7219_ops,/* set da7219 as slave */.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |SND_SOC_DAIFMT_CBS_CFS,}, /* RT5514 DSP for voice wakeup via spi bus */ [DAILINK_RT5514_DSP] = { .name = "RT5514 DSP",@@ -279,53 +297,78 @@ static struct snd_soc_dai_link rockchip_dailinks[] = { }, };
-static struct snd_soc_card rockchip_sound_card = {
.name = "rk3399-gru-sound",.owner = THIS_MODULE,.dai_link = rockchip_dailinks,.num_links = ARRAY_SIZE(rockchip_dailinks),.dapm_widgets = rockchip_dapm_widgets,.num_dapm_widgets = ARRAY_SIZE(rockchip_dapm_widgets),.dapm_routes = rockchip_dapm_routes,.num_dapm_routes = ARRAY_SIZE(rockchip_dapm_routes),.controls = rockchip_controls,.num_controls = ARRAY_SIZE(rockchip_controls),-};
-static int rockchip_sound_probe(struct platform_device *pdev) +static int rockchip_sound_codec_node_match(struct device_node *np_codec) {
struct snd_soc_card *card = &rockchip_sound_card;struct device_node *cpu_node;int i, ret;
int i;
cpu_node = of_parse_phandle(pdev->dev.of_node, "rockchip,cpu", 0);if (!cpu_node) {dev_err(&pdev->dev, "Property 'rockchip,cpu' missing or invalid\n");return -EINVAL;
for (i = 0; i < ARRAY_SIZE(dailink_compat); i++) {if (of_device_is_compatible(np_codec, dailink_compat[i]))return i; }return -1;+}
for (i = 0; i < ARRAY_SIZE(rockchip_dailinks); i++) {rockchip_dailinks[i].platform_of_node = cpu_node;rockchip_dailinks[i].cpu_of_node = cpu_node;rockchip_dailinks[i].codec_of_node =of_parse_phandle(pdev->dev.of_node, "rockchip,codec", i);if (!rockchip_dailinks[i].codec_of_node) {dev_err(&pdev->dev,"Property[%d] 'rockchip,codec' missing or invalid\n", i);+static int rockchip_sound_of_parse_dais(struct device *dev,
struct snd_soc_card *card)+{
struct device_node *np_cpu;struct device_node *np_codec;struct snd_soc_dai_link *dai;int i, index;card->dai_link = devm_kzalloc(dev, sizeof(rockchip_dais),GFP_KERNEL);if (!card->dai_link)return -ENOMEM;np_cpu = of_parse_phandle(dev->of_node, "rockchip,cpu", 0);card->num_links = 0;for (i = 0; i < ARRAY_SIZE(rockchip_dais); i++) {np_codec = of_parse_phandle(dev->of_node,"rockchip,codec", i);if (!np_codec)break;if (!of_device_is_available(np_codec))continue;index = rockchip_sound_codec_node_match(np_codec);if (index < 0)continue;if (!np_cpu) {dev_err(dev, "Missing 'rockchip,cpu' for %s\n",rockchip_dais[index].name); return -EINVAL; }dai = &card->dai_link[card->num_links++];*dai = rockchip_dais[index];dai->codec_of_node = np_codec;dai->platform_of_node = np_cpu;dai->cpu_of_node = np_cpu;}return 0;+}
+static int rockchip_sound_probe(struct platform_device *pdev) +{
struct snd_soc_card *card = &rockchip_sound_card;int ret;ret = rockchip_sound_of_parse_dais(&pdev->dev, card);if (ret < 0) {dev_err(&pdev->dev, "Failed to parse dais: %d\n", ret);return ret; } card->dev = &pdev->dev; platform_set_drvdata(pdev, card);
There is no need to call platform_set_drvdata, because devm_snd_soc_register_card will do it.
ret = devm_snd_soc_register_card(&pdev->dev, card);if (ret)dev_err(&pdev->dev, "%s snd_soc_register_card fail %d\n",__func__, ret);return ret;
return devm_snd_soc_register_card(&pdev->dev, card);}
static const struct of_device_id rockchip_sound_of_match[] = {
2.11.0
Hi Donglin,
On 08/22/2017 05:08 PM, Donglin Peng wrote:
card->dev = &pdev->dev; platform_set_drvdata(pdev, card);There is no need to call platform_set_drvdata, because devm_snd_soc_register_card will do it.
right, will remove it in next version, thanks:)
Add support for optional cdn dp codec.
Signed-off-by: Jeffy Chen jeffy.chen@rock-chips.com ---
Changes in v5: None Changes in v4: None Changes in v3: None Changes in v2: None
sound/soc/rockchip/Kconfig | 1 + sound/soc/rockchip/rk3399_gru_sound.c | 59 +++++++++++++++++++++++++++++++++-- 2 files changed, 58 insertions(+), 2 deletions(-)
diff --git a/sound/soc/rockchip/Kconfig b/sound/soc/rockchip/Kconfig index c84487805876..8f0d0d8d34e6 100644 --- a/sound/soc/rockchip/Kconfig +++ b/sound/soc/rockchip/Kconfig @@ -68,6 +68,7 @@ config SND_SOC_RK3399_GRU_SOUND select SND_SOC_RT5514 select SND_SOC_DA7219 select SND_SOC_RT5514_SPI + select SND_SOC_HDMI_CODEC help Say Y or M here if you want to add support multiple codecs for SoC audio on Rockchip RK3399 GRU boards. diff --git a/sound/soc/rockchip/rk3399_gru_sound.c b/sound/soc/rockchip/rk3399_gru_sound.c index d532336871d7..8ffae1934b94 100644 --- a/sound/soc/rockchip/rk3399_gru_sound.c +++ b/sound/soc/rockchip/rk3399_gru_sound.c @@ -223,6 +223,45 @@ static int rockchip_sound_da7219_init(struct snd_soc_pcm_runtime *rtd) return 0; }
+static int rockchip_sound_cdndp_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 *cpu_dai = rtd->cpu_dai; + struct snd_soc_dai *codec_dai = rtd->codec_dai; + int mclk, ret; + + /* in bypass mode, the mclk has to be one of the frequencies below */ + switch (params_rate(params)) { + case 8000: + case 16000: + case 24000: + case 32000: + case 48000: + case 64000: + case 96000: + mclk = 12288000; + break; + case 11025: + case 22050: + case 44100: + case 88200: + mclk = 11289600; + break; + default: + return -EINVAL; + } + + ret = snd_soc_dai_set_sysclk(cpu_dai, 0, mclk, + SND_SOC_CLOCK_OUT); + if (ret < 0) { + dev_err(codec_dai->dev, "Can't set cpu clock out %d\n", ret); + return ret; + } + + return 0; +} + static const struct snd_soc_ops rockchip_sound_max98357a_ops = { .hw_params = rockchip_sound_max98357a_hw_params, }; @@ -235,6 +274,10 @@ static const struct snd_soc_ops rockchip_sound_da7219_ops = { .hw_params = rockchip_sound_da7219_hw_params, };
+static struct snd_soc_ops rockchip_sound_cdndp_ops = { + .hw_params = rockchip_sound_cdndp_hw_params, +}; + static struct snd_soc_card rockchip_sound_card = { .name = "rk3399-gru-sound", .owner = THIS_MODULE, @@ -247,6 +290,7 @@ static struct snd_soc_card rockchip_sound_card = { };
enum { + DAILINK_CDNDP, DAILINK_DA7219, DAILINK_MAX98357A, DAILINK_RT5514, @@ -254,6 +298,7 @@ enum { };
static const char * const dailink_compat[] = { + [DAILINK_CDNDP] = "rockchip,rk3399-cdn-dp", [DAILINK_DA7219] = "dlg,da7219", [DAILINK_MAX98357A] = "maxim,max98357a", [DAILINK_RT5514] = "realtek,rt5514-i2c", @@ -261,6 +306,14 @@ static const char * const dailink_compat[] = { };
static const struct snd_soc_dai_link rockchip_dais[] = { + [DAILINK_CDNDP] = { + .name = "DP", + .stream_name = "DP PCM", + .codec_dai_name = "i2s-hifi", + .ops = &rockchip_sound_cdndp_ops, + .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | + SND_SOC_DAIFMT_CBS_CFS, + }, [DAILINK_DA7219] = { .name = "DA7219", .stream_name = "DA7219 PCM", @@ -311,7 +364,7 @@ static int rockchip_sound_codec_node_match(struct device_node *np_codec) static int rockchip_sound_of_parse_dais(struct device *dev, struct snd_soc_card *card) { - struct device_node *np_cpu; + struct device_node *np_cpu, *np_cpu0, *np_cpu1; struct device_node *np_codec; struct snd_soc_dai_link *dai; int i, index; @@ -321,7 +374,8 @@ static int rockchip_sound_of_parse_dais(struct device *dev, if (!card->dai_link) return -ENOMEM;
- np_cpu = of_parse_phandle(dev->of_node, "rockchip,cpu", 0); + np_cpu0 = of_parse_phandle(dev->of_node, "rockchip,cpu", 0); + np_cpu1 = of_parse_phandle(dev->of_node, "rockchip,cpu", 1);
card->num_links = 0; for (i = 0; i < ARRAY_SIZE(rockchip_dais); i++) { @@ -337,6 +391,7 @@ static int rockchip_sound_of_parse_dais(struct device *dev, if (index < 0) continue;
+ np_cpu = (index == DAILINK_CDNDP) ? np_cpu1 : np_cpu0; if (!np_cpu) { dev_err(dev, "Missing 'rockchip,cpu' for %s\n", rockchip_dais[index].name);
Add support for optional dmic codec.
Signed-off-by: Jeffy Chen jeffy.chen@rock-chips.com ---
Changes in v5: None Changes in v4: None Changes in v3: None Changes in v2: None
sound/soc/rockchip/Kconfig | 1 + sound/soc/rockchip/rk3399_gru_sound.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+)
diff --git a/sound/soc/rockchip/Kconfig b/sound/soc/rockchip/Kconfig index 8f0d0d8d34e6..b0825370d262 100644 --- a/sound/soc/rockchip/Kconfig +++ b/sound/soc/rockchip/Kconfig @@ -69,6 +69,7 @@ config SND_SOC_RK3399_GRU_SOUND select SND_SOC_DA7219 select SND_SOC_RT5514_SPI select SND_SOC_HDMI_CODEC + select SND_SOC_DMIC help Say Y or M here if you want to add support multiple codecs for SoC audio on Rockchip RK3399 GRU boards. diff --git a/sound/soc/rockchip/rk3399_gru_sound.c b/sound/soc/rockchip/rk3399_gru_sound.c index 8ffae1934b94..0be3e5c1386f 100644 --- a/sound/soc/rockchip/rk3399_gru_sound.c +++ b/sound/soc/rockchip/rk3399_gru_sound.c @@ -262,6 +262,25 @@ static int rockchip_sound_cdndp_hw_params(struct snd_pcm_substream *substream, return 0; }
+static int rockchip_sound_dmic_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params) +{ + struct snd_soc_pcm_runtime *rtd = substream->private_data; + unsigned int mclk; + int ret; + + mclk = params_rate(params) * SOUND_FS; + + ret = snd_soc_dai_set_sysclk(rtd->cpu_dai, 0, mclk, 0); + if (ret) { + dev_err(rtd->card->dev, "%s() error setting sysclk to %u: %d\n", + __func__, mclk, ret); + return ret; + } + + return 0; +} + static const struct snd_soc_ops rockchip_sound_max98357a_ops = { .hw_params = rockchip_sound_max98357a_hw_params, }; @@ -278,6 +297,10 @@ static struct snd_soc_ops rockchip_sound_cdndp_ops = { .hw_params = rockchip_sound_cdndp_hw_params, };
+static struct snd_soc_ops rockchip_sound_dmic_ops = { + .hw_params = rockchip_sound_dmic_hw_params, +}; + static struct snd_soc_card rockchip_sound_card = { .name = "rk3399-gru-sound", .owner = THIS_MODULE, @@ -292,6 +315,7 @@ static struct snd_soc_card rockchip_sound_card = { enum { DAILINK_CDNDP, DAILINK_DA7219, + DAILINK_DMIC, DAILINK_MAX98357A, DAILINK_RT5514, DAILINK_RT5514_DSP, @@ -300,6 +324,7 @@ enum { static const char * const dailink_compat[] = { [DAILINK_CDNDP] = "rockchip,rk3399-cdn-dp", [DAILINK_DA7219] = "dlg,da7219", + [DAILINK_DMIC] = "dmic-codec", [DAILINK_MAX98357A] = "maxim,max98357a", [DAILINK_RT5514] = "realtek,rt5514-i2c", [DAILINK_RT5514_DSP] = "realtek,rt5514-spi", @@ -324,6 +349,14 @@ static const struct snd_soc_dai_link rockchip_dais[] = { .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS, }, + [DAILINK_DMIC] = { + .name = "DMIC", + .stream_name = "DMIC PCM", + .codec_dai_name = "dmic-hifi", + .ops = &rockchip_sound_dmic_ops, + .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | + SND_SOC_DAIFMT_CBS_CFS, + }, [DAILINK_MAX98357A] = { .name = "MAX98357A", .stream_name = "MAX98357A PCM",
Update description for newly added optional audio codecs.
Signed-off-by: Jeffy Chen jeffy.chen@rock-chips.com Acked-by: Rob Herring robh@kernel.org ---
Changes in v5: None Changes in v4: None Changes in v3: None Changes in v2: None
Documentation/devicetree/bindings/sound/rockchip,rk3399-gru-sound.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/sound/rockchip,rk3399-gru-sound.txt b/Documentation/devicetree/bindings/sound/rockchip,rk3399-gru-sound.txt index f19b6c830a34..f54b4e91e97c 100644 --- a/Documentation/devicetree/bindings/sound/rockchip,rk3399-gru-sound.txt +++ b/Documentation/devicetree/bindings/sound/rockchip,rk3399-gru-sound.txt @@ -4,7 +4,7 @@ Required properties: - compatible: "rockchip,rk3399-gru-sound" - rockchip,cpu: The phandle of the Rockchip I2S controller that's connected to the codecs -- rockchip,codec: The phandle of the MAX98357A/RT5514/DA7219 codecs +- rockchip,codec: The phandle of the audio codecs
Example:
participants (5)
-
Donglin Peng -
jeffy -
Jeffy Chen
-
Mark Brown -
Takashi Iwai