From patchwork Sat May 24 06:27:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Shiyan X-Patchwork-Id: 4236671 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 3D4CBBF90B for ; Sat, 24 May 2014 06:31:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5D2A420386 for ; Sat, 24 May 2014 06:31:34 +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 E8684202E6 for ; Sat, 24 May 2014 06:31: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 1Wo5Qm-0003hH-0L; Sat, 24 May 2014 06:27:44 +0000 Received: from smtp9.mail.ru ([94.100.181.97]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Wo5Qi-0003fm-Qa for linux-arm-kernel@lists.infradead.org; Sat, 24 May 2014 06:27:42 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mail.ru; s=mail2; h=Message-Id:Date:Subject:Cc:To:From; bh=lj0TTCyy2rUz5Tlvh8ougogvtArWoD1W06zzYhmyKvU=; b=hbfQ3zeLXuYmg+UEUn17GNKzPtLHsjtXbLEhthDD/fhxfGqZiv+7SMwSH8Uj2TBP7fhkMUd+gxLfVIBQHp12PVI+8zuI0tT+rj6OmSvTHI0PY2fIzHidavYKH7wNdmgxFWhuTtzo7sSnp8k9KSWnwHaYNblDyxitmrWJQ5a7jK8=; Received: from [5.18.98.7] (port=34243 helo=shc.zet) by smtp9.mail.ru with esmtpa (envelope-from ) id 1Wo5QJ-0003xI-9S; Sat, 24 May 2014 10:27:15 +0400 From: Alexander Shiyan To: linux-arm-kernel@lists.infradead.org Subject: [PATCH RFT] ARM: dts: imx51-eukrea-mbimxsd51-baseboard: Use simple-audio-card for sound Date: Sat, 24 May 2014 10:27:05 +0400 Message-Id: <1400912825-10735-1-git-send-email-shc_work@mail.ru> X-Mailer: git-send-email 1.8.5.5 X-Mras: Ok X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140523_232741_493517_6906641E X-CRM114-Status: GOOD ( 12.41 ) X-Spam-Score: -0.1 (/) Cc: =?UTF-8?q?Eric=20B=C3=A9nard?= , Alexander Shiyan , Denis Carikli , Mark Brown , Sascha Hauer , Shawn Guo X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 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.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,RP_MATCHES_RCVD,T_DKIM_INVALID,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 replaces usage of special driver for sound with simple-audio-card. Signed-off-by: Alexander Shiyan --- I ask Eukrea developers to test this. --- .../boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts | 39 ++++++++++++++++++---- arch/arm/boot/dts/imx51.dtsi | 4 +++ 2 files changed, 37 insertions(+), 6 deletions(-) diff --git a/arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts b/arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts index 75e66c9..03f81cc 100644 --- a/arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts +++ b/arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts @@ -18,7 +18,6 @@ /dts-v1/; #include "imx51-eukrea-cpuimx51.dtsi" -#include / { model = "Eukrea CPUIMX51"; @@ -76,11 +75,18 @@ }; sound { - compatible = "eukrea,asoc-tlv320"; - eukrea,model = "imx51-eukrea-tlv320aic23"; - ssi-controller = <&ssi2>; - fsl,mux-int-port = <2>; - fsl,mux-ext-port = <3>; + compatible = "simple-audio-card"; + simple-audio-card,format = "i2s"; + + simple-audio-card,cpu { + sound-dai = <&ssi2>; + system-clock-frequency = <0>; + }; + + simple-audio-card,codec { + sound-dai = <&tlv320aic23>; + system-clock-frequency = <12000000>; + }; }; usbphy { @@ -102,6 +108,26 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_audmux>; status = "okay"; + + ssi1 { + fsl,audmux-port = ; + fsl,port-config = < + (IMX_AUDMUX_V2_PTCR_SYN | + IMX_AUDMUX_V2_PTCR_TFSDIR | + IMX_AUDMUX_V2_PTCR_TFSEL(MX51_AUDMUX_PORT3) | + IMX_AUDMUX_V2_PTCR_TCLKDIR | + IMX_AUDMUX_V2_PTCR_TCSEL(MX51_AUDMUX_PORT3)) + IMX_AUDMUX_V2_PDCR_RXDSEL(MX51_AUDMUX_PORT3) + >; + }; + + port3 { + fsl,audmux-port = ; + fsl,port-config = < + IMX_AUDMUX_V2_PTCR_SYN + IMX_AUDMUX_V2_PDCR_RXDSEL(MX51_AUDMUX_PORT2_SSI1) + >; + }; }; &esdhc1 { @@ -133,6 +159,7 @@ &i2c1 { tlv320aic23: codec@1a { + #sound-dai-cells = <0>; compatible = "ti,tlv320aic23"; reg = <0x1a>; }; diff --git a/arch/arm/boot/dts/imx51.dtsi b/arch/arm/boot/dts/imx51.dtsi index bebbf3b..7cd6d26 100644 --- a/arch/arm/boot/dts/imx51.dtsi +++ b/arch/arm/boot/dts/imx51.dtsi @@ -16,6 +16,7 @@ #include #include #include +#include / { aliases { @@ -210,6 +211,7 @@ }; ssi2: ssi@70014000 { + #sound-dai-cells = <0>; compatible = "fsl,imx51-ssi", "fsl,imx21-ssi"; reg = <0x70014000 0x4000>; interrupts = <30>; @@ -500,6 +502,7 @@ }; ssi1: ssi@83fcc000 { + #sound-dai-cells = <0>; compatible = "fsl,imx51-ssi", "fsl,imx21-ssi"; reg = <0x83fcc000 0x4000>; interrupts = <29>; @@ -556,6 +559,7 @@ }; ssi3: ssi@83fe8000 { + #sound-dai-cells = <0>; compatible = "fsl,imx51-ssi", "fsl,imx21-ssi"; reg = <0x83fe8000 0x4000>; interrupts = <96>;