From patchwork Tue Feb 12 12:21:57 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anil Kumar X-Patchwork-Id: 2128151 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 2361BDFB7B for ; Tue, 12 Feb 2013 12:25:32 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1U5EsN-0000kC-DV; Tue, 12 Feb 2013 12:22:19 +0000 Received: from mail-pa0-f54.google.com ([209.85.220.54]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1U5EsJ-0000jt-Ly for linux-arm-kernel@lists.infradead.org; Tue, 12 Feb 2013 12:22:16 +0000 Received: by mail-pa0-f54.google.com with SMTP id fa10so59569pad.41 for ; Tue, 12 Feb 2013 04:22:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer; bh=OJrhusl0cgIm0WYKrv3q7FgzAni3GxkYAx2pb1leYkU=; b=mMe5Gi7ORZagJ2u9gJR9tTAZStHIL45voPoALtyTz62fvmONBKTE1AH75fclb+qMPT Z1qwYtG2DZkUlgLAlySpCQ+WUH7VbaOLMM0v6OWBH+HE51jzOs204K03UDcolpaVIIOf j1kX3kQe0umW0f6HUfbeB2s+s8YE3sogVk8bfN1qDSd3iKbRGxOYRAf/ge/ClbOIK4L2 CCHO77cJMis3QCrBG2CssHXzJ4fE2nTGAa2rw91r29wM5Re953ri0NHcuCEXaaJ/pASs RkhMMG3SyjZhj8C8bTnbObLD4mCbs5OCFUzJB7r9BGlU3+WLopfZXWrjmqddLmBaOxbO yh+g== X-Received: by 10.66.80.65 with SMTP id p1mr51645963pax.20.1360671733580; Tue, 12 Feb 2013 04:22:13 -0800 (PST) Received: from localhost.localdomain ([123.237.221.229]) by mx.google.com with ESMTPS id k7sm61301799paz.13.2013.02.12.04.22.06 (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 12 Feb 2013 04:22:11 -0800 (PST) From: Anil Kumar To: linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree-discuss@lists.ozlabs.org Subject: [PATCH] ARM: dts: omap3-devkit8000: Enable audio support Date: Tue, 12 Feb 2013 17:51:57 +0530 Message-Id: <1360671717-32050-1-git-send-email-anilk4.v@gmail.com> X-Mailer: git-send-email 1.7.0.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130212_072215_819070_484D5CAD X-CRM114-Status: GOOD ( 13.62 ) X-Spam-Score: 0.3 (/) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (0.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- 3.0 KHOP_BIG_TO_CC Sent to 10+ recipients instaed of Bcc or a list 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (anilk4.v[at]gmail.com) -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.220.54 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: peter.ujfalusi@ti.com, linux@arm.linux.org.uk, b-cousson@ti.com, tony@atomide.com, grant.likely@secretlab.ca, anilk4.v@gmail.com, thomas@tomweber.eu X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Add the needed sections to enable audio support and related pin mux on Devkit8000 when booted with DT blob. Signed-off-by: Anil Kumar --- This patch is based on top of kernel 3.8-rc5 and the following patches. Peter Ujfalusi:- ASoC: twl4030: Correct the support for Voice port ASoC: twl4030: Convert MICBIAS to SUPPLY widget ASoC: omap-twl4030: Add support for routing, voice port and jack detect Anil Kumar:- ARM: dts: add minimal DT support for DevKit8000 https://patchwork.kernel.org/patch/2122461/ -Tested for playback and capture on Devkit8000. Test process:- #amixer set 'PredriveR Mixer AudioR2' on #amixer set 'PredriveL Mixer AudioL2' on #amixer set PreDriv 100 unmute #amixer set 'DAC2 Digital Fine' 100 #amixer cset numid=27 1 #arecord | aplay :100644 100644 dc59272... 1e2c931... M arch/arm/boot/dts/omap3-devkit8000.dts arch/arm/boot/dts/omap3-devkit8000.dts | 43 ++++++++++++++++++++++++++++--- 1 files changed, 38 insertions(+), 5 deletions(-) diff --git a/arch/arm/boot/dts/omap3-devkit8000.dts b/arch/arm/boot/dts/omap3-devkit8000.dts index dc59272..1e2c931 100644 --- a/arch/arm/boot/dts/omap3-devkit8000.dts +++ b/arch/arm/boot/dts/omap3-devkit8000.dts @@ -44,11 +44,27 @@ }; }; + + sound { + compatible = "ti,omap-twl4030"; + ti,model = "devkit8000"; + + ti,mcbsp = <&mcbsp2>; + ti,codec = <&twl_audio>; + ti,audio-routing = + "Ext Spk", "PREDRIVEL", + "Ext Spk", "PREDRIVER", + "MAINMIC", "Main Mic", + "Main Mic", "Mic Bias 1"; + }; }; &omap3_pmx_core { pinctrl-names = "default"; - pinctrl-0 = <&i2c1_pins>; + pinctrl-0 = < + &i2c1_pins + &mcbsp2_pins + >; leds_pins: pinmux_led_pins { pinctrl-single,pins = < @@ -65,6 +81,21 @@ 0x18c 0x118 /* I2C1_SDA */ >; }; + + mcbsp2_pins: pinmux_mcbsp2_pins { + pinctrl-single,pins = < + /* + * MCBSP2_FSX, OMAP_MUX_MODE0 | OMAP_PIN_INPUT, + * MCBSP2_CLKX, OMAP_MUX_MODE0 | OMAP_PIN_INPUT + */ + 0x10c 0x01000100 + /* + * MCBSP2_DR, OMAP_MUX_MODE0 | OMAP_PIN_INPUT, + * MCBSP2_DX, OMAP_MUX_MODE0 | OMAP_PIN_OUTPUT + */ + 0x110 0x00000100 + >; + }; }; &i2c1 { @@ -74,6 +105,12 @@ reg = <0x48>; interrupts = <7>; /* SYS_NIRQ cascaded to intc */ interrupt-parent = <&intc>; + + twl_audio: audio { + compatible = "ti,twl4030-audio"; + codec { + }; + }; }; }; @@ -109,10 +146,6 @@ status = "disabled"; }; -&mcbsp2 { - status = "disabled"; -}; - &mcbsp3 { status = "disabled"; };