From patchwork Fri Jan 9 19:11:20 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 42914 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f71.google.com (mail-ee0-f71.google.com [74.125.83.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id A62122055F for ; Fri, 9 Jan 2015 19:13:43 +0000 (UTC) Received: by mail-ee0-f71.google.com with SMTP id c13sf9149185eek.2 for ; Fri, 09 Jan 2015 11:13:42 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:subject:date:message-id:cc :precedence:list-id:list-unsubscribe:list-archive:list-post :list-help:list-subscribe:mime-version:content-type :content-transfer-encoding:sender:errors-to:x-original-sender :x-original-authentication-results:mailing-list; bh=O92E3okqhRLe7rYQnWOuROLRjqvBy6INVHL8e+nMju0=; b=fXLlR+qGBqgw0LF7uq0130A5WC3HmH18x+ZokC924bPB6veeDXvuYwGA9KbPQQsRVD u6KeRZXDOZki1AXus6ZLwk7zdA4Gnq65dichQCiCFti2JzKfsYgyjQRM9muxvP+2vWW6 E86YLrbBPBEqRsxadJ1uYWNLNGMGbUUUjeBoFvWxY1y0XJe142k5P1PPrvcnjt0K5H7Q FPa/YmWuPEQC9UWneAEqHc6LrbmBYbCSaAYgVLnHonfeW9WsmaMOrv/wM7/NOvXyM2Rb fEKSwuCxAOS2+MiYZf7lMItmykIkibzQb6BxjfUQTH1yiDR2TTbpgsUol8ULTPGhXfJg jwWA== X-Gm-Message-State: ALoCoQln85BPISZxXRhBLCSnA87i/A14qHCKVZd6EBiMiaCq4X1s/W2naGlBW54Xu/47sR70QrUC X-Received: by 10.112.141.98 with SMTP id rn2mr2228030lbb.2.1420830822771; Fri, 09 Jan 2015 11:13:42 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.29.202 with SMTP id m10ls417648lah.76.gmail; Fri, 09 Jan 2015 11:13:42 -0800 (PST) X-Received: by 10.152.87.100 with SMTP id w4mr23360813laz.71.1420830822631; Fri, 09 Jan 2015 11:13:42 -0800 (PST) Received: from mail-lb0-f176.google.com (mail-lb0-f176.google.com. [209.85.217.176]) by mx.google.com with ESMTPS id b1si13998315lab.72.2015.01.09.11.13.42 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 09 Jan 2015 11:13:42 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.176 as permitted sender) client-ip=209.85.217.176; Received: by mail-lb0-f176.google.com with SMTP id p9so9697192lbv.7 for ; Fri, 09 Jan 2015 11:13:42 -0800 (PST) X-Received: by 10.152.6.132 with SMTP id b4mr23648037laa.59.1420830822465; Fri, 09 Jan 2015 11:13:42 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.9.200 with SMTP id c8csp427593lbb; Fri, 9 Jan 2015 11:13:41 -0800 (PST) X-Received: by 10.69.26.130 with SMTP id iy2mr26089985pbd.93.1420830820820; Fri, 09 Jan 2015 11:13:40 -0800 (PST) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id ol12si14692784pab.53.2015.01.09.11.13.39 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Jan 2015 11:13:40 -0800 (PST) Received-SPF: none (google.com: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org does not designate permitted sender hosts) client-ip=2001:1868:205::9; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Y9eyU-00087t-PI; Fri, 09 Jan 2015 19:11:58 +0000 Received: from mail-la0-f52.google.com ([209.85.215.52]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Y9eyR-00084r-Mp for linux-arm-kernel@lists.infradead.org; Fri, 09 Jan 2015 19:11:56 +0000 Received: by mail-la0-f52.google.com with SMTP id hs14so16607798lab.11 for ; Fri, 09 Jan 2015 11:11:31 -0800 (PST) X-Received: by 10.152.26.201 with SMTP id n9mr23612395lag.50.1420830691627; Fri, 09 Jan 2015 11:11:31 -0800 (PST) Received: from localhost.localdomain (c83-251-167-210.bredband.comhem.se. [83.251.167.210]) by mx.google.com with ESMTPSA id r5sm2042170lae.34.2015.01.09.11.11.27 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Jan 2015 11:11:30 -0800 (PST) From: Linus Walleij To: arm@kernel.org Subject: [PATCH] ARM: nomadik: fix up leftover device tree pins Date: Fri, 9 Jan 2015 20:11:20 +0100 Message-Id: <1420830680-18611-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.9.3 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150109_111155_938202_63C32606 X-CRM114-Status: GOOD ( 11.05 ) X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.215.52 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.215.52 listed in wl.mailspike.net] -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders Cc: Linus Walleij , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 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+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: linus.walleij@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.176 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 We altered the device tree bindings for the Nomadik family of pin controllers to be standard, this file was merged out-of-order so we missed fixing this. Fix it up. Signed-off-by: Linus Walleij --- ARM SoC guys: please pick this directly for fixes, I have no other Nomadik fixes for this merge window AFAIK. --- arch/arm/boot/dts/ste-nomadik-nhk15.dts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/ste-nomadik-nhk15.dts b/arch/arm/boot/dts/ste-nomadik-nhk15.dts index a1b9deecb23a..aba2efead02e 100644 --- a/arch/arm/boot/dts/ste-nomadik-nhk15.dts +++ b/arch/arm/boot/dts/ste-nomadik-nhk15.dts @@ -25,11 +25,11 @@ stmpe2401_1 { stmpe2401_1_nhk_mode: stmpe2401_1_nhk { nhk_cfg1 { - ste,pins = "GPIO76_B20"; // IRQ line + pins = "GPIO76_B20"; // IRQ line ste,input = <0>; }; nhk_cfg2 { - ste,pins = "GPIO77_B8"; // reset line + pins = "GPIO77_B8"; // reset line ste,output = <1>; }; }; @@ -37,11 +37,11 @@ stmpe2401_2 { stmpe2401_2_nhk_mode: stmpe2401_2_nhk { nhk_cfg1 { - ste,pins = "GPIO78_A8"; // IRQ line + pins = "GPIO78_A8"; // IRQ line ste,input = <0>; }; nhk_cfg2 { - ste,pins = "GPIO79_C9"; // reset line + pins = "GPIO79_C9"; // reset line ste,output = <1>; }; };