Re: [PATCH v2 1/3] ASoC: rockchip: Parse dai links from dts
Hi Matthias,
On 08/17/2017 07:50 AM, Matthias Kaehlcke wrote:
El Thu, Aug 17, 2017 at 06:55:20AM +0800 jeffy ha dit:
hi matthias,
thanks for your suggestion.
On 08/17/2017 05:59 AM, Matthias Kaehlcke wrote:
El Thu, Aug 10, 2017 at 12:54:56PM +0800 Jeffy Chen ha dit:
Refactor rockchip_sound_probe, parse dai links from dts instead of
hard coding them.
Mark doesn't seem to be overly convinced that 'rockchip,codec-names'
is a good idea (https://lkml.org/lkml/2017/8/10/511).
How about using something like this instead:
static const char *dailink_compat[] = {
[DAILINK_MAX98357A] = "maxim,max98357a",
[DAILINK_RT5514] = "realtek,rt5514",
[DAILINK_DA7219] = "dlg,da7219",
};
i've thought about this too, but i'm working on converting rt5514
dsp(spi) from codec name matching to of_node, and it would have the
same compatible with rt5514(i2c)
Bummer!
I wonder if a relatively inoffensive DT hack would be an appropriate
solution in this case, since the conflicting compatible string is a
somewhat special case and this change only affects the DT and the
driver/glue of a specific device (family).
The hack would consist in adding an additional 'compatible' entry to
the DT entry of the codec, which is ignored by the rt5514 driver, and
only used by the sound glue to identify it:
--- a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi
@@ -671,7 +671,7 @@ ap_i2c_mic: &i2c1 {
i2c-scl-rising-time-ns = <300>;
headsetcodec: rt5514@57 {
- compatible = "realtek,rt5514";
+ compatible = "realtek,rt5514", "realtek,rt5514-i2c";
And then use "realtek,rt5514-i2c" in dailink_compat.
this should work, i'll do that in new version, thanks.
Mark, would you prefer a hack like this over the list of codec names
or do you have any other suggestions?
Matthias
Re: [PATCH v2 1/3] ASoC: rockchip: Parse dai links from dts
El Thu, Aug 17, 2017 at 06:55:20AM +0800 jeffy ha dit:
> hi matthias,
>
> thanks for your suggestion.
>
> On 08/17/2017 05:59 AM, Matthias Kaehlcke wrote:
> >El Thu, Aug 10, 2017 at 12:54:56PM +0800 Jeffy Chen ha dit:
> >
> >>>Refactor rockchip_sound_probe, parse dai links from dts instead of
> >>>hard coding them.
> >Mark doesn't seem to be overly convinced that 'rockchip,codec-names'
> >is a good idea (https://lkml.org/lkml/2017/8/10/511).
> >
> >How about using something like this instead:
> >
> >static const char *dailink_compat[] = {
> > [DAILINK_MAX98357A] = "maxim,max98357a",
> > [DAILINK_RT5514] = "realtek,rt5514",
> > [DAILINK_DA7219] = "dlg,da7219",
> >};
> i've thought about this too, but i'm working on converting rt5514
> dsp(spi) from codec name matching to of_node, and it would have the
> same compatible with rt5514(i2c)
Bummer!
I wonder if a relatively inoffensive DT hack would be an appropriate
solution in this case, since the conflicting compatible string is a
somewhat special case and this change only affects the DT and the
driver/glue of a specific device (family).
The hack would consist in adding an additional 'compatible' entry to
the DT entry of the codec, which is ignored by the rt5514 driver, and
only used by the sound glue to identify it:
--- a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi
@@ -671,7 +671,7 @@ ap_i2c_mic: &i2c1 {
i2c-scl-rising-time-ns = <300>;
headsetcodec: rt5514@57 {
- compatible = "realtek,rt5514";
+ compatible = "realtek,rt5514", "realtek,rt5514-i2c";
And then use "realtek,rt5514-i2c" in dailink_compat.
Mark, would you prefer a hack like this over the list of codec names
or do you have any other suggestions?
Matthias
Re: [PATCH v2 1/3] ASoC: rockchip: Parse dai links from dts
hi matthias,
thanks for your suggestion.
On 08/17/2017 05:59 AM, Matthias Kaehlcke wrote:
El Thu, Aug 10, 2017 at 12:54:56PM +0800 Jeffy Chen ha dit:
>Refactor rockchip_sound_probe, parse dai links from dts instead of
>hard coding them.
Mark doesn't seem to be overly convinced that 'rockchip,codec-names'
is a good idea (https://lkml.org/lkml/2017/8/10/511).
How about using something like this instead:
static const char *dailink_compat[] = {
[DAILINK_MAX98357A] = "maxim,max98357a",
[DAILINK_RT5514] = "realtek,rt5514",
[DAILINK_DA7219] = "dlg,da7219",
};
i've thought about this too, but i'm working on converting rt5514
dsp(spi) from codec name matching to of_node, and it would have the same
compatible with rt5514(i2c)
Re: [PATCH v2 1/3] ASoC: rockchip: Parse dai links from dts
El Thu, Aug 10, 2017 at 12:54:56PM +0800 Jeffy Chen ha dit:
> Refactor rockchip_sound_probe, parse dai links from dts instead of
> hard coding them.
Mark doesn't seem to be overly convinced that 'rockchip,codec-names'
is a good idea (https://lkml.org/lkml/2017/8/10/511).
How about using something like this instead:
static const char *dailink_compat[] = {
[DAILINK_MAX98357A] = "maxim,max98357a",
[DAILINK_RT5514] = "realtek,rt5514",
[DAILINK_DA7219] = "dlg,da7219",
};
...
static int rockchip_sound_probe(struct platform_device *pdev)
{
...
for (i = 0; ; i++) {
struct device_node *codec_node;
int j;
codec_node = of_parse_phandle(pdev->dev.of_node,
"rockchip,codec", i);
if (!codec_node)
break;
for (j = 0; j < DAILINK_ENTITIES; j++) {
if (of_device_is_compatible(codec_node,
dailink_compat[j]))
break;
}
if (j == DAILINK_ENTITIES) {
dev_err(...);
return -EINVAL;
}
rockchip_dailinks[j].codec_of_node = codec_node;
rockchip_dailinks[j].platform_of_node = cpu_node;
rockchip_dailinks[j].cpu_of_node = cpu_node;
/* not strictly needed, could also check for
rockchip_dailinks[DAILINK_RT5514].cpu_of_node or so
*/
if (j == DAILINK_RT5514)
has_rt5514 = true;
}
...
}
Matthias
> Signed-off-by: Jeffy Chen
> ---
>
> 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 | 125
> ++
> 1 file changed, 81 insertions(+), 44 deletions(-)
>
> diff --git a/sound/soc/rockchip/rk3399_gru_sound.c
> b/sound/soc/rockchip/rk3399_gru_sound.c
> index 3475c61..03b7fae 100644
> --- a/sound/soc/rockchip/rk3399_gru_sound.c
> +++ b/sound/soc/rockchip/rk3399_gru_sound.c
> @@ -247,9 +247,7 @@ enum {
> DAILINK_RT5514_DSP,
> };
>
> -#define DAILINK_ENTITIES (DAILINK_DA7219 + 1)
> -
> -static struct snd_soc_dai_link rockchip_dailinks[] = {
> +static const struct snd_soc_dai_link rockchip_dais[] = {
> [DAILINK_MAX98357A] = {
> .name = "MAX98357A",
> .stream_name = "MAX98357A PCM",
> @@ -290,8 +288,6 @@ 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,
> @@ -305,71 +301,112 @@ static int rockchip_sound_match_stub(struct device
> *dev, void *data)
> return 1;
> }
>
> -static int rockchip_sound_probe(struct platform_device *pdev)
> +static int rockchip_sound_of_parse_dais(struct device *dev,
> + struct snd_soc_card *card)
> {
> - struct snd_soc_card *card = &rockchip_sound_card;
> + struct device *rt5514_dev;
> + struct device_driver *rt5514_drv;
> 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);
> - if (!cpu_node) {
> - dev_err(&pdev->dev, "Property 'rockchip,cpu' missing or
> invalid\n");
> - return -EINVAL;
> - }
> -
> - for (i = 0; i < DAILINK_ENTITIES; i++) {
> - rockchip_dailinks[i].platform_of_node = cpu_node;
> - rockchip_dailinks[i].cpu_of_node = cpu_node;
> + struct device_node *np_codec;
> + struct snd_soc_dai_link *dai;
> + bool has_rt5514 = false;
> + int i, index, ret;
> +
> + card->dai_link = devm_kzalloc(dev, sizeof(rockchip_dais),
> + GFP_KERNEL);
> + if (!card->dai_link)
> + return -ENOMEM;
> +
> + cpu_node = of_parse_phandle(dev->of_node, "rockchip,cpu", 0);
> +
> + card->num_links = 0;
> + for (i = 0; i < DAILINK_RT5514_DSP; i++) {
> + index = of_property_match_string(dev->of_node,
> + "rockchip,codec-names",
> + rockchip_dais[i].name);
> + if (index < 0)
> + continue;
> +
> + np_codec = of_parse_phandle(dev->of_node,
> + "rockchip,codec", index);
> + if (!np_codec) {
> + dev_err(dev, "Missing 'rockchip,codec' for %s\n",
> + rockchip_dai
[PATCH v2 1/3] ASoC: rockchip: Parse dai links from dts
Refactor rockchip_sound_probe, parse dai links from dts instead of
hard coding them.
Signed-off-by: Jeffy Chen
---
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 | 125 ++
1 file changed, 81 insertions(+), 44 deletions(-)
diff --git a/sound/soc/rockchip/rk3399_gru_sound.c
b/sound/soc/rockchip/rk3399_gru_sound.c
index 3475c61..03b7fae 100644
--- a/sound/soc/rockchip/rk3399_gru_sound.c
+++ b/sound/soc/rockchip/rk3399_gru_sound.c
@@ -247,9 +247,7 @@ enum {
DAILINK_RT5514_DSP,
};
-#define DAILINK_ENTITIES (DAILINK_DA7219 + 1)
-
-static struct snd_soc_dai_link rockchip_dailinks[] = {
+static const struct snd_soc_dai_link rockchip_dais[] = {
[DAILINK_MAX98357A] = {
.name = "MAX98357A",
.stream_name = "MAX98357A PCM",
@@ -290,8 +288,6 @@ 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,
@@ -305,71 +301,112 @@ static int rockchip_sound_match_stub(struct device *dev,
void *data)
return 1;
}
-static int rockchip_sound_probe(struct platform_device *pdev)
+static int rockchip_sound_of_parse_dais(struct device *dev,
+ struct snd_soc_card *card)
{
- struct snd_soc_card *card = &rockchip_sound_card;
+ struct device *rt5514_dev;
+ struct device_driver *rt5514_drv;
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);
- if (!cpu_node) {
- dev_err(&pdev->dev, "Property 'rockchip,cpu' missing or
invalid\n");
- return -EINVAL;
- }
-
- for (i = 0; i < DAILINK_ENTITIES; i++) {
- rockchip_dailinks[i].platform_of_node = cpu_node;
- rockchip_dailinks[i].cpu_of_node = cpu_node;
+ struct device_node *np_codec;
+ struct snd_soc_dai_link *dai;
+ bool has_rt5514 = false;
+ int i, index, ret;
+
+ card->dai_link = devm_kzalloc(dev, sizeof(rockchip_dais),
+ GFP_KERNEL);
+ if (!card->dai_link)
+ return -ENOMEM;
+
+ cpu_node = of_parse_phandle(dev->of_node, "rockchip,cpu", 0);
+
+ card->num_links = 0;
+ for (i = 0; i < DAILINK_RT5514_DSP; i++) {
+ index = of_property_match_string(dev->of_node,
+ "rockchip,codec-names",
+ rockchip_dais[i].name);
+ if (index < 0)
+ continue;
+
+ np_codec = of_parse_phandle(dev->of_node,
+ "rockchip,codec", index);
+ if (!np_codec) {
+ dev_err(dev, "Missing 'rockchip,codec' for %s\n",
+ rockchip_dais[i].name);
+ return -EINVAL;
+ }
+ if (!of_device_is_available(np_codec))
+ continue;
- 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);
+ if (!cpu_node) {
+ dev_err(dev, "Missing 'rockchip,cpu' for %s\n",
+ rockchip_dais[i].name);
return -EINVAL;
}
+
+ dai = &card->dai_link[card->num_links++];
+ *dai = rockchip_dais[i];
+
+ dai->codec_of_node = np_codec;
+ dai->platform_of_node = cpu_node;
+ dai->cpu_of_node = cpu_node;
+
+ if (i == DAILINK_RT5514)
+ has_rt5514 = true;
}
+ if (!has_rt5514)
+ return 0;
+
/**
* 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");
+ rt5514_drv = driver_find("rt5514", &spi_bus_type);
+ if (!rt5514_drv) {
+ dev_err(dev, "Can not find the rt5514 driver at the spi bus\n");
return -EINVAL;
}
- dev = driver_
