From patchwork Thu Nov 19 00:32:27 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 7653861 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 4ABDBBF90C for ; Thu, 19 Nov 2015 01:23:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 806382053C for ; Thu, 19 Nov 2015 01:23:18 +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 115F5204F6 for ; Thu, 19 Nov 2015 01:23:17 +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 1ZzDUb-0001oa-1U; Thu, 19 Nov 2015 00:54:29 +0000 Received: from casper.infradead.org ([2001:770:15f::2]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZzDUW-0001Rr-II; Thu, 19 Nov 2015 00:54:26 +0000 Received: from mout.kundenserver.de ([217.72.192.73]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZyrZE-0004QZ-RV; Wed, 18 Nov 2015 01:29:52 +0000 Received: from localhost.localdomain ([95.91.39.67]) by mrelayeu.kundenserver.de (mreue103) with ESMTPSA (Nemesis) id 0LrqDW-1aN67O2AzG-013hI1; Thu, 19 Nov 2015 01:32:36 +0100 From: Stefan Wahren To: Linus Walleij , Stephen Warren , Lee Jones , Eric Anholt Subject: [PATCH] pinctrl: bcm2835: Fix initial value for direction_output Date: Thu, 19 Nov 2015 00:32:27 +0000 Message-Id: <1447893147-9458-1-git-send-email-stefan.wahren@i2se.com> X-Mailer: git-send-email 1.7.9.5 X-Provags-ID: V03:K0:n0SN4S1rgxXmYmRg/76YNnjQ/bz2IGdvppiBdynyfSXdZ+/bYWU +Rj+nJrwZOHGRDpChhMWnEppF56ndwafO1XGcaBwO+b1MK2tN6vgLZFT1tAogM//8fq1rqB x4WT5etESVZJH4nBtj7FjVJCCe7bv6Vn6HZCWlidhfU9+7av1KLv7bpM4ZKgNpA0Thx1nSe WWCooQ0+fDceMoGbgLW0A== X-UI-Out-Filterresults: notjunk:1; V01:K0:suU7jpkgcfE=:QIsQ9KaC6mapSyuTDiT1ou RsDTY0dtR8ivsdD0L8ZbA2Y//uzbJvEjWCoJrARxhMwuKGUlBRF3oeW4ZOLrEDPxrKRFlP+ki DGcsnGWcctDdEIC6ylAwc/E7sQReaaf6IWJobCfcKb9/uBzXfloxIhLieZUALBRDO1yJHBHI4 1gJj8L0KKVYlpseMMDh07P6QRGApgvqQGuBGOgjqJwI2gX8cgbOyb0FmGiLyxEz2C59SjGRfu uk07BbSXC+d/tx4FslmiiegZL3W3wTI7UnF3r4rip+X9ciquzxzI/WsKkWC+ppr5b18eBRCXC VpwbIAM6PxAPUjkvopXrjy4da36Y/cMvGgyWSAHHDTmpS6HbHXCed7oS4GiWFewXR+gF8CchN G73BT/8KVGmh68hl5YFwBr1t6PE4IdHstcdVT2bupTcPvIvHCEsNZPJ3TfB5tHst5Tqv+Qqke /A3phEAJoJrT2X7vF/9ZKbp/ktVmpQrQarbLRm7uapLmZmuDmpw9KdXhllyQRL/VeORHtz7AT mRqxDy7TO6D1k4z30X/cwgP1kpR/+EUfHt8nGhobEcZrYjvZN55bmZiJEV6Yqr8/YnDazFxKi /2VZ/OuC2BRJITgTj7Z7x6tCy1mA5o/dvzTp3c8MehIeAyCBTrbfO7sgcyVA3PbbTLD7esna7 wTppvLegog8026Ytjcn/Y6o6ZOMnGt0a9r5cip/O1ZGfboVLqKnOSrCw3rIOBNWYwG+0= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151118_012949_173286_260C865C X-CRM114-Status: GOOD ( 13.22 ) X-Spam-Score: -2.6 (--) 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: Stefan Wahren , linux-gpio@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Martin Sperl 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.8 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 Currently the provided initial value for bcm2835_gpio_direction_output has no effect. So fix this issue by changing the value before changing the GPIO direction. As a result we need to move the function below bcm2835_gpio_set. Signed-off-by: Stefan Wahren CC: Martin Sperl CC: Stephen Warren Acked-by: Eric Anholt Acked-by: Stephen Warren --- This patch was inspired by this discussion [1]. [1] - http://lists.infradead.org/pipermail/linux-rpi-kernel/2015-April/001499.html drivers/pinctrl/bcm/pinctrl-bcm2835.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/pinctrl/bcm/pinctrl-bcm2835.c b/drivers/pinctrl/bcm/pinctrl-bcm2835.c index 8efa235..fd1441b 100644 --- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c +++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c @@ -352,12 +352,6 @@ static int bcm2835_gpio_get(struct gpio_chip *chip, unsigned offset) return bcm2835_gpio_get_bit(pc, GPLEV0, offset); } -static int bcm2835_gpio_direction_output(struct gpio_chip *chip, - unsigned offset, int value) -{ - return pinctrl_gpio_direction_output(chip->base + offset); -} - static void bcm2835_gpio_set(struct gpio_chip *chip, unsigned offset, int value) { struct bcm2835_pinctrl *pc = dev_get_drvdata(chip->dev); @@ -365,6 +359,13 @@ static void bcm2835_gpio_set(struct gpio_chip *chip, unsigned offset, int value) bcm2835_gpio_set_bit(pc, value ? GPSET0 : GPCLR0, offset); } +static int bcm2835_gpio_direction_output(struct gpio_chip *chip, + unsigned offset, int value) +{ + bcm2835_gpio_set(chip, offset, value); + return pinctrl_gpio_direction_output(chip->base + offset); +} + static int bcm2835_gpio_to_irq(struct gpio_chip *chip, unsigned offset) { struct bcm2835_pinctrl *pc = dev_get_drvdata(chip->dev);