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: 17961 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f71.google.com (mail-yh0-f71.google.com [209.85.213.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id A348825CAB for ; Tue, 18 Jun 2013 08:52:15 +0000 (UTC) Received: by mail-yh0-f71.google.com with SMTP id f73sf5298019yha.6 for ; Tue, 18 Jun 2013 01:52:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-beenthere:x-forwarded-to:x-forwarded-for :delivered-to:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe; bh=kIeM52zYpomOEe5LNjcvV7TAHGiwy1y3zNe48ZznOz4=; b=nBZ1UxmSwK1vv1pb6bY7cZsHddRB0JU/M7Pq8W5s5Lt+/PN/QEbW4W+SEBQdySKgif o/VR7weNKjmQ4hJSYO8RVP0KwNybsHqCgJx/iMcUjUFDAAJLiDh6YHaq8VWWjQ1LLcV0 PwpwpSbTVK30Oeyf8TfdtlquuCnx77ygl32DoIhfb5l3F/2fB/nm3Qoi3LXxRRE9pYn6 nU7JKqHMOkOElOMb/xtU7hDTthnxVHbPwhKrILYg7C9jHkTdVc7uBMh7i/nIQRZKonaR 6fgC0SD9KLqCXWFKCeO+t510EKLeQZlT4tSKm27Fb2Xa+aK+A+hwt/dbUJfMV3wexkak xsxg== X-Received: by 10.236.153.202 with SMTP id f50mr11233027yhk.48.1371545535447; Tue, 18 Jun 2013 01:52:15 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.72.233 with SMTP id g9ls1277896qev.84.gmail; Tue, 18 Jun 2013 01:52:15 -0700 (PDT) X-Received: by 10.220.252.66 with SMTP id mv2mr5865813vcb.22.1371545535291; Tue, 18 Jun 2013 01:52:15 -0700 (PDT) Received: from mail-vb0-x22b.google.com (mail-vb0-x22b.google.com [2607:f8b0:400c:c02::22b]) by mx.google.com with ESMTPS id od10si2067493vcb.11.2013.06.18.01.52.15 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 18 Jun 2013 01:52:15 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400c:c02::22b is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=2607:f8b0:400c:c02::22b; Received: by mail-vb0-f43.google.com with SMTP id e12so2689478vbg.30 for ; Tue, 18 Jun 2013 01:52:15 -0700 (PDT) X-Received: by 10.220.105.9 with SMTP id r9mr6000623vco.60.1371545535204; Tue, 18 Jun 2013 01:52:15 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.58.165.8 with SMTP id yu8csp64195veb; Tue, 18 Jun 2013 01:52:14 -0700 (PDT) X-Received: by 10.180.187.37 with SMTP id fp5mr7151435wic.5.1371545533782; Tue, 18 Jun 2013 01:52:13 -0700 (PDT) Received: from mail-wi0-x22e.google.com (mail-wi0-x22e.google.com [2a00:1450:400c:c05::22e]) by mx.google.com with ESMTPS id cd18si101970wib.26.2013.06.18.01.52.13 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 18 Jun 2013 01:52:13 -0700 (PDT) Received-SPF: neutral (google.com: 2a00:1450:400c:c05::22e is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=2a00:1450:400c:c05::22e; Received: by mail-wi0-f174.google.com with SMTP id k10so3164350wiv.1 for ; Tue, 18 Jun 2013 01:52:13 -0700 (PDT) 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 Cc: arnd@arndb.de, linus.walleij@stericsson.com, srinidhi.kasagar@stericsson.com, Lee Jones 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: ALoCoQk3nl/OHuZXUBIJXusG56YcGVdCT4ZaxjhFiHzohMoWrmIqdoZdLCFF9D8hM9HVfRpsGFh7 X-Original-Sender: lee.jones@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c02::22b is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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 {