From mboxrd@z Thu Jan  1 00:00:00 1970
From: Haojian Zhuang <haojian.zhuang@gmail.com>
Subject: Re: [PATCH 4/4] ASoC: Use dai_fmt in z2 machine driver
Date: Sat, 31 Dec 2011 08:19:05 +0800
Message-ID: <CAN1soZwCT8sdhJ=pbVWV2fK7H8_unFuF-xZqtBqCaMN-u8hK5g@mail.gmail.com>
References: <1325259714.4755.6.camel@phoenix> <1325259877.4755.9.camel@phoenix>
Mime-Version: 1.0
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
Return-path: <alsa-devel-bounces@alsa-project.org>
Received: from mail-vw0-f51.google.com (mail-vw0-f51.google.com
	[209.85.212.51])
	by alsa0.perex.cz (Postfix) with ESMTP id 52AD0103B53
	for <alsa-devel@alsa-project.org>; Sat, 31 Dec 2011 01:19:06 +0100 (CET)
Received: by vbbfp1 with SMTP id fp1so11153094vbb.38
	for <alsa-devel@alsa-project.org>; Fri, 30 Dec 2011 16:19:05 -0800 (PST)
In-Reply-To: <1325259877.4755.9.camel@phoenix>
List-Unsubscribe: <http://mailman.alsa-project.org/mailman/listinfo/alsa-devel>,
	<mailto:alsa-devel-request@alsa-project.org?subject=unsubscribe>
List-Archive: <http://mailman.alsa-project.org/pipermail/alsa-devel>
List-Post: <mailto:alsa-devel@alsa-project.org>
List-Help: <mailto:alsa-devel-request@alsa-project.org?subject=help>
List-Subscribe: <http://mailman.alsa-project.org/mailman/listinfo/alsa-devel>,
	<mailto:alsa-devel-request@alsa-project.org?subject=subscribe>
Sender: alsa-devel-bounces@alsa-project.org
Errors-To: alsa-devel-bounces@alsa-project.org
To: Axel Lin <axel.lin@gmail.com>
Cc: alsa-devel@alsa-project.org, Mark Brown <broonie@opensource.wolfsonmicro.com>, Eric Miao <eric.y.miao@gmail.com>, Haojian Zhuang <haojian.zhuang@marvell.com>, Liam Girdwood <lrg@ti.com>
List-Id: alsa-devel@alsa-project.org

On Fri, Dec 30, 2011 at 11:44 PM, Axel Lin <axel.lin@gmail.com> wrote:
> Signed-off-by: Axel Lin <axel.lin@gmail.com>
> ---
> =A0sound/soc/pxa/z2.c | =A0 14 ++------------
> =A01 files changed, 2 insertions(+), 12 deletions(-)
>
> diff --git a/sound/soc/pxa/z2.c b/sound/soc/pxa/z2.c
> index d6807e0..e8f15ce 100644
> --- a/sound/soc/pxa/z2.c
> +++ b/sound/soc/pxa/z2.c
> @@ -56,18 +56,6 @@ static int z2_hw_params(struct snd_pcm_substream *subs=
tream,
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0break;
> =A0 =A0 =A0 =A0}
>
> - =A0 =A0 =A0 /* set codec DAI configuration */
> - =A0 =A0 =A0 ret =3D snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S |
> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_C=
FS);
> - =A0 =A0 =A0 if (ret < 0)
> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 return ret;
> -
> - =A0 =A0 =A0 /* set cpu DAI configuration */
> - =A0 =A0 =A0 ret =3D snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S |
> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_C=
FS);
> - =A0 =A0 =A0 if (ret < 0)
> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 return ret;
> -
> =A0 =A0 =A0 =A0/* set the codec system clock for DAC and ADC */
> =A0 =A0 =A0 =A0ret =3D snd_soc_dai_set_sysclk(codec_dai, WM8750_SYSCLK, c=
lk,
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0SND_SOC_CLOCK_IN);
> @@ -196,6 +184,8 @@ static struct snd_soc_dai_link z2_dai =3D {
> =A0 =A0 =A0 =A0.platform_name =3D "pxa-pcm-audio",
> =A0 =A0 =A0 =A0.codec_name =A0 =A0 =3D "wm8750.0-001b",
> =A0 =A0 =A0 =A0.init =A0 =A0 =A0 =A0 =A0 =3D z2_wm8750_init,
> + =A0 =A0 =A0 .dai_fmt =A0 =A0 =A0 =A0=3D SND_SOC_DAIFMT_I2S | SND_SOC_DA=
IFMT_NB_NF |
> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 SND_SOC_DAIFMT_CBS_CFS,
> =A0 =A0 =A0 =A0.ops =A0 =A0 =A0 =A0 =A0 =A0=3D &z2_ops,
> =A0};
>
> --
Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com>