From patchwork Wed Aug 6 01:18:32 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Lunn X-Patchwork-Id: 4682981 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 67E68C033A for ; Wed, 6 Aug 2014 01:27:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A0238201DD for ; Wed, 6 Aug 2014 01:27:33 +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 B842120173 for ; Wed, 6 Aug 2014 01:27:32 +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 1XEpyx-0001Lp-72; Wed, 06 Aug 2014 01:25:35 +0000 Received: from vps0.lunn.ch ([178.209.37.122]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XEpyp-0000ko-0J for linux-arm-kernel@lists.infradead.org; Wed, 06 Aug 2014 01:25:27 +0000 Received: from lunn by vps0.lunn.ch with local (Exim 4.80) (envelope-from ) id 1XEpsF-00054i-Gt; Wed, 06 Aug 2014 03:18:39 +0200 From: Andrew Lunn To: Russell King Subject: [RFC 8/8] ARM: Kirkwood: Describe DPCM audio support in DT Date: Wed, 6 Aug 2014 03:18:32 +0200 Message-Id: <1407287912-19447-9-git-send-email-andrew@lunn.ch> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1407287912-19447-1-git-send-email-andrew@lunn.ch> References: <1407287912-19447-1-git-send-email-andrew@lunn.ch> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140805_182527_220657_3014CD73 X-CRM114-Status: UNSURE ( 8.50 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.7 (/) Cc: Jean-Francois Moine , linux ARM , Andrew Lunn 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: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,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 Describe the DAI backend and the I2S front end of the audio hardware for both HP T5325 and Marvell OpenRD Client. Signed-off-by: Andrew Lunn --- arch/arm/boot/dts/kirkwood-openrd-client.dts | 39 +++++++++++++++++++++++----- arch/arm/boot/dts/kirkwood-t5325.dts | 33 +++++++++++++++++------ 2 files changed, 57 insertions(+), 15 deletions(-) diff --git a/arch/arm/boot/dts/kirkwood-openrd-client.dts b/arch/arm/boot/dts/kirkwood-openrd-client.dts index 887b9c1fee43..2cb216512ff2 100644 --- a/arch/arm/boot/dts/kirkwood-openrd-client.dts +++ b/arch/arm/boot/dts/kirkwood-openrd-client.dts @@ -29,19 +29,44 @@ reg = <0x4a>; }; }; + + audio: audio-controller@a0000 { + status = "okay"; + }; + }; sound { compatible = "simple-audio-card"; - simple-audio-card,format = "i2s"; - simple-audio-card,mclk-fs = <256>; + simple-audio-card,name = "openrd-client-audio"; + simple-audio-card,routing = + "i2s-tx", "dma-tx", + "dma-rx", "i2s-rx"; - simple-audio-card,cpu { - sound-dai = <&audio0>; + simple-audio-card,dai-link@0 { /* Front end */ + dynamic; + dpcm_playback; + dpcm_capture; + cpu { + sound-dai = <&audio 0>; + }; + codec { + snd-soc-dummy; + }; }; - - simple-audio-card,codec { - sound-dai = <&cs42l51>; + simple-audio-card,dia-link@1 { /* I2S Backend */ + format = "i2s"; + dpcm_playback; + dpcm_capture; + no_pcm; + mclk-fs = <256>; + platform_name = "snd-soc-dummy"; + cpu { + sound-dai = <&audio 1>; + }; + codec { + sound-dai = <&cs42l51>; + }; }; }; }; diff --git a/arch/arm/boot/dts/kirkwood-t5325.dts b/arch/arm/boot/dts/kirkwood-t5325.dts index cc6cd0bdcfac..f9466a2858c9 100644 --- a/arch/arm/boot/dts/kirkwood-t5325.dts +++ b/arch/arm/boot/dts/kirkwood-t5325.dts @@ -189,7 +189,7 @@ sound { compatible = "simple-audio-card"; - simple-audio-card,format = "i2s"; + simple-audio-card,name = "t5325"; simple-audio-card,routing = "Headphone Jack", "HPL", "Headphone Jack", "HPR", @@ -204,15 +204,32 @@ "Speaker", "Speaker", "Microphone", "Mic Jack"; - simple-audio-card,mclk-fs = <256>; - - simple-audio-card,cpu { - sound-dai = <&audio>; + simple-audio-card,dai-link@0 { /* Front end */ + dynamic; + dpcm_playback; + dpcm_capture; + cpu { + sound-dai = <&audio 0>; + }; + codec { + snd-soc-dummy; + }; }; - - simple-audio-card,codec { - sound-dai = <&alc5621>; + simple-audio-card,dia-link@1 { /* I2S Backend */ + format = "i2s"; + dpcm_playback; + dpcm_capture; + no_pcm; + mclk-fs = <256>; + platform_name = "snd-soc-dummy"; + cpu { + sound-dai = <&audio 1>; + }; + codec { + sound-dai = <&alc5621>; + }; }; + }; };