From patchwork Mon Mar 24 03:27:30 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 3881071 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 152509F2E8 for ; Mon, 24 Mar 2014 03:28:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 34A312022D for ; Mon, 24 Mar 2014 03:28:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 55BAE20256 for ; Mon, 24 Mar 2014 03:28:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751779AbaCXD1w (ORCPT ); Sun, 23 Mar 2014 23:27:52 -0400 Received: from mail-pb0-f42.google.com ([209.85.160.42]:48913 "EHLO mail-pb0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751725AbaCXD1b (ORCPT ); Sun, 23 Mar 2014 23:27:31 -0400 Received: by mail-pb0-f42.google.com with SMTP id rr13so4842606pbb.15 for ; Sun, 23 Mar 2014 20:27:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:message-id:from:subject:user-agent:to:cc:mime-version :content-type; bh=NB/zpvt+rNrAuO3Qen3gI2jnYM5pC5yDlD6SzZtpDtg=; b=C6a6uCbzIdjC3wPqUlAWwvyvLiTx/pHIGMF655v8UpsdXfN85qWumqllQJOx48GFf7 i+ObGmoV2iJajWjpYghCQpvsp5yDa3Dv4YQDiECyopQFBWCgFjjYG1e+GX6G0C7uEaLF w29riChUYiv+IZVT44kFfbxp0LPU44ORzVK9b1CE5MRJiqXvPly1wpHzZ9FSR5MAiA/N eJa1DCMsSqQY3zYo3qWEIjyeS2hRI+Q88KFHOyhAloCiOw8cHKBdqvrIugiOdpo1ug88 jm9ZBr/o53CL7sPTuYQOs14TM7toGq31QAqSj8juCxV1a6HBxYIIBsdokCr64DjLkmPC hJmw== X-Received: by 10.68.136.162 with SMTP id qb2mr67688017pbb.88.1395631650990; Sun, 23 Mar 2014 20:27:30 -0700 (PDT) Received: from morimoto-dell.gmail.com (49.14.32.202.bf.2iij.net. [202.32.14.49]) by mx.google.com with ESMTPSA id et3sm30178243pbc.52.2014.03.23.20.27.29 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sun, 23 Mar 2014 20:27:30 -0700 (PDT) Date: Sun, 23 Mar 2014 20:27:30 -0700 (PDT) Message-ID: <87ha6oi8dg.wl%kuninori.morimoto.gx@gmail.com> From: Kuninori Morimoto Subject: [PATCH] ARM: bockw: fixup SND_SOC_DAIFMT_CBx_CFx flags User-Agent: Wanderlust/2.14.0 Emacs/23.3 Mule/6.0 To: Mark Brown Cc: Linux-ALSA , Liam Girdwood , Kuninori Morimoto , Kuninori Morimoto , Simon , linux-sh@vger.kernel.org MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Kuninori Morimoto SND_SOC_DAIFMT_CBx_CFx means "codec" side master/slave mode. Then, rcar will be master mode if it was SND_SOC_DAIFMT_CBS_CFS. Signed-off-by: Kuninori Morimoto --- >> Mark, Simon I'm so sorry. current Mark's fix/rcar branch has SND_SOC_DAIFMT_CBx_CFx fixup patches, but it didn't care about bockw board. This patch is for it. This Subject is using "ARM: bockw:" prefix, but, should it be "ASoC: rcar" ? arch/arm/mach-shmobile/board-bockw.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/arch/arm/mach-shmobile/board-bockw.c b/arch/arm/mach-shmobile/board-bockw.c index b5867b7..f444be2 100644 --- a/arch/arm/mach-shmobile/board-bockw.c +++ b/arch/arm/mach-shmobile/board-bockw.c @@ -467,14 +467,12 @@ static struct asoc_simple_card_info rsnd_card_info[] = { .card = "SSI56-AK4643", .codec = "ak4642-codec.0-0012", .platform = "rcar_sound", - .daifmt = SND_SOC_DAIFMT_LEFT_J, + .daifmt = SND_SOC_DAIFMT_LEFT_J | SND_SOC_DAIFMT_CBM_CFM, .cpu_dai = { .name = "rsnd-dai.0", - .fmt = SND_SOC_DAIFMT_CBS_CFS, }, .codec_dai = { .name = "ak4642-hifi", - .fmt = SND_SOC_DAIFMT_CBM_CFM, .sysclk = 11289600, }, }, @@ -484,10 +482,9 @@ static struct asoc_simple_card_info rsnd_card_info[] = { .card = "SSI3-AK4554(playback)", .codec = "ak4554-adc-dac.0", .platform = "rcar_sound", + .daifmt = SND_SOC_DAIFMT_CBS_CFS | SND_SOC_DAIFMT_RIGHT_J, .cpu_dai = { .name = "rsnd-dai.1", - .fmt = SND_SOC_DAIFMT_CBM_CFM | - SND_SOC_DAIFMT_RIGHT_J, }, .codec_dai = { .name = "ak4554-hifi", @@ -499,10 +496,9 @@ static struct asoc_simple_card_info rsnd_card_info[] = { .card = "SSI4-AK4554(capture)", .codec = "ak4554-adc-dac.0", .platform = "rcar_sound", + .daifmt = SND_SOC_DAIFMT_CBS_CFS | SND_SOC_DAIFMT_LEFT_J, .cpu_dai = { .name = "rsnd-dai.2", - .fmt = SND_SOC_DAIFMT_CBM_CFM | - SND_SOC_DAIFMT_LEFT_J, }, .codec_dai = { .name = "ak4554-hifi", @@ -514,10 +510,9 @@ static struct asoc_simple_card_info rsnd_card_info[] = { .card = "SSI7-AK4554(playback)", .codec = "ak4554-adc-dac.1", .platform = "rcar_sound", + .daifmt = SND_SOC_DAIFMT_CBS_CFS | SND_SOC_DAIFMT_RIGHT_J, .cpu_dai = { .name = "rsnd-dai.3", - .fmt = SND_SOC_DAIFMT_CBM_CFM | - SND_SOC_DAIFMT_RIGHT_J, }, .codec_dai = { .name = "ak4554-hifi", @@ -529,10 +524,9 @@ static struct asoc_simple_card_info rsnd_card_info[] = { .card = "SSI8-AK4554(capture)", .codec = "ak4554-adc-dac.1", .platform = "rcar_sound", + .daifmt = SND_SOC_DAIFMT_CBS_CFS | SND_SOC_DAIFMT_LEFT_J, .cpu_dai = { .name = "rsnd-dai.4", - .fmt = SND_SOC_DAIFMT_CBM_CFM | - SND_SOC_DAIFMT_LEFT_J, }, .codec_dai = { .name = "ak4554-hifi",