RE: [alsa-devel] [PATCHv2 3/4] ASoC: simple-card: Adjust the comments of simple card.
> Subject: Re: [alsa-devel] [PATCHv2 3/4] ASoC: simple-card: Adjust the comments > of simple card. > > > Hi Xiubo > > > > > /* > > > > -* soc_bind_dai_link() will check cpu name > > > > -* after of_node matching if dai_link has cpu_dai_name. > > > > -* but, it will never match if name was created by > fmt_single_name() > > > > -* remove cpu_dai_name to escape name matching. > > > > -* see > > > > +* In soc_bind_dai_link() will check cpu name after > > > > +* of_node matching if dai_link has cpu_dai_name. > > > > +* but, it will never match if name was created by > > > > +* fmt_single_name() remove cpu_dai_name to escape > > > > +* name matching. Please see: > > > > * fmt_single_name() > > > > * fmt_multiple_name() > > > > */ > > > > > > The patch done by Kuninori, setting the cpu_dai_name to NULL in all > > > cases, does not work. This sequence should be replaced where is was > > > previously. > > > > > > > If so, it should be another issue here, should we send another patch for > > It ? > > I posted patch yesterday, and Jean tested it > > Subject: [PATCH][RFC] ASoC: simple-card: fixup cpu_dai_name clear case > Date: Tue, 02 Sep 2014 20:05:32 +0900 > Nice. I think I just missed it. Thanks, BRs Xiubo -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [alsa-devel] [PATCHv2 3/4] ASoC: simple-card: Adjust the comments of simple card.
Hi Xiubo > > > /* > > > - * soc_bind_dai_link() will check cpu name > > > - * after of_node matching if dai_link has cpu_dai_name. > > > - * but, it will never match if name was created by fmt_single_name() > > > - * remove cpu_dai_name to escape name matching. > > > - * see > > > + * In soc_bind_dai_link() will check cpu name after > > > + * of_node matching if dai_link has cpu_dai_name. > > > + * but, it will never match if name was created by > > > + * fmt_single_name() remove cpu_dai_name to escape > > > + * name matching. Please see: > > >* fmt_single_name() > > >* fmt_multiple_name() > > >*/ > > > > The patch done by Kuninori, setting the cpu_dai_name to NULL in all > > cases, does not work. This sequence should be replaced where is was > > previously. > > > > If so, it should be another issue here, should we send another patch for > It ? I posted patch yesterday, and Jean tested it Subject: [PATCH][RFC] ASoC: simple-card: fixup cpu_dai_name clear case Date: Tue, 02 Sep 2014 20:05:32 +0900 Best regards --- Kuninori Morimoto -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
RE: [PATCHv2 3/4] ASoC: simple-card: Adjust the comments of simple card.
> Subject: Re: [PATCHv2 3/4] ASoC: simple-card: Adjust the comments of simple > card. > > On Tue, 2 Sep 2014 17:26:08 +0800 > Xiubo Li wrote: > > > @@ -285,11 +287,11 @@ static int asoc_simple_card_dai_link_of(struct > device_node *node, > > dai_props->codec_dai.sysclk); > > > > /* > > -* soc_bind_dai_link() will check cpu name > > -* after of_node matching if dai_link has cpu_dai_name. > > -* but, it will never match if name was created by fmt_single_name() > > -* remove cpu_dai_name to escape name matching. > > -* see > > +* In soc_bind_dai_link() will check cpu name after > > +* of_node matching if dai_link has cpu_dai_name. > > +* but, it will never match if name was created by > > +* fmt_single_name() remove cpu_dai_name to escape > > +* name matching. Please see: > > * fmt_single_name() > > * fmt_multiple_name() > > */ > > The patch done by Kuninori, setting the cpu_dai_name to NULL in all > cases, does not work. This sequence should be replaced where is was > previously. > If so, it should be another issue here, should we send another patch for It ? Thanks, BRs Xiubo
Re: [PATCHv2 3/4] ASoC: simple-card: Adjust the comments of simple card.
On Tue, 2 Sep 2014 17:26:08 +0800 Xiubo Li wrote: > @@ -285,11 +287,11 @@ static int asoc_simple_card_dai_link_of(struct > device_node *node, > dai_props->codec_dai.sysclk); > > /* > - * soc_bind_dai_link() will check cpu name > - * after of_node matching if dai_link has cpu_dai_name. > - * but, it will never match if name was created by fmt_single_name() > - * remove cpu_dai_name to escape name matching. > - * see > + * In soc_bind_dai_link() will check cpu name after > + * of_node matching if dai_link has cpu_dai_name. > + * but, it will never match if name was created by > + * fmt_single_name() remove cpu_dai_name to escape > + * name matching. Please see: >* fmt_single_name() >* fmt_multiple_name() >*/ The patch done by Kuninori, setting the cpu_dai_name to NULL in all cases, does not work. This sequence should be replaced where is was previously. -- Ken ar c'hentañ | ** Breizh ha Linux atav! ** Jef | http://moinejf.free.fr/ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCHv2 3/4] ASoC: simple-card: Adjust the comments of simple card.
Signed-off-by: Xiubo Li
---
sound/soc/generic/simple-card.c | 48 -
1 file changed, 24 insertions(+), 24 deletions(-)
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index 667fa49..e6976a0 100644
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -120,7 +120,7 @@ asoc_simple_card_sub_parse_of(struct device_node *np,
int ret;
/*
-* get node via "sound-dai = < port>"
+* Get node via "sound-dai = < port>"
* it will be used as xxx_of_node on soc_bind_dai_link()
*/
node = of_parse_phandle(np, "sound-dai", 0);
@@ -128,19 +128,19 @@ asoc_simple_card_sub_parse_of(struct device_node *np,
return -ENODEV;
*p_node = node;
- /* get dai->name */
+ /* Get dai->name */
ret = snd_soc_of_get_dai_name(np, name);
if (ret < 0)
return ret;
- /* parse TDM slot */
+ /* Parse TDM slot */
ret = snd_soc_of_parse_tdm_slot(np, >slots, >slot_width);
if (ret)
return ret;
/*
-* dai->sysclk come from
-* "clocks = <>" (if system has common clock)
+* Parse dai->sysclk come from "clocks = <>"
+* (if system has common clock)
* or "system-clock-frequency = "
* or device's module clock.
*/
@@ -241,9 +241,11 @@ static int asoc_simple_card_dai_link_of(struct device_node
*node,
goto dai_link_of_err;
if (strlen(prefix) && !bitclkmaster && !framemaster) {
- /* No dai-link level and master setting was not found from
- sound node level, revert back to legacy DT parsing and
- take the settings from codec node. */
+ /*
+* No DAI link level and master setting was found
+* from sound node level, revert back to legacy DT
+* parsing and take the settings from codec node.
+*/
dev_dbg(dev, "%s: Revert to legacy daifmt parsing\n",
__func__);
dai_props->cpu_dai.fmt = dai_props->codec_dai.fmt =
@@ -260,10 +262,10 @@ static int asoc_simple_card_dai_link_of(struct
device_node *node,
goto dai_link_of_err;
}
- /* simple-card assumes platform == cpu */
+ /* Simple Card assumes platform == cpu */
dai_link->platform_of_node = dai_link->cpu_of_node;
- /* Link name is created from CPU/CODEC dai name */
+ /* DAI link name is created from CPU/CODEC dai name */
name = devm_kzalloc(dev,
strlen(dai_link->cpu_dai_name) +
strlen(dai_link->codec_dai_name) + 2,
@@ -285,11 +287,11 @@ static int asoc_simple_card_dai_link_of(struct
device_node *node,
dai_props->codec_dai.sysclk);
/*
-* soc_bind_dai_link() will check cpu name
-* after of_node matching if dai_link has cpu_dai_name.
-* but, it will never match if name was created by fmt_single_name()
-* remove cpu_dai_name to escape name matching.
-* see
+* In soc_bind_dai_link() will check cpu name after
+* of_node matching if dai_link has cpu_dai_name.
+* but, it will never match if name was created by
+* fmt_single_name() remove cpu_dai_name to escape
+* name matching. Please see:
* fmt_single_name()
* fmt_multiple_name()
*/
@@ -317,10 +319,10 @@ static int asoc_simple_card_parse_of(struct device_node
*node,
if (!node)
return -EINVAL;
- /* parsing the card name from DT */
+ /* Parse the card name from DT */
snd_soc_of_parse_card_name(>snd_card, "simple-audio-card,name");
- /* off-codec widgets */
+ /* The off-codec widgets */
if (of_property_read_bool(node, "simple-audio-card,widgets")) {
ret = snd_soc_of_parse_audio_simple_widgets(>snd_card,
"simple-audio-card,widgets");
@@ -375,7 +377,7 @@ static int asoc_simple_card_parse_of(struct device_node
*node,
return 0;
}
-/* update the reference count of the devices nodes at end of probe */
+/* Decrease the reference count of the device nodes */
static int asoc_simple_card_unref(struct platform_device *pdev)
{
struct snd_soc_card *card = platform_get_drvdata(pdev);
@@ -404,29 +406,27 @@ static int asoc_simple_card_probe(struct platform_device
*pdev)
struct device *dev = >dev;
int num_links, ret;
- /* get the number of DAI links */
+ /* Get the number of DAI links */
if (np && of_get_child_by_name(np, "simple-audio-card,dai-link"))
num_links = of_get_child_count(np);
else
num_links = 1;
- /* allocate the private data and the DAI link array */
+
[PATCHv2 3/4] ASoC: simple-card: Adjust the comments of simple card.
Signed-off-by: Xiubo Li li.xi...@freescale.com
---
sound/soc/generic/simple-card.c | 48 -
1 file changed, 24 insertions(+), 24 deletions(-)
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index 667fa49..e6976a0 100644
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -120,7 +120,7 @@ asoc_simple_card_sub_parse_of(struct device_node *np,
int ret;
/*
-* get node via sound-dai = phandle port
+* Get node via sound-dai = phandle port
* it will be used as xxx_of_node on soc_bind_dai_link()
*/
node = of_parse_phandle(np, sound-dai, 0);
@@ -128,19 +128,19 @@ asoc_simple_card_sub_parse_of(struct device_node *np,
return -ENODEV;
*p_node = node;
- /* get dai-name */
+ /* Get dai-name */
ret = snd_soc_of_get_dai_name(np, name);
if (ret 0)
return ret;
- /* parse TDM slot */
+ /* Parse TDM slot */
ret = snd_soc_of_parse_tdm_slot(np, dai-slots, dai-slot_width);
if (ret)
return ret;
/*
-* dai-sysclk come from
-* clocks = xxx (if system has common clock)
+* Parse dai-sysclk come from clocks = xxx
+* (if system has common clock)
* or system-clock-frequency = xxx
* or device's module clock.
*/
@@ -241,9 +241,11 @@ static int asoc_simple_card_dai_link_of(struct device_node
*node,
goto dai_link_of_err;
if (strlen(prefix) !bitclkmaster !framemaster) {
- /* No dai-link level and master setting was not found from
- sound node level, revert back to legacy DT parsing and
- take the settings from codec node. */
+ /*
+* No DAI link level and master setting was found
+* from sound node level, revert back to legacy DT
+* parsing and take the settings from codec node.
+*/
dev_dbg(dev, %s: Revert to legacy daifmt parsing\n,
__func__);
dai_props-cpu_dai.fmt = dai_props-codec_dai.fmt =
@@ -260,10 +262,10 @@ static int asoc_simple_card_dai_link_of(struct
device_node *node,
goto dai_link_of_err;
}
- /* simple-card assumes platform == cpu */
+ /* Simple Card assumes platform == cpu */
dai_link-platform_of_node = dai_link-cpu_of_node;
- /* Link name is created from CPU/CODEC dai name */
+ /* DAI link name is created from CPU/CODEC dai name */
name = devm_kzalloc(dev,
strlen(dai_link-cpu_dai_name) +
strlen(dai_link-codec_dai_name) + 2,
@@ -285,11 +287,11 @@ static int asoc_simple_card_dai_link_of(struct
device_node *node,
dai_props-codec_dai.sysclk);
/*
-* soc_bind_dai_link() will check cpu name
-* after of_node matching if dai_link has cpu_dai_name.
-* but, it will never match if name was created by fmt_single_name()
-* remove cpu_dai_name to escape name matching.
-* see
+* In soc_bind_dai_link() will check cpu name after
+* of_node matching if dai_link has cpu_dai_name.
+* but, it will never match if name was created by
+* fmt_single_name() remove cpu_dai_name to escape
+* name matching. Please see:
* fmt_single_name()
* fmt_multiple_name()
*/
@@ -317,10 +319,10 @@ static int asoc_simple_card_parse_of(struct device_node
*node,
if (!node)
return -EINVAL;
- /* parsing the card name from DT */
+ /* Parse the card name from DT */
snd_soc_of_parse_card_name(priv-snd_card, simple-audio-card,name);
- /* off-codec widgets */
+ /* The off-codec widgets */
if (of_property_read_bool(node, simple-audio-card,widgets)) {
ret = snd_soc_of_parse_audio_simple_widgets(priv-snd_card,
simple-audio-card,widgets);
@@ -375,7 +377,7 @@ static int asoc_simple_card_parse_of(struct device_node
*node,
return 0;
}
-/* update the reference count of the devices nodes at end of probe */
+/* Decrease the reference count of the device nodes */
static int asoc_simple_card_unref(struct platform_device *pdev)
{
struct snd_soc_card *card = platform_get_drvdata(pdev);
@@ -404,29 +406,27 @@ static int asoc_simple_card_probe(struct platform_device
*pdev)
struct device *dev = pdev-dev;
int num_links, ret;
- /* get the number of DAI links */
+ /* Get the number of DAI links */
if (np of_get_child_by_name(np, simple-audio-card,dai-link))
num_links = of_get_child_count(np);
else
num_links = 1;
- /* allocate the private data and the DAI
Re: [PATCHv2 3/4] ASoC: simple-card: Adjust the comments of simple card.
On Tue, 2 Sep 2014 17:26:08 +0800 Xiubo Li li.xi...@freescale.com wrote: @@ -285,11 +287,11 @@ static int asoc_simple_card_dai_link_of(struct device_node *node, dai_props-codec_dai.sysclk); /* - * soc_bind_dai_link() will check cpu name - * after of_node matching if dai_link has cpu_dai_name. - * but, it will never match if name was created by fmt_single_name() - * remove cpu_dai_name to escape name matching. - * see + * In soc_bind_dai_link() will check cpu name after + * of_node matching if dai_link has cpu_dai_name. + * but, it will never match if name was created by + * fmt_single_name() remove cpu_dai_name to escape + * name matching. Please see: * fmt_single_name() * fmt_multiple_name() */ The patch done by Kuninori, setting the cpu_dai_name to NULL in all cases, does not work. This sequence should be replaced where is was previously. -- Ken ar c'hentañ | ** Breizh ha Linux atav! ** Jef | http://moinejf.free.fr/ -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
RE: [PATCHv2 3/4] ASoC: simple-card: Adjust the comments of simple card.
Subject: Re: [PATCHv2 3/4] ASoC: simple-card: Adjust the comments of simple card. On Tue, 2 Sep 2014 17:26:08 +0800 Xiubo Li li.xi...@freescale.com wrote: @@ -285,11 +287,11 @@ static int asoc_simple_card_dai_link_of(struct device_node *node, dai_props-codec_dai.sysclk); /* -* soc_bind_dai_link() will check cpu name -* after of_node matching if dai_link has cpu_dai_name. -* but, it will never match if name was created by fmt_single_name() -* remove cpu_dai_name to escape name matching. -* see +* In soc_bind_dai_link() will check cpu name after +* of_node matching if dai_link has cpu_dai_name. +* but, it will never match if name was created by +* fmt_single_name() remove cpu_dai_name to escape +* name matching. Please see: * fmt_single_name() * fmt_multiple_name() */ The patch done by Kuninori, setting the cpu_dai_name to NULL in all cases, does not work. This sequence should be replaced where is was previously. If so, it should be another issue here, should we send another patch for It ? Thanks, BRs Xiubo
Re: [alsa-devel] [PATCHv2 3/4] ASoC: simple-card: Adjust the comments of simple card.
Hi Xiubo /* - * soc_bind_dai_link() will check cpu name - * after of_node matching if dai_link has cpu_dai_name. - * but, it will never match if name was created by fmt_single_name() - * remove cpu_dai_name to escape name matching. - * see + * In soc_bind_dai_link() will check cpu name after + * of_node matching if dai_link has cpu_dai_name. + * but, it will never match if name was created by + * fmt_single_name() remove cpu_dai_name to escape + * name matching. Please see: * fmt_single_name() * fmt_multiple_name() */ The patch done by Kuninori, setting the cpu_dai_name to NULL in all cases, does not work. This sequence should be replaced where is was previously. If so, it should be another issue here, should we send another patch for It ? I posted patch yesterday, and Jean tested it Subject: [PATCH][RFC] ASoC: simple-card: fixup cpu_dai_name clear case Date: Tue, 02 Sep 2014 20:05:32 +0900 Best regards --- Kuninori Morimoto -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
RE: [alsa-devel] [PATCHv2 3/4] ASoC: simple-card: Adjust the comments of simple card.
Subject: Re: [alsa-devel] [PATCHv2 3/4] ASoC: simple-card: Adjust the comments of simple card. Hi Xiubo /* -* soc_bind_dai_link() will check cpu name -* after of_node matching if dai_link has cpu_dai_name. -* but, it will never match if name was created by fmt_single_name() -* remove cpu_dai_name to escape name matching. -* see +* In soc_bind_dai_link() will check cpu name after +* of_node matching if dai_link has cpu_dai_name. +* but, it will never match if name was created by +* fmt_single_name() remove cpu_dai_name to escape +* name matching. Please see: * fmt_single_name() * fmt_multiple_name() */ The patch done by Kuninori, setting the cpu_dai_name to NULL in all cases, does not work. This sequence should be replaced where is was previously. If so, it should be another issue here, should we send another patch for It ? I posted patch yesterday, and Jean tested it Subject: [PATCH][RFC] ASoC: simple-card: fixup cpu_dai_name clear case Date: Tue, 02 Sep 2014 20:05:32 +0900 Nice. I think I just missed it. Thanks, BRs Xiubo -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
