From patchwork Thu Nov 6 12:01:46 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Enric Balletbo i Serra X-Patchwork-Id: 5241341 Return-Path: X-Original-To: patchwork-linux-omap@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 8A16BC11AD for ; Thu, 6 Nov 2014 12:02:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 747E320108 for ; Thu, 6 Nov 2014 12:02:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EFAA520115 for ; Thu, 6 Nov 2014 12:02:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751399AbaKFMCc (ORCPT ); Thu, 6 Nov 2014 07:02:32 -0500 Received: from mail-wi0-f180.google.com ([209.85.212.180]:35730 "EHLO mail-wi0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751256AbaKFMC1 (ORCPT ); Thu, 6 Nov 2014 07:02:27 -0500 Received: by mail-wi0-f180.google.com with SMTP id hi2so1251760wib.7 for ; Thu, 06 Nov 2014 04:02:25 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=RM8WfSH4SDhenpC2wMw+XffICs1PKLMdJGMKPXeLbRo=; b=DX7q/6AO6uU/LYX7V+JSOZNuzlH7zCU/6tFP31w3jRXd9BN1unvapWB3q4IrVDICy+ ne33jRxYJ4ZmevEbKVWDNNjxEiZx6j3i/LHEYrPLVPE3Wq0wRLvMhn62zlfr6z4VpO+G FF0+0c1D00RCl0mOgcipvLYyc5rs4u6rIaFt7/BoAs1z0Q5svFOXsKKQeNnifDQS8l1Q M+aentqJRLXeV4h4QqnQuxbPYdrTACCOnG0Yfk7l9pX7gj7nsQJuUXN/36uPhMJ6IeHY dI0pFwAPpBKkzruWnPSANcVbTG7f74XxWmBFgTVVjbIVy6v9HaVKfrAnhmlB0PEnKxeG bVRA== X-Received: by 10.180.212.42 with SMTP id nh10mr39708409wic.52.1415275345766; Thu, 06 Nov 2014 04:02:25 -0800 (PST) Received: from localhost.localdomain (43.Red-2-139-180.staticIP.rima-tde.net. [2.139.180.43]) by mx.google.com with ESMTPSA id bc1sm18533956wib.16.2014.11.06.04.02.24 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 06 Nov 2014 04:02:25 -0800 (PST) From: Enric Balletbo i Serra To: linux-omap@vger.kernel.org, tony@atomide.com Cc: javier@dowhile0.org, devicetree@vger.kernel.org, Enric Balletbo i Serra Subject: [PATCH 06/11] ARM: dts: omap3-igep0030-common: Introduce igep0030 common dtsi file. Date: Thu, 6 Nov 2014 13:01:46 +0100 Message-Id: <1415275311-6857-7-git-send-email-eballetbo@iseebcn.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1415275311-6857-1-git-send-email-eballetbo@iseebcn.com> References: <1415275311-6857-1-git-send-email-eballetbo@iseebcn.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 Use the omap3-igep0030-common.dtsi file and remove repeated parts leaving the nodes that are not common between IGEP COM MODULE hardware revisions. Signed-off-by: Enric Balletbo i Serra Acked-by: Javier Martinez Canillas --- arch/arm/boot/dts/omap3-igep0030-common.dtsi | 60 ++++++++++++++++++++++++++++ arch/arm/boot/dts/omap3-igep0030.dts | 58 +++++---------------------- 2 files changed, 69 insertions(+), 49 deletions(-) create mode 100644 arch/arm/boot/dts/omap3-igep0030-common.dtsi diff --git a/arch/arm/boot/dts/omap3-igep0030-common.dtsi b/arch/arm/boot/dts/omap3-igep0030-common.dtsi new file mode 100644 index 0000000..0cb1527 --- /dev/null +++ b/arch/arm/boot/dts/omap3-igep0030-common.dtsi @@ -0,0 +1,60 @@ +/* + * Common Device Tree Source for IGEP COM MODULE + * + * Copyright (C) 2014 Javier Martinez Canillas + * Copyright (C) 2014 Enric Balletbo i Serra + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#include "omap3-igep.dtsi" + +/ { + leds: gpio_leds { + compatible = "gpio-leds"; + + user0 { + label = "omap3:red:user0"; + gpios = <&twl_gpio 18 GPIO_ACTIVE_LOW>; /* LEDA */ + default-state = "off"; + }; + + user1 { + label = "omap3:green:user1"; + gpios = <&twl_gpio 19 GPIO_ACTIVE_LOW>; /* LEDB */ + default-state = "off"; + }; + + user2 { + label = "omap3:red:user1"; + gpios = <&gpio1 16 GPIO_ACTIVE_LOW>; /* gpio_16 */ + default-state = "off"; + }; + }; +}; + +&omap3_pmx_core { + uart2_pins: pinmux_uart2_pins { + pinctrl-single,pins = < + OMAP3_CORE1_IOPAD(0x216c, PIN_INPUT | MUX_MODE1) /* mcbsp3_dx.uart2_cts */ + OMAP3_CORE1_IOPAD(0x216e, PIN_OUTPUT | MUX_MODE1) /* mcbsp3_dr.uart2_rts */ + OMAP3_CORE1_IOPAD(0x2170, PIN_OUTPUT | MUX_MODE1) /* mcbsp3_clk.uart2_tx */ + OMAP3_CORE1_IOPAD(0x2172, PIN_INPUT | MUX_MODE1) /* mcbsp3_fsx.uart2_rx */ + >; + }; +}; + +&omap3_pmx_core2 { + leds_core2_pins: pinmux_leds_core2_pins { + pinctrl-single,pins = < + OMAP3630_CORE2_IOPAD(0x25e0, PIN_OUTPUT | MUX_MODE4) /* etk_d2.gpio_16 */ + >; + }; +}; + +&uart2 { + pinctrl-names = "default"; + pinctrl-0 = <&uart2_pins>; +}; diff --git a/arch/arm/boot/dts/omap3-igep0030.dts b/arch/arm/boot/dts/omap3-igep0030.dts index cc2a374..8150f47 100644 --- a/arch/arm/boot/dts/omap3-igep0030.dts +++ b/arch/arm/boot/dts/omap3-igep0030.dts @@ -9,42 +9,12 @@ * published by the Free Software Foundation. */ -#include "omap3-igep.dtsi" +#include "omap3-igep0030-common.dtsi" / { model = "IGEP COM MODULE Rev. E (TI OMAP AM/DM37x)"; compatible = "isee,omap3-igep0030", "ti,omap36xx", "ti,omap3"; - leds { - pinctrl-names = "default"; - pinctrl-0 = <&leds_pins>; - compatible = "gpio-leds"; - - boot { - label = "omap3:green:boot"; - gpios = <&twl_gpio 13 GPIO_ACTIVE_LOW>; - default-state = "on"; - }; - - user0 { - label = "omap3:red:user0"; - gpios = <&twl_gpio 18 GPIO_ACTIVE_LOW>; /* LEDA */ - default-state = "off"; - }; - - user1 { - label = "omap3:green:user1"; - gpios = <&twl_gpio 19 GPIO_ACTIVE_LOW>; /* LEDB */ - default-state = "off"; - }; - - user2 { - label = "omap3:red:user1"; - gpios = <&gpio1 16 GPIO_ACTIVE_LOW>; - default-state = "off"; - }; - }; - /* Regulator to trigger the WIFI_PDN signal of the Wifi module */ lbee1usjyc_pdn: lbee1usjyc_pdn { compatible = "regulator-fixed"; @@ -75,22 +45,16 @@ OMAP3_CORE1_IOPAD(0x216a, PIN_OUTPUT | MUX_MODE4) /* sdmmc2_dat7.gpio_139 - RST_N_B */ >; }; - - uart2_pins: pinmux_uart2_pins { - pinctrl-single,pins = < - OMAP3_CORE1_IOPAD(0x216c, PIN_INPUT | MUX_MODE1) /* mcbsp3_dx.uart2_cts */ - OMAP3_CORE1_IOPAD(0x216e, PIN_OUTPUT | MUX_MODE1) /* mcbsp3_dr.uart2_rts */ - OMAP3_CORE1_IOPAD(0x2170, PIN_OUTPUT | MUX_MODE1) /* mcbsp3_clk.uart2_tx */ - OMAP3_CORE1_IOPAD(0x2172, PIN_INPUT | MUX_MODE1) /* mcbsp3_fsx.uart2_rx */ - >; - }; }; -&omap3_pmx_core2 { - leds_pins: pinmux_leds_pins { - pinctrl-single,pins = < - OMAP3630_CORE2_IOPAD(0x25e0, PIN_OUTPUT | MUX_MODE4) /* etk_d2.gpio_16 */ - >; +&leds { + pinctrl-names = "default"; + pinctrl-0 = <&leds_core2_pins>; + + boot { + label = "omap3:green:boot"; + gpios = <&twl_gpio 13 GPIO_ACTIVE_LOW>; /* LEDSYNC */ + default-state = "on"; }; }; @@ -104,7 +68,3 @@ non-removable; }; -&uart2 { - pinctrl-names = "default"; - pinctrl-0 = <&uart2_pins>; -};