From patchwork Fri Oct 25 10:07:37 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomi Valkeinen X-Patchwork-Id: 3094811 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 882B6BF924 for ; Fri, 25 Oct 2013 10:09:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 75C4E20375 for ; Fri, 25 Oct 2013 10:09:00 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2588720240 for ; Fri, 25 Oct 2013 10:08:59 +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 1VZeJs-0004Ng-Qv; Fri, 25 Oct 2013 10:08:40 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VZeJk-0007qs-P8; Fri, 25 Oct 2013 10:08:32 +0000 Received: from bear.ext.ti.com ([192.94.94.41]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VZeJT-0007ni-1v for linux-arm-kernel@lists.infradead.org; Fri, 25 Oct 2013 10:08:15 +0000 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id r9PA7q2h009506; Fri, 25 Oct 2013 05:07:52 -0500 Received: from DFLE72.ent.ti.com (dfle72.ent.ti.com [128.247.5.109]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id r9PA7q8d013831; Fri, 25 Oct 2013 05:07:52 -0500 Received: from dflp33.itg.ti.com (10.64.6.16) by DFLE72.ent.ti.com (128.247.5.109) with Microsoft SMTP Server id 14.2.342.3; Fri, 25 Oct 2013 05:07:52 -0500 Received: from deskari.tieu.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp33.itg.ti.com (8.14.3/8.13.8) with ESMTP id r9PA7ns5010049; Fri, 25 Oct 2013 05:07:51 -0500 From: Tomi Valkeinen To: , Tony Lindgren Subject: [PATCH 2/3] ARM: dts: omap4-sdp: add LCD pinmuxing Date: Fri, 25 Oct 2013 13:07:37 +0300 Message-ID: <1382695658-18757-2-git-send-email-tomi.valkeinen@ti.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1382695658-18757-1-git-send-email-tomi.valkeinen@ti.com> References: <1382695658-18757-1-git-send-email-tomi.valkeinen@ti.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131025_060815_185415_69E77023 X-CRM114-Status: GOOD ( 11.24 ) X-Spam-Score: -7.3 (-------) Cc: Tomi Valkeinen , Archit Taneja , 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, 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 Add pinmuxing for the LCD panels. Both panels have a reset GPIO, but the second one has some extra complexity: some boards have a PicoDLP projector, which shares resources with the LCD2. We don't currently support switching between the PicoDL and the LCD2, so we use pin pull-ups and pull-downs to select the LCD2. GPIO40 is pulled down, which disables the PicoDLP power. GPIO59 is pulled up, which selects the LCD2. Signed-off-by: Tomi Valkeinen --- arch/arm/boot/dts/omap4-sdp.dts | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/arch/arm/boot/dts/omap4-sdp.dts b/arch/arm/boot/dts/omap4-sdp.dts index 7951b4e..ed14a7a 100644 --- a/arch/arm/boot/dts/omap4-sdp.dts +++ b/arch/arm/boot/dts/omap4-sdp.dts @@ -166,6 +166,8 @@ &mcbsp2_pins &dss_hdmi_pins &tpd12s015_pins + &lcd1_pins + &lcd2_pins >; uart2_pins: pinmux_uart2_pins { @@ -268,6 +270,25 @@ >; }; + lcd1_pins: pinmux_lcd1_pins { + pinctrl-single,pins = < + 0x52 (PIN_OUTPUT_PULLDOWN | MUX_MODE3) /* gpio_102 */ + >; + }; + + /* + * GPIO 59 is used to switch between LCD2 and PicoDLP. We don't support + * the switching, so set the pin to PULLUP which enables the LCD2. + * GPIO 40 enables power to PicoDLP. Use PULLDOWN to disable power. + */ + lcd2_pins: pinmux_lcd2_pins { + pinctrl-single,pins = < + 0x20 (PIN_OUTPUT_PULLDOWN | MUX_MODE3) /* gpio_40 */ + 0x46 (PIN_OUTPUT_PULLUP | MUX_MODE3) /* gpio_59 */ + 0x56 (PIN_OUTPUT_PULLDOWN | MUX_MODE3) /* gpio_104 */ + >; + }; + i2c1_pins: pinmux_i2c1_pins { pinctrl-single,pins = < 0xe2 (PIN_INPUT_PULLUP | MUX_MODE0) /* i2c1_scl */