From patchwork Tue Jun 18 08:51:58 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 2740001 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 022489F472 for ; Tue, 18 Jun 2013 08:54:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D16EA20365 for ; Tue, 18 Jun 2013 08:54:45 +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 A68DB20360 for ; Tue, 18 Jun 2013 08:54:44 +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 1UorfB-0000H1-Qc; Tue, 18 Jun 2013 08:53:18 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Uoret-0000sK-33; Tue, 18 Jun 2013 08:52:59 +0000 Received: from mail-wi0-x232.google.com ([2a00:1450:400c:c05::232]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UoreV-0000or-4E for linux-arm-kernel@lists.infradead.org; Tue, 18 Jun 2013 08:52:35 +0000 Received: by mail-wi0-f178.google.com with SMTP id k10so2973476wiv.17 for ; Tue, 18 Jun 2013 01:52:13 -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:in-reply-to:references :x-gm-message-state; bh=kIeM52zYpomOEe5LNjcvV7TAHGiwy1y3zNe48ZznOz4=; b=ltx3TSYmyiQHnII9xXZ1xo168Q3ka/TV1Uh0DL2KWw54qPalIfLrnMmjVbFHK1tPQ2 WJDQUxD48X+MoZdcRlZvIt+OetlS5QciwSNgoQLH7RXRo85zh98llYuL4nu0aslgzAkk USFNtXTvJG68p51AFCBxjr7uC/gcrGRHT/vEXaq/nQSza6DfN5oq2F8km4jrcMWMDV+C IH0yphbxPLtzanXXrCKThe6Htv4ElOIbr3FN24kjcwjvyk73iElcxzz4wWYnmZg69oPU tBtGo3b1Dh5cppmYHnUfMr6v2RH2lcWl0p5WAxNimFFxnPJDfU35pfJ8scsErC+RTa2Z d5Bg== X-Received: by 10.180.76.200 with SMTP id m8mr7037225wiw.24.1371545533228; Tue, 18 Jun 2013 01:52:13 -0700 (PDT) Received: from localhost.localdomain (cpc34-aztw25-2-0-cust250.18-1.cable.virginmedia.com. [86.16.136.251]) by mx.google.com with ESMTPSA id fs8sm549000wib.0.2013.06.18.01.52.11 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 18 Jun 2013 01:52:12 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/3] ARM: ux500: Correct the EN_3v3 regulator's on/off GPIO Date: Tue, 18 Jun 2013 09:51:58 +0100 Message-Id: <1371545519-27119-3-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1371545519-27119-1-git-send-email-lee.jones@linaro.org> References: <1371545519-27119-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQkzbUFk/c9b9xEKZcxqKlAPNo9DNPhYzKL/s31qLRHDI8V/1XycRM97Fx7o2Hnkt9DxvlbH X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130618_045235_311159_BB9BE6CE X-CRM114-Status: GOOD ( 11.32 ) X-Spam-Score: -1.9 (-) Cc: Lee Jones , linus.walleij@stericsson.com, arnd@arndb.de, srinidhi.kasagar@stericsson.com 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=-5.4 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 When this node was added, the AB8500 GPIO driver was pretty broken. As a hack, we pretended that NOMADIK GPIO 26 was the correct on/off pin, as it was unused. It worked because AB8500 GPIO 26 was in an 'always on from boot' state. Now the AB8500 GPIO driver is working, the default state for all the pins is 'off'. Let's flip back over to use the correct GPIO which is _actually_ attached to the regulator. We're also taking the opportunity to straighten out some formatting misdemeanours, swapping spaces for tabs. Signed-off-by: Lee Jones --- arch/arm/boot/dts/snowball.dts | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/arch/arm/boot/dts/snowball.dts b/arch/arm/boot/dts/snowball.dts index fb9dce5..49824be 100644 --- a/arch/arm/boot/dts/snowball.dts +++ b/arch/arm/boot/dts/snowball.dts @@ -22,12 +22,13 @@ en_3v3_reg: en_3v3 { compatible = "regulator-fixed"; - regulator-name = "en-3v3-fixed-supply"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - gpios = <&gpio0 26 0x4>; // 26 - startup-delay-us = <5000>; - enable-active-high; + regulator-name = "en-3v3-fixed-supply"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + /* AB8500 GPIOs start from 1 - offset 25 is GPIO26. */ + gpio = <&ab8500_gpio 25 0x4>; + startup-delay-us = <5000>; + enable-active-high; }; gpio_keys {