From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jyri Sarha Subject: Re: [PATCHv2 1/4] ASoC: simple-card: add asoc_simple_card_fmt_master() to simplify the code. Date: Tue, 2 Sep 2014 14:10:16 +0300 Message-ID: <5405A598.4050208@ti.com> References: <1409649969-15759-1-git-send-email-Li.Xiubo@freescale.com> <1409649969-15759-2-git-send-email-Li.Xiubo@freescale.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii"; Format="flowed" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1409649969-15759-2-git-send-email-Li.Xiubo@freescale.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org To: Xiubo Li , broonie@kernel.org, perex@perex.cz, lgirdwood@gmail.com, tiwai@suse.de, moinejf@free.fr, andrew@lunn.ch, kuninori.morimoto.gx@renesas.com, devicetree@vger.kernel.org, alsa-devel@alsa-project.org, robh+dt@kernel.org, pawel.moll@arm.com, mark.rutland@arm.com, ijc+devicetree@hellion.org.uk, galak@codeaurora.org Cc: linux-kernel@vger.kernel.org List-Id: devicetree@vger.kernel.org On 09/02/2014 12:26 PM, Xiubo Li wrote: > Signed-off-by: Xiubo Li > --- > sound/soc/generic/simple-card.c | 61 ++++++++++++++++++++--------------------- > 1 file changed, 29 insertions(+), 32 deletions(-) > > diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c > index 986d2c7..cad2b30 100644 > --- a/sound/soc/generic/simple-card.c > +++ b/sound/soc/generic/simple-card.c > @@ -163,6 +163,26 @@ asoc_simple_card_sub_parse_of(struct device_node *np, > return 0; > } > > +static inline unsigned int > +asoc_simple_card_fmt_master(struct device_node *np, > + struct device_node *bitclkmaster, > + struct device_node *framemaster) > +{ > + switch (((np == bitclkmaster) << 4) | (np == framemaster)) { > + case 0x11: > + return SND_SOC_DAIFMT_CBS_CFS; > + case 0x10: > + return SND_SOC_DAIFMT_CBS_CFM; > + case 0x01: > + return SND_SOC_DAIFMT_CBM_CFS; > + default: > + return SND_SOC_DAIFMT_CBM_CFM; > + } > + > + /* Shouldn't be here */ > + return -EINVAL; > +} > + .... > + fmt = asoc_simple_card_fmt_master(np, bitclkmaster, framemaster); > + dai_props->cpu_dai.fmt = daifmt | fmt; ... > + fmt = asoc_simple_card_fmt_master(np, bitclkmaster, > + framemaster); > + dai_props->codec_dai.fmt = daifmt | fmt; This won't work. The logic for cpu node needs to be negated for codec node. Best regards, Jyri