From patchwork Wed Apr 17 19:09:38 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Murphy X-Patchwork-Id: 2455941 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 3CFC23FC64 for ; Wed, 17 Apr 2013 19:10:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758242Ab3DQTJ7 (ORCPT ); Wed, 17 Apr 2013 15:09:59 -0400 Received: from arroyo.ext.ti.com ([192.94.94.40]:35008 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755943Ab3DQTJ5 (ORCPT ); Wed, 17 Apr 2013 15:09:57 -0400 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id r3HJ9hpe007733; Wed, 17 Apr 2013 14:09:43 -0500 Received: from DLEE71.ent.ti.com (dlee71.ent.ti.com [157.170.170.114]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id r3HJ9huU011204; Wed, 17 Apr 2013 14:09:43 -0500 Received: from dlelxv23.itg.ti.com (172.17.1.198) by DLEE71.ent.ti.com (157.170.170.114) with Microsoft SMTP Server id 14.2.342.3; Wed, 17 Apr 2013 14:09:42 -0500 Received: from legion.dal.design.ti.com (legion.dal.design.ti.com [128.247.22.53]) by dlelxv23.itg.ti.com (8.13.8/8.13.8) with ESMTP id r3HJ9hth014194; Wed, 17 Apr 2013 14:09:43 -0500 Received: from localhost (a0272616-workstation.am.dhcp.ti.com [128.247.78.208]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id r3HJ9hV05518; Wed, 17 Apr 2013 14:09:43 -0500 (CDT) From: Dan Murphy To: , , CC: , , , , Dan Murphy Subject: [PATCH] ARM: dts: omap4-panda: Add LED support into the panda DTS files Date: Wed, 17 Apr 2013 14:09:38 -0500 Message-ID: <1366225778-6083-2-git-send-email-dmurphy@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1366225778-6083-1-git-send-email-dmurphy@ti.com> References: <1366225778-6083-1-git-send-email-dmurphy@ti.com> MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org The GPIO for LED D1 on the omap4-panda a1-a3 rev and the omap4-panda-es are different. Abstract away the pinmux and the LED definitions for the two boards. Signed-off-by: Dan Murphy --- arch/arm/boot/dts/omap4-panda-es.dts | 33 +++++++++++++++++++++++++++++++++ arch/arm/boot/dts/omap4-panda.dts | 22 +++++++++++++++++++++- 2 files changed, 54 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/omap4-panda-es.dts b/arch/arm/boot/dts/omap4-panda-es.dts index 73bc1a6..42fdd86 100644 --- a/arch/arm/boot/dts/omap4-panda-es.dts +++ b/arch/arm/boot/dts/omap4-panda-es.dts @@ -31,3 +31,36 @@ 0x5e 0x100 /* hdmi_sda.hdmi_sda INPUT | MODE 0 */ >; }; + +&leds { + compatible = "gpio-leds"; + heartbeat { + label = "pandaboard::status1"; + gpios = <&gpio4 14 0>; + linux,default-trigger = "heartbeat"; + }; + mmc { + label = "pandaboard::status2"; + gpios = <&gpio1 8 0>; + linux,default-trigger = "gpio"; + }; +}; + +&led_gpio_pins { + pinctrl-single,pins = < + 0xb6 0x3 /* gpio_110 OUTPUT | MODE 3 */ + >; +}; + +&omap4_pmx_wkup { + pinctrl-names = "default"; + pinctrl-0 = < + &led_wkgpio_pins + >; + + led_wkgpio_pins: pinmux_leds_wkpins { + pinctrl-single,pins = < + 0x1c 0x3 /* gpio_wk8 OUTPUT | MODE 3 */ + >; + }; +}; diff --git a/arch/arm/boot/dts/omap4-panda.dts b/arch/arm/boot/dts/omap4-panda.dts index 4122efe..465c4b0b8 100644 --- a/arch/arm/boot/dts/omap4-panda.dts +++ b/arch/arm/boot/dts/omap4-panda.dts @@ -19,7 +19,7 @@ reg = <0x80000000 0x40000000>; /* 1 GB */ }; - leds { + leds: leds{ compatible = "gpio-leds"; heartbeat { label = "pandaboard::status1"; @@ -67,6 +67,7 @@ &mcbsp1_pins &dss_hdmi_pins &tpd12s015_pins + &led_gpio_pins >; twl6040_pins: pinmux_twl6040_pins { @@ -110,6 +111,25 @@ 0x58 0x10b /* hdmi_hpd.gpio_63 INPUT PULLDOWN | MODE3 */ >; }; + + led_gpio_pins: pinmux_leds_pins { + pinctrl-single,pins = < + >; + }; +}; + +&omap4_pmx_wkup { + pinctrl-names = "default"; + pinctrl-0 = < + &led_wkgpio_pins + >; + + led_wkgpio_pins: pinmux_leds_wkpins { + pinctrl-single,pins = < + 0x1a 0x3 /* gpio_wk7 OUTPUT | MODE 3 */ + 0x1c 0x3 /* gpio_wk8 OUTPUT | MODE 3 */ + >; + }; }; &i2c1 {