From patchwork Fri May 24 19:28:22 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 2612291 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) by patchwork2.kernel.org (Postfix) with ESMTP id 93704DF24C for ; Fri, 24 May 2013 19:29:02 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Ufxfc-0006tU-A2; Fri, 24 May 2013 19:28:56 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UfxfZ-0006Vt-N9; Fri, 24 May 2013 19:28:53 +0000 Received: from mail-pd0-f178.google.com ([209.85.192.178]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UfxfV-0006VI-Lo for linux-arm-kernel@lists.infradead.org; Fri, 24 May 2013 19:28:50 +0000 Received: by mail-pd0-f178.google.com with SMTP id w11so1462127pde.37 for ; Fri, 24 May 2013 12:28:25 -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:x-gm-message-state; bh=xsg06Qnkc7wsh66dRnlhIyHkVW8ser/hHg9iEfGABh4=; b=WfsmXSstAlGg9VcVB9Bz9bbjGPaDf3pJA1pz0jD3gcLH2BJsbtpn1W8UuUbuVOmTBG n/SdoIB5M11FWiG+aI4UMtOKUfocpzP+g0Qr21AEN9+Vy09db84RasXWlXXCmI5+quEq 9uOfFsp2w9WSNKAv3+ZyyRFaorrbvvWoOp+ciJ5ps/xvb8UDCSWlxGiBQqJD2+g6JmYy UnP9Oz1hheg1mIlYJ1Cf1cYL4QP5Xf8BkP/wTy6UQ0+/K7A8BASEt1pPh29iK1P1sWmp +3bjLaBEcW14h66tIWCIStZVx9lGpAkpQYQIOHtMIhmcztR1/8spSPTGRds5OihObXYr pvHg== X-Received: by 10.66.233.9 with SMTP id ts9mr19933446pac.15.1369423705604; Fri, 24 May 2013 12:28:25 -0700 (PDT) Received: from localhost (c-24-19-7-36.hsd1.wa.comcast.net. [24.19.7.36]) by mx.google.com with ESMTPSA id sv4sm18609379pab.10.2013.05.24.12.28.23 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 24 May 2013 12:28:24 -0700 (PDT) From: Kevin Hilman To: Tony Lindgren , Benoit Cousson , linux-omap@vger.kernel.org Subject: [PATCH] ARM: DTS: OMAP4: Panda/SDP: twl6030: fix mux for IRQ pin and msecure line Date: Fri, 24 May 2013 12:28:22 -0700 Message-Id: <1369423702-31501-1-git-send-email-khilman@linaro.org> X-Mailer: git-send-email 1.8.2 X-Gm-Message-State: ALoCoQmfZdZjYMdZuQ9lB7H6RggAZgxRB3uenYQvUr9T6LSckaFuwQXqPQrpNPhI16UC+XWow4rg X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130524_152849_784811_9A83B9A5 X-CRM114-Status: UNSURE ( 9.32 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [209.85.192.178 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: linux-arm-kernel@lists.infradead.org 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 Earlier commits ensured proper muxing of pins related to proper TWL6030 behavior: see commit 265a2bc8 (ARM: OMAP3: TWL4030: ensure sys_nirq1 is mux'd and wakeup enabled) and commit 1ef43369 (ARM: OMAP4: TWL: mux sys_drm_msecure as output for PMIC). However these only fixed legacy boot and not DT boot. For DT boot, the default mux values need to be set properly in DT. Cc: Tony Lindgren Signed-off-by: Kevin Hilman --- Applies on v3.10-rc2 arch/arm/boot/dts/omap4-panda-common.dtsi | 8 ++++++++ arch/arm/boot/dts/omap4-sdp.dts | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/arch/arm/boot/dts/omap4-panda-common.dtsi b/arch/arm/boot/dts/omap4-panda-common.dtsi index 03bd60d..a7a9bc0 100644 --- a/arch/arm/boot/dts/omap4-panda-common.dtsi +++ b/arch/arm/boot/dts/omap4-panda-common.dtsi @@ -59,6 +59,7 @@ &omap4_pmx_core { pinctrl-names = "default"; pinctrl-0 = < + &twl6030_pins &twl6040_pins &mcpdm_pins &mcbsp1_pins @@ -66,6 +67,13 @@ &tpd12s015_pins >; + twl6030_pins: pinmux_twl6030_pins { + pinctrl-single,pins = < + 0x15e 0x4118 /* sys_nirq1.sys_nirq1 OMAP_WAKEUP_EN | INPUT_PULLUP | MODE0 */ + 0x14 0x0 /* fref_clk0_out.sys_drm_msecure OUTPUT */ + >; + }; + twl6040_pins: pinmux_twl6040_pins { pinctrl-single,pins = < 0xe0 0x3 /* hdq_sio.gpio_127 OUTPUT | MODE3 */ diff --git a/arch/arm/boot/dts/omap4-sdp.dts b/arch/arm/boot/dts/omap4-sdp.dts index a35d9cd..5ad0c10 100644 --- a/arch/arm/boot/dts/omap4-sdp.dts +++ b/arch/arm/boot/dts/omap4-sdp.dts @@ -145,6 +145,7 @@ &omap4_pmx_core { pinctrl-names = "default"; pinctrl-0 = < + &twl6030_pins &twl6040_pins &mcpdm_pins &dmic_pins @@ -179,6 +180,13 @@ >; }; + twl6030_pins: pinmux_twl6030_pins { + pinctrl-single,pins = < + 0x15e 0x4118 /* sys_nirq1.sys_nirq1 OMAP_WAKEUP_EN | INPUT_PULLUP | MODE0 */ + 0x14 0x0 /* fref_clk0_out.sys_drm_msecure OUTPUT */ + >; + }; + twl6040_pins: pinmux_twl6040_pins { pinctrl-single,pins = < 0xe0 0x3 /* hdq_sio.gpio_127 OUTPUT | MODE3 */