From patchwork Mon Sep 1 04:29:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiubo Li X-Patchwork-Id: 4816421 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 4FA0FC0338 for ; Mon, 1 Sep 2014 05:30:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 873102016C for ; Mon, 1 Sep 2014 05:30:05 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 5FCF72017A for ; Mon, 1 Sep 2014 05:30:04 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 5FBAF265131; Mon, 1 Sep 2014 07:29:58 +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, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id 2A12826519E; Mon, 1 Sep 2014 07:24:19 +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 E06D326519F; Mon, 1 Sep 2014 07:24:18 +0200 (CEST) Received: from na01-by2-obe.outbound.protection.outlook.com (mail-by2lp0239.outbound.protection.outlook.com [207.46.163.239]) by alsa0.perex.cz (Postfix) with ESMTP id 0338D264F8D for ; Mon, 1 Sep 2014 07:21:26 +0200 (CEST) Received: from BN3PR0301CA0022.namprd03.prod.outlook.com (25.160.180.160) by DM2PR03MB352.namprd03.prod.outlook.com (10.141.54.24) with Microsoft SMTP Server (TLS) id 15.0.1024.9; Mon, 1 Sep 2014 05:21:22 +0000 Received: from BL2FFO11FD019.protection.gbl (2a01:111:f400:7c09::125) by BN3PR0301CA0022.outlook.office365.com (2a01:111:e400:4000::32) with Microsoft SMTP Server (TLS) id 15.0.1015.19 via Frontend Transport; Mon, 1 Sep 2014 05:21:21 +0000 Received: from az84smr01.freescale.net (192.88.158.2) by BL2FFO11FD019.mail.protection.outlook.com (10.173.161.37) with Microsoft SMTP Server (TLS) id 15.0.1010.11 via Frontend Transport; Mon, 1 Sep 2014 05:21:20 +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 s815Kbj9027602; Sun, 31 Aug 2014 22:21:16 -0700 From: Xiubo Li To: , , , , , , , , , , , , Date: Mon, 1 Sep 2014 12:29:39 +0800 Message-ID: <1409545781-20530-6-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)(85306004)(50466002)(107046002)(102836001)(81342001)(50226001)(93916002)(26826002)(48376002)(46102001)(80022001)(2201001)(83072002)(92726001)(4396001)(85852003)(81156004)(229853001)(90102001)(104166001)(92566001)(86362001)(89996001)(106466001)(88136002)(74662001)(105606002)(21056001)(104016003)(99396002)(84676001)(79102001)(76482001)(77982001)(76176999)(62966002)(47776003)(83322001)(44976005)(19580395003)(19580405001)(87936001)(64706001)(20776003)(31966008)(74502001)(77156001)(87286001)(50986999)(81542001)(68736004)(97736001)(69596002)(230783001)(6806004)(95666004)(36756003)(1121002)(921003)(2101003)(83996005); DIR:OUT; SFP:; SCL:1; SRVR:DM2PR03MB352; 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 5/7] ASoC: dts: r8a7740-armadillo800eva-reference: 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 --- .../boot/dts/r8a7740-armadillo800eva-reference.dts | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts b/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts index ee9e7d5..b83d95a 100644 --- a/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts +++ b/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts @@ -150,18 +150,19 @@ sound { compatible = "simple-audio-card"; - simple-audio-card,format = "i2s"; - - simple-audio-card,cpu { - sound-dai = <&sh_fsi2 0>; - bitclock-inversion; - }; - - simple-audio-card,codec { - sound-dai = <&wm8978>; + simple-audio-card,dai-link { + format = "i2s"; bitclock-master; frame-master; - system-clock-frequency = <12288000>; + + cpu { + sound-dai = <&sh_fsi2 0>; + bitclock-inversion; + }; + codec { + sound-dai = <&wm8978>; + system-clock-frequency = <12288000>; + }; }; }; };