From patchwork Fri Mar 14 00:56:43 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 3829831 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 1E8569F1CD for ; Fri, 14 Mar 2014 00:56:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 44B82202EC for ; Fri, 14 Mar 2014 00:56:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 69696202F0 for ; Fri, 14 Mar 2014 00:56:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753679AbaCNA4p (ORCPT ); Thu, 13 Mar 2014 20:56:45 -0400 Received: from mail-pa0-f45.google.com ([209.85.220.45]:48471 "EHLO mail-pa0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752999AbaCNA4o (ORCPT ); Thu, 13 Mar 2014 20:56:44 -0400 Received: by mail-pa0-f45.google.com with SMTP id kl14so1885807pab.4 for ; Thu, 13 Mar 2014 17:56:44 -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:in-reply-to :references:mime-version:content-type; bh=4xrmSEzyLumur9CFT2x0A4Ssbkh/jqIcL2TwXPl6dZw=; b=JQmF5gRwdjkmqTIuY3gzRhfSS7JKFDDMJkAbpJUd887kGMbH4R0ar7L7+NhV5yauEG V+iaafxrKdba+EaXrQ+9vZVrN/uCzJQuc7gIxoEru8wlyjRiUcBap9Jz5Ph0i3EjZQWc +A/dKBwEzIzT2g3oEB5tCbZ1j9jPuSfMyU5/2Y5Vo3z6FPCtfNV0KKI/Cdm6O87IsDnR tHz45q5PscagLibJYHlJ00c+cnjl8L6+H8s3zjy3hsxMVTcc7/gfkT0R2SF8p07R8h4B zbJUSB8xZ06qM9acjph5aJbc9BVEjxGYed9D1ByfB7VHUR4w7fjMu7hBUfoqgLv4bZOK Ba3w== X-Received: by 10.69.31.171 with SMTP id kn11mr5933391pbd.47.1394758604469; Thu, 13 Mar 2014 17:56:44 -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 x5sm10934445pbw.26.2014.03.13.17.56.42 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 13 Mar 2014 17:56:43 -0700 (PDT) Date: Thu, 13 Mar 2014 17:56:43 -0700 (PDT) Message-ID: <87a9ctpph2.wl%kuninori.morimoto.gx@gmail.com> From: Kuninori Morimoto Subject: [PATCH 2/2] ASoC: rcar: fixup SND_SOC_DAIFMT_CBx_CFx flags User-Agent: Wanderlust/2.14.0 Emacs/23.3 Mule/6.0 To: Mark Brown , Simon Cc: Morimoto , Linux-SH , Linux-ALSA , Liam Girdwood In-Reply-To: <87d2hpppk3.wl%kuninori.morimoto.gx@gmail.com> References: <87txb3rjzw.wl%kuninori.morimoto.gx@gmail.com> <87d2hpppk3.wl%kuninori.morimoto.gx@gmail.com> 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 --- v1 -> v2 - no change 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 743de5e..3a4fe9d 100644 --- a/sound/soc/sh/rcar/core.c +++ b/sound/soc/sh/rcar/core.c @@ -486,10 +486,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;