From patchwork Mon Mar 17 03:08:28 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 3841141 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 39BA6BF540 for ; Mon, 17 Mar 2014 03:08:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 38206201EF for ; Mon, 17 Mar 2014 03:08:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 59857201EC for ; Mon, 17 Mar 2014 03:08:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755917AbaCQDI3 (ORCPT ); Sun, 16 Mar 2014 23:08:29 -0400 Received: from mail-pb0-f44.google.com ([209.85.160.44]:38054 "EHLO mail-pb0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755818AbaCQDI3 (ORCPT ); Sun, 16 Mar 2014 23:08:29 -0400 Received: by mail-pb0-f44.google.com with SMTP id rp16so5101153pbb.17 for ; Sun, 16 Mar 2014 20:08:29 -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=P9lssCSIMczrRZ62ylxdeGENrv15yo5IfOgKQt4pp/k=; b=MhA1hbE4ld/ALZ5vFFNHZG1KA+iZbh86w9y1HMivIzxdsRDDrag8/bCnlRcRJeve82 f8/ErejnIa1rfh/8F6x2FrG/Z1THo2DbRdahadc1jEDzWBuG7A9LooOpeT44Z6IaPXmx b95Lv/OzL1CnH/kOepPz1FknhoC+0WC0cs2d66QDRyCMH93RpGFz3zII7xgjZhmdRsGj iRT9sHtDk+iiRZIXaJt6SAn70ezwhFjvqlVNCHzYJY4XIw2S6UJ0Ai/IoLX5zTOka2s6 jCTNO1cCR5/WEi/896TbtmshntrNpx0JaF6kykCeGt7x/H9HQYT0i7Q/2zhldTSpCz+z TrMA== X-Received: by 10.69.1.69 with SMTP id be5mr22904669pbd.126.1395025708948; Sun, 16 Mar 2014 20:08:28 -0700 (PDT) Received: from morimoto-Dell-XPS420.gmail.com (49.14.32.202.bf.2iij.net. [202.32.14.49]) by mx.google.com with ESMTPSA id bc4sm38660235pbb.2.2014.03.16.20.08.27 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sun, 16 Mar 2014 20:08:28 -0700 (PDT) Date: Sun, 16 Mar 2014 20:08:28 -0700 (PDT) Message-ID: <87lhw9v7x2.wl%kuninori.morimoto.gx@gmail.com> From: Kuninori Morimoto Subject: [PATCH] ARM: shmobkle: lager: fixup SND_SOC_DAIFMT_CBx_CFx flags User-Agent: Wanderlust/2.14.0 Emacs/23.3 Mule/6.0 To: Simon Cc: Magnus , linux-sh@vger.kernel.org, Kuninori Morimoto , Kuninori Morimoto 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=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 --- >> Simon This patch is based on Mark's mark/fix/rcar branch. I guess it will goes to linus/master soon. arch/arm/mach-shmobile/board-lager.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/arch/arm/mach-shmobile/board-lager.c b/arch/arm/mach-shmobile/board-lager.c index f0104bf..18c7e03 100644 --- a/arch/arm/mach-shmobile/board-lager.c +++ b/arch/arm/mach-shmobile/board-lager.c @@ -588,14 +588,12 @@ static struct asoc_simple_card_info rsnd_card_info = { .card = "SSI01-AK4643", .codec = "ak4642-codec.2-0012", .platform = "rcar_sound", - .daifmt = SND_SOC_DAIFMT_LEFT_J, + .daifmt = SND_SOC_DAIFMT_LEFT_J | SND_SOC_DAIFMT_CBM_CFM, .cpu_dai = { .name = "rcar_sound", - .fmt = SND_SOC_DAIFMT_CBS_CFS, }, .codec_dai = { .name = "ak4642-hifi", - .fmt = SND_SOC_DAIFMT_CBM_CFM, .sysclk = 11289600, }, };