From patchwork Sun Dec 8 15:48:07 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Lunn X-Patchwork-Id: 3307231 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 54495C0D4A for ; Sun, 8 Dec 2013 15:49:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 743BF2017D for ; Sun, 8 Dec 2013 15:49:24 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0646220150 for ; Sun, 8 Dec 2013 15:49:19 +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 1VpgbK-0005DQ-Qw; Sun, 08 Dec 2013 15:48:58 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VpgbI-0004Ba-F6; Sun, 08 Dec 2013 15:48:56 +0000 Received: from vps0.lunn.ch ([178.209.37.122]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VpgbE-0004BF-TX for linux-arm-kernel@lists.infradead.org; Sun, 08 Dec 2013 15:48:53 +0000 Received: from lunn by vps0.lunn.ch with local (Exim 4.80) (envelope-from ) id 1Vpgaf-0007VK-6K; Sun, 08 Dec 2013 16:48:17 +0100 From: Andrew Lunn To: Sebastian Hesselbarth , Jason Cooper Subject: [PATCH] ARM: DT: Dove: Use symbolic names from gpio.h Date: Sun, 8 Dec 2013 16:48:07 +0100 Message-Id: <1386517687-28820-1-git-send-email-andrew@lunn.ch> X-Mailer: git-send-email 1.7.10.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131208_104853_080682_AF577F9A X-CRM114-Status: UNSURE ( 8.22 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.0 (--) Cc: Andrew Lunn , linux ARM 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 X-Spam-Status: No, score=-4.3 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 Replace 0 and 1 with GPIO_ACTIVE_HIGH, GPIO_ACTIVE_LOW Signed-off-by: Andrew Lunn --- arch/arm/boot/dts/dove-cubox.dts | 8 ++++---- arch/arm/boot/dts/dove-d2plug.dts | 6 +++--- arch/arm/boot/dts/dove-d3plug.dts | 12 ++++++------ arch/arm/boot/dts/dove.dtsi | 1 + 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/arch/arm/boot/dts/dove-cubox.dts b/arch/arm/boot/dts/dove-cubox.dts index 7a70f4ca502a..66eab1836ebf 100644 --- a/arch/arm/boot/dts/dove-cubox.dts +++ b/arch/arm/boot/dts/dove-cubox.dts @@ -22,7 +22,7 @@ power { label = "Power"; - gpios = <&gpio0 18 1>; + gpios = <&gpio0 18 GPIO_ACTIVE_LOW>; default-state = "keep"; }; }; @@ -41,7 +41,7 @@ enable-active-high; regulator-always-on; regulator-boot-on; - gpio = <&gpio0 1 0>; + gpio = <&gpio0 1 GPIO_ACTIVE_HIGH>; pinctrl-0 = <&pmx_gpio_1>; pinctrl-names = "default"; }; @@ -58,7 +58,7 @@ ir_recv: ir-receiver { compatible = "gpio-ir-receiver"; - gpios = <&gpio0 19 1>; + gpios = <&gpio0 19 GPIO_ACTIVE_LOW>; pinctrl-0 = <&pmx_gpio_19>; pinctrl-names = "default"; }; @@ -112,7 +112,7 @@ &sdio0 { status = "okay"; /* sdio0 card detect is connected to wrong pin on CuBox */ - cd-gpios = <&gpio0 12 1>; + cd-gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; pinctrl-0 = <&pmx_sdio0 &pmx_gpio_12>; }; diff --git a/arch/arm/boot/dts/dove-d2plug.dts b/arch/arm/boot/dts/dove-d2plug.dts index c11d3636c8e5..3c1fde81c1e0 100644 --- a/arch/arm/boot/dts/dove-d2plug.dts +++ b/arch/arm/boot/dts/dove-d2plug.dts @@ -22,17 +22,17 @@ wlan-ap { label = "wlan-ap"; - gpios = <&gpio0 0 1>; + gpios = <&gpio0 0 GPIO_ACTIVE_LOW>; }; wlan-act { label = "wlan-act"; - gpios = <&gpio0 1 1>; + gpios = <&gpio0 1 GPIO_ACTIVE_LOW>; }; bluetooth-act { label = "bt-act"; - gpios = <&gpio0 2 1>; + gpios = <&gpio0 2 GPIO_ACTIVE_LOW>; }; }; }; diff --git a/arch/arm/boot/dts/dove-d3plug.dts b/arch/arm/boot/dts/dove-d3plug.dts index f5f59bb5a534..a31efaa2edd2 100644 --- a/arch/arm/boot/dts/dove-d3plug.dts +++ b/arch/arm/boot/dts/dove-d3plug.dts @@ -22,17 +22,17 @@ wlan-act { label = "wlan-act"; - gpios = <&gpio0 0 1>; + gpios = <&gpio0 0 GPIO_ACTIVE_LOW>; }; wlan-ap { label = "wlan-ap"; - gpios = <&gpio0 1 1>; + gpios = <&gpio0 1 GPIO_ACTIVE_LOW>; }; status { label = "status"; - gpios = <&gpio0 2 1>; + gpios = <&gpio0 2 GPIO_ACTIVE_LOW>; }; }; @@ -50,7 +50,7 @@ enable-active-high; regulator-always-on; regulator-boot-on; - gpio = <&gpio0 8 0>; + gpio = <&gpio0 8 GPIO_ACTIVE_HIGH>; pinctrl-0 = <&pmx_gpio_8>; pinctrl-names = "default"; }; @@ -90,7 +90,7 @@ /* Fresco Logic USB3.0 xHCI controller */ pcie-port@0 { status = "okay"; - reset-gpios = <&gpio0 26 1>; + reset-gpios = <&gpio0 26 GPIO_ACTIVE_LOW>; reset-delay-us = <20000>; pinctrl-0 = <&pmx_camera_gpio>; pinctrl-names = "default"; @@ -98,6 +98,6 @@ /* Mini-PCIe slot */ pcie-port@1 { status = "okay"; - reset-gpios = <&gpio0 25 1>; + reset-gpios = <&gpio0 25 GPIO_ACTIVE_LOW>; }; }; diff --git a/arch/arm/boot/dts/dove.dtsi b/arch/arm/boot/dts/dove.dtsi index db24b41a5264..bad0decdfc83 100644 --- a/arch/arm/boot/dts/dove.dtsi +++ b/arch/arm/boot/dts/dove.dtsi @@ -1,4 +1,5 @@ /include/ "skeleton.dtsi" +#include #define MBUS_ID(target,attributes) (((target) << 24) | ((attributes) << 16))