ASoC: simple-card: Fix property name for simple-audio-card, format
diff mbox

Message ID 1394194711-32009-1-git-send-email-peter.ujfalusi@ti.com
State Accepted
Commit 26240a71e0100169a0699a86f6c8ff356cb588ce
Headers show

Commit Message

Peter Ujfalusi March 7, 2014, 12:18 p.m. UTC
The "format" part of the property name is missing from the code.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
 sound/soc/generic/simple-card.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Mark Brown March 9, 2014, 8:41 a.m. UTC | #1
On Fri, Mar 07, 2014 at 02:18:31PM +0200, Peter Ujfalusi wrote:
> The "format" part of the property name is missing from the code.

Applied, thanks.
Xiubo Li March 10, 2014, 2:25 a.m. UTC | #2
> --- a/sound/soc/generic/simple-card.c
> +++ b/sound/soc/generic/simple-card.c
> @@ -165,7 +165,7 @@ static int asoc_simple_card_parse_of(struct device_node
> *node,
>  	snd_soc_of_parse_card_name(&priv->snd_card, "simple-audio-card,name");
> 
>  	/* get CPU/CODEC common format via simple-audio-card,format */
> -	priv->daifmt = snd_soc_of_parse_daifmt(node, "simple-audio-card,") &
> +	priv->daifmt = snd_soc_of_parse_daifmt(node, "simple-audio-card,format")


@Peter

Sorry, the interface of snd_soc_of_parse_daifmt(struct device_node *np,
const char *prefix), it's intended not only to parse the 'XXX,format', but also
'XXX,continuous-clock', 'XXX, bitclock-inversion', 'XXX, frame-inversion',
'XXX,bitclock-master' and 'XXX,frame-master' at the same time.

Maybe just the comment here is not very correct.

Thanks,

--
Best Regards,
Xiubo


> &
>  		(SND_SOC_DAIFMT_FORMAT_MASK | SND_SOC_DAIFMT_INV_MASK);
> 
>  	/* off-codec widgets */
> --
> 1.9.0
> 
>
Mark Brown March 10, 2014, 7:53 a.m. UTC | #3
On Mon, Mar 10, 2014 at 02:25:02AM +0000, Li.Xiubo@freescale.com wrote:

> Sorry, the interface of snd_soc_of_parse_daifmt(struct device_node *np,
> const char *prefix), it's intended not only to parse the 'XXX,format', but also
> 'XXX,continuous-clock', 'XXX, bitclock-inversion', 'XXX, frame-inversion',
> 'XXX,bitclock-master' and 'XXX,frame-master' at the same time.

> Maybe just the comment here is not very correct.

Yes, the comment needs fixing.  I've dropped the patch.
Peter Ujfalusi March 10, 2014, 9:54 a.m. UTC | #4
On 03/10/2014 04:25 AM, Li.Xiubo@freescale.com wrote:
>> --- a/sound/soc/generic/simple-card.c
>> +++ b/sound/soc/generic/simple-card.c
>> @@ -165,7 +165,7 @@ static int asoc_simple_card_parse_of(struct device_node
>> *node,
>>  	snd_soc_of_parse_card_name(&priv->snd_card, "simple-audio-card,name");
>>
>>  	/* get CPU/CODEC common format via simple-audio-card,format */
>> -	priv->daifmt = snd_soc_of_parse_daifmt(node, "simple-audio-card,") &
>> +	priv->daifmt = snd_soc_of_parse_daifmt(node, "simple-audio-card,format")
> 
> 
> @Peter
> 
> Sorry, the interface of snd_soc_of_parse_daifmt(struct device_node *np,
> const char *prefix), it's intended not only to parse the 'XXX,format', but also
> 'XXX,continuous-clock', 'XXX, bitclock-inversion', 'XXX, frame-inversion',
> 'XXX,bitclock-master' and 'XXX,frame-master' at the same time.

Yes, I overlooked that. I have not checked the snd_soc_of_parse_daifmt() before.

> Maybe just the comment here is not very correct.

Probably it would be better to re-word it since the code at this point only
interested on the i2s coding and the bit/frame inversion.

> Thanks,
> 
> --
> Best Regards,
> Xiubo
> 
> 
>> &
>>  		(SND_SOC_DAIFMT_FORMAT_MASK | SND_SOC_DAIFMT_INV_MASK);
>>
>>  	/* off-codec widgets */
>> --
>> 1.9.0
>>
>>
>

Patch
diff mbox

diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index 7cabcc5c8703..064b404ed252 100644
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -165,7 +165,7 @@  static int asoc_simple_card_parse_of(struct device_node *node,
 	snd_soc_of_parse_card_name(&priv->snd_card, "simple-audio-card,name");
 
 	/* get CPU/CODEC common format via simple-audio-card,format */
-	priv->daifmt = snd_soc_of_parse_daifmt(node, "simple-audio-card,") &
+	priv->daifmt = snd_soc_of_parse_daifmt(node, "simple-audio-card,format") &
 		(SND_SOC_DAIFMT_FORMAT_MASK | SND_SOC_DAIFMT_INV_MASK);
 
 	/* off-codec widgets */