From patchwork Mon Sep 1 04:29:41 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiubo Li X-Patchwork-Id: 4816401 Return-Path: X-Original-To: patchwork-linux-arm@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 E2907C0338 for ; Mon, 1 Sep 2014 05:24:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 175862017A for ; Mon, 1 Sep 2014 05:24:50 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 37C1920155 for ; Mon, 1 Sep 2014 05:24:49 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XOK4F-0006PK-Kx; Mon, 01 Sep 2014 05:22:15 +0000 Received: from mail-bn1lp0145.outbound.protection.outlook.com ([207.46.163.145] helo=na01-bn1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XOK3u-00069a-1D for linux-arm-kernel@lists.infradead.org; Mon, 01 Sep 2014 05:21:55 +0000 Received: from BY2PR03CA041.namprd03.prod.outlook.com (10.141.249.14) by BLUPR03MB344.namprd03.prod.outlook.com (10.141.48.24) with Microsoft SMTP Server (TLS) id 15.0.1015.9; Mon, 1 Sep 2014 05:21:31 +0000 Received: from BL2FFO11FD053.protection.gbl (2a01:111:f400:7c09::132) by BY2PR03CA041.outlook.office365.com (2a01:111:e400:2c5d::14) with Microsoft SMTP Server (TLS) id 15.0.1019.16 via Frontend Transport; Mon, 1 Sep 2014 05:21:30 +0000 Received: from az84smr01.freescale.net (192.88.158.2) by BL2FFO11FD053.mail.protection.outlook.com (10.173.161.181) with Microsoft SMTP Server (TLS) id 15.0.1010.11 via Frontend Transport; Mon, 1 Sep 2014 05:21:29 +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 s815KbjB027602; Sun, 31 Aug 2014 22:21:24 -0700 From: Xiubo Li To: , , , , , , , , , , , , Subject: [PATCHv1 7/7] ASoC: dts: kirkwood-openrd-client: To support simple card newest style. Date: Mon, 1 Sep 2014 12:29:41 +0800 Message-ID: <1409545781-20530-8-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)(81342001)(86362001)(77982001)(20776003)(229853001)(105606002)(102836001)(69596002)(19580405001)(83322001)(19580395003)(44976005)(6806004)(87286001)(81542001)(107046002)(230783001)(80022001)(47776003)(68736004)(26826002)(90102001)(84676001)(106466001)(62966002)(79102001)(64706001)(95666004)(21056001)(92726001)(81156004)(97736001)(76482001)(46102001)(31966008)(77156001)(36756003)(74662001)(89996001)(50226001)(48376002)(104016003)(99396002)(50466002)(93916002)(88136002)(2201001)(85306004)(104166001)(92566001)(85852003)(4396001)(50986999)(74502001)(83072002)(76176999)(87936001)(1121002)(921003)(83996005)(2101003); DIR:OUT; SFP:; SCL:1; SRVR:BLUPR03MB344; 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140831_222154_223842_13702904 X-CRM114-Status: GOOD ( 10.07 ) X-Spam-Score: -0.7 (/) Cc: Xiubo Li , linux-kernel@vger.kernel.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-3.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 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/kirkwood-openrd-client.dts | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/arch/arm/boot/dts/kirkwood-openrd-client.dts b/arch/arm/boot/dts/kirkwood-openrd-client.dts index 887b9c1..3b6f169 100644 --- a/arch/arm/boot/dts/kirkwood-openrd-client.dts +++ b/arch/arm/boot/dts/kirkwood-openrd-client.dts @@ -33,15 +33,16 @@ sound { compatible = "simple-audio-card"; - simple-audio-card,format = "i2s"; simple-audio-card,mclk-fs = <256>; - simple-audio-card,cpu { - sound-dai = <&audio0>; - }; - - simple-audio-card,codec { - sound-dai = <&cs42l51>; + simple-audio-card,dai-link { + format = "i2s"; + cpu { + sound-dai = <&audio0>; + }; + codec { + sound-dai = <&cs42l51>; + }; }; }; };