From patchwork Thu Oct 4 11:57:26 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Ujfalusi X-Patchwork-Id: 1546241 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 39608E00DC for ; Thu, 4 Oct 2012 12:00:12 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TJk3t-0005GA-D7; Thu, 04 Oct 2012 11:57:54 +0000 Received: from na3sys009aog125.obsmtp.com ([74.125.149.153]) by merlin.infradead.org with smtps (Exim 4.76 #1 (Red Hat Linux)) id 1TJk2d-0004gH-8z for linux-arm-kernel@lists.infradead.org; Thu, 04 Oct 2012 11:56:36 +0000 Received: from mail-ob0-f177.google.com ([209.85.214.177]) (using TLSv1) by na3sys009aob125.postini.com ([74.125.148.12]) with SMTP ID DSNKUG15cAd0TTaH3UNdf5WeunGfB+CSwJY9@postini.com; Thu, 04 Oct 2012 04:56:35 PDT Received: by mail-ob0-f177.google.com with SMTP id wd20so369740obb.36 for ; Thu, 04 Oct 2012 04:56:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=DJIOY/kr8nvv2b5MfwCPlhAtSkupPCsaALpHEzWQIYs=; b=ZYFhp1kbWVxkLf5ggzWrMh8bvyQ6PYCbaS/dEa+flPVjL0hXZIHLOtEnEzwZt89tNH PvPeWyPI11VbCOTOMOu1vv4aTPSWXVXFKlqxtK1pIwaI2YUosTe7CJQuFBkfxW5o48Ju DX3GiA3X1L6+T8MOCd8vL/NAuRdgXFg+ih6HpokAKliSIOBJMBMlJMcxfjvmC3mgcysN BY61zcgnMXncg+AOrldxNU04iE0/DoXAcjnTnT9GZ+/Xl1XkGtf4ITaGel9NYpGliPG8 sX8sfzbHuL1STyWIlw1GYdwYCrr/ZxtFOhZhSE9TxrPgp/XlxpPcQp8Hr0jgZ77E8eIf 2fvA== Received: by 10.60.14.165 with SMTP id q5mr4141877oec.28.1349351791966; Thu, 04 Oct 2012 04:56:31 -0700 (PDT) Received: from barack.emea.dhcp.ti.com (dragon.ti.com. [192.94.94.33]) by mx.google.com with ESMTPS id d6sm6435685obx.15.2012.10.04.04.56.29 (version=SSLv3 cipher=OTHER); Thu, 04 Oct 2012 04:56:31 -0700 (PDT) From: Peter Ujfalusi To: Tony Lindgren Subject: [PATCH 7/9] ARM/dts: omap4-panda: pinmux configuration for audio Date: Thu, 4 Oct 2012 14:57:26 +0300 Message-Id: <1349351848-12972-8-git-send-email-peter.ujfalusi@ti.com> X-Mailer: git-send-email 1.7.12 In-Reply-To: <1349351848-12972-1-git-send-email-peter.ujfalusi@ti.com> References: <1349351848-12972-1-git-send-email-peter.ujfalusi@ti.com> X-Gm-Message-State: ALoCoQmhXp+ACwp6bxLYz5Nj1JciAxKNjKqhqkEul+whR1E39za/D8pvZqjOutf8dS+HKuxTxgxb X-Spam-Note: CRM114 invocation failed X-Spam-Score: -4.2 (----) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-4.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [74.125.149.153 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] Cc: devicetree-discuss@lists.ozlabs.org, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org 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 u-boot stopped configuring 'non essential' pins recently. The kernel needs to configure the mux for audio needs. Since the pinmux for these IPs are static let pinctrl to handle the mux configuration for. Configuring the mux for: twl6040 (audpwron, irq), McPDM and McBSP1. Signed-off-by: Peter Ujfalusi --- arch/arm/boot/dts/omap4-panda.dts | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/arch/arm/boot/dts/omap4-panda.dts b/arch/arm/boot/dts/omap4-panda.dts index 771cefd..e8f927c 100644 --- a/arch/arm/boot/dts/omap4-panda.dts +++ b/arch/arm/boot/dts/omap4-panda.dts @@ -59,6 +59,41 @@ }; }; +&omap4_pmx_core { + pinctrl-names = "default"; + pinctrl-0 = < + &twl6040_pins + &mcpdm_pins + &mcbsp1_pins + >; + + twl6040_pins: pinmux_twl6040_pins { + pinctrl-single,pins = < + 0xe0 0x3 /* hdq_sio.gpio_127 OUTPUT | MODE3 */ + 0x160 0x100 /* sys_nirq2.sys_nirq2 INPUT | MODE0 */ + >; + }; + + mcpdm_pins: pinmux_mcpdm_pins { + pinctrl-single,pins = < + 0xc6 0x108 /* abe_pdm_ul_data.abe_pdm_ul_data INPUT PULLDOWN | MODE0 */ + 0xc8 0x108 /* abe_pdm_dl_data.abe_pdm_dl_data INPUT PULLDOWN | MODE0 */ + 0xca 0x118 /* abe_pdm_frame.abe_pdm_frame INPUT PULLUP | MODE0 */ + 0xcc 0x108 /* abe_pdm_lb_clk.abe_pdm_lb_clk INPUT PULLDOWN | MODE0 */ + 0xce 0x108 /* abe_clks.abe_clks INPUT PULLDOWN | MODE0 */ + >; + }; + + mcbsp1_pins: pinmux_mcbsp1_pins { + pinctrl-single,pins = < + 0xbe 0x100 /* abe_mcbsp1_clkx.abe_mcbsp1_clkx INPUT | MODE0 */ + 0xc0 0x108 /* abe_mcbsp1_dr.abe_mcbsp1_dr INPUT PULLDOWN | MODE0 */ + 0xc2 0x8 /* abe_mcbsp1_dx.abe_mcbsp1_dx OUTPUT PULLDOWN | MODE0 */ + 0xc4 0x100 /* abe_mcbsp1_fsx.abe_mcbsp1_fsx INPUT | MODE0 */ + >; + }; +}; + &i2c1 { clock-frequency = <400000>;