From patchwork Mon Sep 1 04:29:37 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiubo Li X-Patchwork-Id: 4816361 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 EBBB2C0338 for ; Mon, 1 Sep 2014 05:24:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2A49C2018B for ; Mon, 1 Sep 2014 05:24:39 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id EC0D420145 for ; Mon, 1 Sep 2014 05:24:37 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id C34EC2651D5; Mon, 1 Sep 2014 07:24:36 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,NO_DNS_FOR_FROM, UNPARSEABLE_RELAY autolearn=no version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id 2013A262629; Mon, 1 Sep 2014 07:21:38 +0200 (CEST) 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 35FE7262618; Mon, 1 Sep 2014 07:21:37 +0200 (CEST) Received: from na01-by2-obe.outbound.protection.outlook.com (mail-by2lp0235.outbound.protection.outlook.com [207.46.163.235]) by alsa0.perex.cz (Postfix) with ESMTP id 1A67B262618 for ; Mon, 1 Sep 2014 07:21:17 +0200 (CEST) Received: from CH1PR03CA011.namprd03.prod.outlook.com (10.255.156.156) by CY1PR0301MB0618.namprd03.prod.outlook.com (25.160.142.25) with Microsoft SMTP Server (TLS) id 15.0.1015.19; Mon, 1 Sep 2014 05:21:12 +0000 Received: from BN1BFFO11FD024.protection.gbl (10.255.156.132) by CH1PR03CA011.outlook.office365.com (10.255.156.156) with Microsoft SMTP Server (TLS) id 15.0.1019.16 via Frontend Transport; Mon, 1 Sep 2014 05:21:12 +0000 Received: from az84smr01.freescale.net (192.88.158.2) by BN1BFFO11FD024.mail.protection.outlook.com (10.58.144.87) with Microsoft SMTP Server (TLS) id 15.0.1010.11 via Frontend Transport; Mon, 1 Sep 2014 05:21:12 +0000 Received: from rock.ap.freescale.net (rock.ap.freescale.net [10.193.20.106]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id s815Kbj7027602; Sun, 31 Aug 2014 22:21:07 -0700 From: Xiubo Li To: , , , , , , , , , , , , Date: Mon, 1 Sep 2014 12:29:37 +0800 Message-ID: <1409545781-20530-4-git-send-email-Li.Xiubo@freescale.com> X-Mailer: git-send-email 1.8.0 In-Reply-To: <1409545781-20530-1-git-send-email-Li.Xiubo@freescale.com> References: <1409545781-20530-1-git-send-email-Li.Xiubo@freescale.com> X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:192.88.158.2; CTRY:US; IPV:CAL; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(6009001)(199003)(189002)(77982001)(77156001)(79102001)(76482001)(2201001)(80022001)(64706001)(20776003)(26826002)(4396001)(90102001)(95666004)(50226001)(83072002)(87936001)(81342001)(97736001)(102836001)(85306004)(89996001)(21056001)(92566001)(36756003)(104166001)(47776003)(93916002)(46102001)(88136002)(85852003)(229853001)(87286001)(50466002)(19580395003)(31966008)(19580405001)(69596002)(105606002)(83322001)(50986999)(104016003)(84676001)(81542001)(107046002)(92726001)(76176999)(106466001)(86362001)(74662001)(68736004)(48376002)(99396002)(6806004)(44976005)(74502001)(62966002)(81156004)(921003)(1121002)(83996005)(2101003); DIR:OUT; SFP:; SCL:1; SRVR:CY1PR0301MB0618; H:az84smr01.freescale.net; FPR:; MLV:ovrnspm; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:;UriScan:; X-Forefront-PRVS: 03218BFD9F Received-SPF: Fail (protection.outlook.com: domain of freescale.com does not designate 192.88.158.2 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.158.2; helo=az84smr01.freescale.net; Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=Li.Xiubo@freescale.com; X-OriginatorOrg: freescale.com Cc: Xiubo Li , linux-kernel@vger.kernel.org Subject: [alsa-devel] [PATCHv1 3/7] ASoC: dts: vf610-twr: To support simple card newest style. 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 This patch depends on the following simple card patch: === ASoC: simple-card: Merge single and muti DAI link code. This patch merge single DAI link and muti-DAI links code together, and simply the simple-card driver code. And also do some other improvement: Since from the DAI format micro SND_SOC_DAIFMT_CBx_CFx, the 'CBx' mean Codec's bit clock is as master/slave and the 'CFx' mean Codec's frame clock is as master/slave. So these same DAI formats should be informed to CPU and CODE DAIs at the same time. For the Codec driver will set the bit clock and frame clock as the DAI formats said, but for the CPU driver, if the the bit clock or frame clock is as Codec master, so it should be set CPU DAI device as bit clock or frame clock as slave, and vice versa. The old code will cause confusion, and we should be clear that the letter 'C' here mean to Codec. === Signed-off-by: Xiubo Li --- arch/arm/boot/dts/vf610-twr.dts | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/arch/arm/boot/dts/vf610-twr.dts b/arch/arm/boot/dts/vf610-twr.dts index b8a5e8c..841a45a 100644 --- a/arch/arm/boot/dts/vf610-twr.dts +++ b/arch/arm/boot/dts/vf610-twr.dts @@ -61,7 +61,6 @@ sound { compatible = "simple-audio-card"; - simple-audio-card,format = "i2s"; simple-audio-card,widgets = "Microphone", "Microphone Jack", "Headphone", "Headphone Jack", @@ -74,17 +73,17 @@ "Headphone Jack", "HP_OUT", "Speaker Ext", "LINE_OUT"; - simple-audio-card,cpu { - sound-dai = <&sai2>; - master-clkdir-out; + simple-audio-card,dai-link { + format = "i2s"; frame-master; bitclock-master; - }; - simple-audio-card,codec { - sound-dai = <&codec>; - frame-master; - bitclock-master; + cpu { + sound-dai = <&sai2>; + }; + codec { + sound-dai = <&codec>; + }; }; }; };