From patchwork Wed Jan 20 15:33:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roger Shimizu X-Patchwork-Id: 8072561 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 334479F96D for ; Wed, 20 Jan 2016 15:36:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C21C6204AE for ; Wed, 20 Jan 2016 15:36:30 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9C72D204A7 for ; Wed, 20 Jan 2016 15:36:28 +0000 (UTC) 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 1aLumf-0008M8-D8; Wed, 20 Jan 2016 15:34:57 +0000 Received: from mail-pa0-x241.google.com ([2607:f8b0:400e:c03::241]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aLumY-0008K7-8Q for linux-arm-kernel@lists.infradead.org; Wed, 20 Jan 2016 15:34:51 +0000 Received: by mail-pa0-x241.google.com with SMTP id pv5so524431pac.0 for ; Wed, 20 Jan 2016 07:34:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ytEJvAFXx4AOUHUp+zL0yFl0U9pqFEYls+QzeZrXuwI=; b=ATpiddEOB4YiUTndRB7pgIGluZv6PZPyQTRerig7EuBJ0KUbGLf/ZJDjT8Knb90ybm cJyEFXCesswMMTiw7Uj7AF3s2XYFY6yQHz0DMSy1yCX3cessvwuDiTNweSNNxzA8J5gH p7AZBZ2eXwgG3ZQYiKqkojnpP2/W6k8S79+oGtj45UBCw2FM0Cy/+2U9kCHob8YnPVhF GjylyoOLTYmV4AZ5wvP5BVH8SLjqYvrX4iZciZnu1+T4xwxl5YWhecXxM1pj8XTYpY4M 3t9Ma3U7ux6Q6p2rciO9f8WWy+o6k/4Rqdw2duRQISdi5R+z2IXwNHU2AxWRHEwaqu/V wj1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ytEJvAFXx4AOUHUp+zL0yFl0U9pqFEYls+QzeZrXuwI=; b=CyVIoTwAmTXoxltUT0AWDfOP8lFH1ez03c+zmjt1ca1RF+z5P8QcSpzT62MQorHp+f cO6FtezZQPIL3KNuF99cG4yyxRJdM6Wd6L0LqzAwvHAgN3nPfDlT9kGgaWL5494ZaXYZ L26WmT4PSPIvz0twcuyGDUeAiQ28drqsFOSB/RlIqAR3LCV5yUSsNeD8ugVcYe+hLfHH MmKDdnRgyZAGLmLiwLHtT7Ig4Xg/HXpoVR+nuCGEv7pjMU1BItqp+dTsHw11xoJiIHNN dL7uVkN3BRNZi8tulCUk1SraOIf6hqQATlGUbKEMnPp7UvJrwX3zmKCb8Ruf8j/vdmyQ WI5g== X-Gm-Message-State: ALoCoQlP327fpldqnk7H9+lWSNF51g1kvgY+GOfztS1gDeDlAL/uE7P0oTaN3kaNbod7TQADNFYZj5FR3/vXyHAQe+fmZL4/kQ== X-Received: by 10.66.122.36 with SMTP id lp4mr53783885pab.31.1453304069425; Wed, 20 Jan 2016 07:34:29 -0800 (PST) Received: from FlatStation.localet.com. (ai126185093166.16.access-internet.ne.jp. [126.185.93.166]) by smtp.gmail.com with ESMTPSA id yl1sm49936474pac.35.2016.01.20.07.34.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 20 Jan 2016 07:34:28 -0800 (PST) From: Roger Shimizu To: Jason Cooper , Andrew Lunn , Gregory Clement , Sebastian Hesselbarth Subject: [PATCH v2 1/7] ARM: dts: kirkwood: gpio pin fixes for linkstation ls-wxl/wsxl Date: Thu, 21 Jan 2016 00:33:52 +0900 Message-Id: <1453304038-28345-2-git-send-email-rogershimizu@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1453304038-28345-1-git-send-email-rogershimizu@gmail.com> References: <1453211342-25214-1-git-send-email-rogershimizu@gmail.com> <1453304038-28345-1-git-send-email-rogershimizu@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160120_073450_428435_CC31E92D X-CRM114-Status: GOOD ( 12.70 ) X-Spam-Score: -2.7 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Roger Shimizu , linux-arm-kernel@lists.infradead.org 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.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, 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 For kirkwood, gpio pins starts from 32 are in the 2nd bank, so it should be converted to "gpio1 " in dts file. e.g. gpio 40 should be "gpio1 8" Besides, a few other pin fixes for ls-wxl/wsxl, to match with mpp pin definition: - gpio-leds: "lswxl:blue:power" pin - gpio-leds: "lswxl:red:func" pin - gpio-leds: "lswxl:red:hdderr0" pin - gpio-leds: "lswxl:red:hdderr1" pin - gpio-fan: low/high/alarm pin The pin/bank issue was found when discussing Debian Bug #810894 [https://bugs.debian.org/810894#47] Fixes: e54e4b1b622e ("ARM: dts: add buffalo linkstation ls-wxl/wsxl") Reported-by: Arnaud Patard (Rtp) Signed-off-by: Roger Shimizu --- arch/arm/boot/dts/kirkwood-lswxl.dts | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/arch/arm/boot/dts/kirkwood-lswxl.dts b/arch/arm/boot/dts/kirkwood-lswxl.dts index f5db16a08597..0e93f6d19259 100644 --- a/arch/arm/boot/dts/kirkwood-lswxl.dts +++ b/arch/arm/boot/dts/kirkwood-lswxl.dts @@ -1,7 +1,8 @@ /* * Device Tree file for Buffalo Linkstation LS-WXL/WSXL * - * Copyright (C) 2015, rogershimizu@gmail.com + * Copyright (C) 2015, 2016 + * Roger Shimizu * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -156,21 +157,21 @@ button@1 { label = "Function Button"; linux,code = ; - gpios = <&gpio1 41 GPIO_ACTIVE_LOW>; + gpios = <&gpio1 9 GPIO_ACTIVE_LOW>; }; button@2 { label = "Power-on Switch"; linux,code = ; linux,input-type = <5>; - gpios = <&gpio1 42 GPIO_ACTIVE_LOW>; + gpios = <&gpio1 10 GPIO_ACTIVE_LOW>; }; button@3 { label = "Power-auto Switch"; linux,code = ; linux,input-type = <5>; - gpios = <&gpio1 43 GPIO_ACTIVE_LOW>; + gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; }; }; @@ -185,12 +186,12 @@ led@1 { label = "lswxl:blue:func"; - gpios = <&gpio1 36 GPIO_ACTIVE_LOW>; + gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; }; led@2 { label = "lswxl:red:alarm"; - gpios = <&gpio1 49 GPIO_ACTIVE_LOW>; + gpios = <&gpio1 17 GPIO_ACTIVE_LOW>; }; led@3 { @@ -200,23 +201,23 @@ led@4 { label = "lswxl:blue:power"; - gpios = <&gpio1 8 GPIO_ACTIVE_LOW>; + gpios = <&gpio1 7 GPIO_ACTIVE_LOW>; }; led@5 { label = "lswxl:red:func"; - gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; + gpios = <&gpio1 2 GPIO_ACTIVE_LOW>; default-state = "keep"; }; led@6 { label = "lswxl:red:hdderr0"; - gpios = <&gpio1 2 GPIO_ACTIVE_LOW>; + gpios = <&gpio0 8 GPIO_ACTIVE_LOW>; }; led@7 { label = "lswxl:red:hdderr1"; - gpios = <&gpio1 3 GPIO_ACTIVE_LOW>; + gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; }; }; @@ -225,15 +226,15 @@ pinctrl-0 = <&pmx_fan_low &pmx_fan_high &pmx_fan_lock>; pinctrl-names = "default"; - gpios = <&gpio0 47 GPIO_ACTIVE_LOW - &gpio0 48 GPIO_ACTIVE_LOW>; + gpios = <&gpio1 16 GPIO_ACTIVE_LOW + &gpio1 15 GPIO_ACTIVE_LOW>; gpio-fan,speed-map = <0 3 1500 2 3250 1 5000 0>; - alarm-gpios = <&gpio1 49 GPIO_ACTIVE_HIGH>; + alarm-gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>; }; restart_poweroff { @@ -256,7 +257,7 @@ enable-active-high; regulator-always-on; regulator-boot-on; - gpio = <&gpio0 37 GPIO_ACTIVE_HIGH>; + gpio = <&gpio1 5 GPIO_ACTIVE_HIGH>; }; hdd_power0: regulator@2 { compatible = "regulator-fixed";