From patchwork Mon Mar 3 04:32: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: 3750951 X-Patchwork-Delegate: broonie@sirena.org.uk Return-Path: X-Original-To: patchwork-alsa-devel@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 D8F42BF13A for ; Mon, 3 Mar 2014 04:33:07 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0CA2120263 for ; Mon, 3 Mar 2014 04:33:07 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id D6CC92021C for ; Mon, 3 Mar 2014 04:33:05 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id E5EBC26553E; Mon, 3 Mar 2014 05:33:03 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, NO_DNS_FOR_FROM, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=no version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id C2F112654D5; Mon, 3 Mar 2014 05:32:53 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id A35882654E8; Mon, 3 Mar 2014 05:32:52 +0100 (CET) Received: from mail-pd0-f178.google.com (mail-pd0-f178.google.com [209.85.192.178]) by alsa0.perex.cz (Postfix) with ESMTP id 7589D2654D4 for ; Mon, 3 Mar 2014 05:32:45 +0100 (CET) Received: by mail-pd0-f178.google.com with SMTP id x10so3228475pdj.9 for ; Sun, 02 Mar 2014 20:32:43 -0800 (PST) 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=KDBj8p3FrlypQjn2AzdAAbKbipHSm40gy0QS6rRUJm4=; b=1BJOHrlc1gVwvQQIqjBYionp1e52Ot9VC9z8r4wAkXovRG5rHXTs7awo7KBk+oWeld k/toD9hqBdwYissYfYVQy9ap0ZJPqNW/sqjRJmTXqYwNy44gA0W7ukUiBEcWpOFgqP/P Ew2z97jVv2y4lPrkm3TXUa3PpWXE/FJX3mSox7Y3I7/Y7hv4UYql4RpvAkCojReuY06d heZ2VniTblXIsVeVDnH+RNxxhr00TnocbQkbAPaJNu9DMvUzjKMiC2aMRcO22pORx7Qo /Zb8V3vm/lV3ELugdOuvZE7TBJ4OO7hA79Ac3bHalw/BDMmwiZKacycyowVaJYmvhQQX KNiA== X-Received: by 10.68.66.103 with SMTP id e7mr4076930pbt.120.1393821163716; Sun, 02 Mar 2014 20:32:43 -0800 (PST) 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 pp5sm30929330pbb.33.2014.03.02.20.32.42 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sun, 02 Mar 2014 20:32:43 -0800 (PST) Date: Sun, 02 Mar 2014 20:32:43 -0800 (PST) Message-ID: <874n3fyk9k.wl%kuninori.morimoto.gx@gmail.com> From: Kuninori Morimoto User-Agent: Wanderlust/2.14.0 Emacs/23.3 Mule/6.0 To: Mark Brown MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Cc: Linux-ALSA , Simon , Liam Girdwood , Kuninori Morimoto , Kuninori Morimoto Subject: [alsa-devel] [PATCH] ASoC: simple-card: tidyup cpu/codec dai_fmt settings for non-DT X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP From: Kuninori Morimoto 30d0341e7da0c012f64fb290dd1153360fb49a8d (ASoC: simple-card: simplify the daifmt code) simplify cpu/codec dai_fmt which consists from dai specific format + common format. But, it didn't care about non-DT case. This patch fixes it Signed-off-by: Kuninori Morimoto --- sound/soc/generic/simple-card.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c index 034a2b7..7cabcc5 100644 --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c @@ -307,6 +307,9 @@ static int asoc_simple_card_probe(struct platform_device *pdev) sizeof(priv->cpu_dai)); memcpy(&priv->codec_dai, &cinfo->codec_dai, sizeof(priv->codec_dai)); + + priv->cpu_dai.fmt |= cinfo->daifmt; + priv->codec_dai.fmt |= cinfo->daifmt; } /*