From patchwork Wed Mar 12 06:48:35 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 3815681 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 5FC28BF540 for ; Wed, 12 Mar 2014 06:48:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 87B102028D for ; Wed, 12 Mar 2014 06:48:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 86216202F8 for ; Wed, 12 Mar 2014 06:48:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755849AbaCLGsh (ORCPT ); Wed, 12 Mar 2014 02:48:37 -0400 Received: from mail-pa0-f51.google.com ([209.85.220.51]:61017 "EHLO mail-pa0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755701AbaCLGsg (ORCPT ); Wed, 12 Mar 2014 02:48:36 -0400 Received: by mail-pa0-f51.google.com with SMTP id kq14so673805pab.10 for ; Tue, 11 Mar 2014 23:48:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:message-id:to:cc:in-reply-to:references:from:subject :user-agent:mime-version:content-type; bh=mcpdJTrdBDsjjV6QMRBwCW/BhPK9GmRwnHjDUDuTvVY=; b=l0fb/N1YIfan8SU6Bah1jbnJpMYNlzvpmdr2SDH8d4yJzSU9Bx88nDk4oqeoItk1+P bHw1WY8phL/rf1u5NHH212TP4UIlqSYzq14n3iWZd+PF7YZNzs+AsrfhCdusCTdhMUTo nbkMIS/SvXBrWRpoleplARdNCsJr+7F35V/1phQJtfAxdagzOvZk7eWhKIfdaniKOAzJ tO1iBRQogzyGkDIOa5Uo+vZ3pwdpxv48M6VZrnGdsWqY1nE3RShxeN+BdxV/0G1zc0hS mip86NX6txBQjhE5n8BT6oS9cSL1DAR7MEorZsyZ7phvp3b/PhfblfvbhBtBghLVdP4N pPVA== X-Received: by 10.68.212.10 with SMTP id ng10mr2872125pbc.95.1394606916417; Tue, 11 Mar 2014 23:48:36 -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 yz5sm11114210pac.9.2014.03.11.23.48.34 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 11 Mar 2014 23:48:35 -0700 (PDT) Date: Tue, 11 Mar 2014 23:48:35 -0700 (PDT) Message-ID: <87r467rjy8.wl%kuninori.morimoto.gx@gmail.com> To: Mark Brown Cc: Simon , Morimoto , Linux-SH , Linux-ALSA , Liam Girdwood In-Reply-To: <87txb3rjzw.wl%kuninori.morimoto.gx@gmail.com> References: <87txb3rjzw.wl%kuninori.morimoto.gx@gmail.com> From: Kuninori Morimoto Subject: [PATCH 2/2][RFC] ASoC: rcar: fixup SND_SOC_DAIFMT_CBx_CFx flags User-Agent: Wanderlust/2.14.0 Emacs/23.3 Mule/6.0 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 --- sound/soc/sh/rcar/core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c index 6a1b45df..d836e8a 100644 --- a/sound/soc/sh/rcar/core.c +++ b/sound/soc/sh/rcar/core.c @@ -510,10 +510,10 @@ static int rsnd_soc_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) /* set master/slave audio interface */ switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { case SND_SOC_DAIFMT_CBM_CFM: - rdai->clk_master = 1; + rdai->clk_master = 0; break; case SND_SOC_DAIFMT_CBS_CFS: - rdai->clk_master = 0; + rdai->clk_master = 1; /* codec is slave, cpu is master */ break; default: return -EINVAL;