From patchwork Tue May 23 04:03:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Packham X-Patchwork-Id: 9741881 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5CEF46032B for ; Tue, 23 May 2017 04:03:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4789F28380 for ; Tue, 23 May 2017 04:03:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3C3E928731; Tue, 23 May 2017 04:03:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 01D0E2878F for ; Tue, 23 May 2017 04:03:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760877AbdEWEDd (ORCPT ); Tue, 23 May 2017 00:03:33 -0400 Received: from gate2.alliedtelesis.co.nz ([202.36.163.20]:46154 "EHLO gate2.alliedtelesis.co.nz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760855AbdEWEDc (ORCPT ); Tue, 23 May 2017 00:03:32 -0400 Received: from mmarshal3.atlnz.lc (mmarshal3.atlnz.lc [10.32.18.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by gate2.alliedtelesis.co.nz (Postfix) with ESMTPS id 2F5708364E; Tue, 23 May 2017 16:03:30 +1200 (NZST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alliedtelesis.co.nz; s=mail; t=1495512210; bh=LTpzx3ejbQPtr6CkTFvOsnCatxKh6ukZjTdu9jk/FP4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=j4XsZfGpRre5J0IznwTG+65Bxm38lxZD5fieRhnSTYn/+dtLl8w0Y5m48piiWpE5U sDE9aINq5wCA4xlWXNy1YqNchxddWqurW9lcBqauF4aBxHD74srSOz+Mmb6poXL1yy SVWS+scMZ+xlaIbZqSJzPUqQ25FjVMyqYMvhwt48= Received: from smtp (Not Verified[10.32.16.33]) by mmarshal3.atlnz.lc with Trustwave SEG (v7, 5, 7, 9061) id ; Tue, 23 May 2017 16:03:30 +1200 Received: from chrisp-dl.atlnz.lc (chrisp-dl.ws.atlnz.lc [10.33.22.30]) by smtp (Postfix) with ESMTP id A49E213EF65; Tue, 23 May 2017 16:03:31 +1200 (NZST) Received: by chrisp-dl.atlnz.lc (Postfix, from userid 1030) id 8F2B61E1D4A; Tue, 23 May 2017 16:03:29 +1200 (NZST) From: Chris Packham To: broonie@kernel.org, linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Chris Packham Subject: [PATCH 2/2] spi: use gpio_desc instead of numeric gpio Date: Tue, 23 May 2017 16:03:22 +1200 Message-Id: <20170523040322.10433-2-chris.packham@alliedtelesis.co.nz> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170523040322.10433-1-chris.packham@alliedtelesis.co.nz> References: <20170523040322.10433-1-chris.packham@alliedtelesis.co.nz> Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP By using a gpio_desc and gpiod_set_value() instead of a numeric gpio and gpio_set_value() the gpio flags are taken into account. This is useful when using a gpio chip-select to supplement a controllers native chip-select. Signed-off-by: Chris Packham --- Notes: My specific use-case is I have a board that uses the spi-orion driver but only has one CS pin available. In order to access two spi slave devices the board has a 1-of-2 decoder/demultiplexer which is driven via a gpio. The problem is that for one of the 2 slave devices the gpio level required is opposite to the chip-select so I can't simply specify "spi-cs-high". With this change I can flag the gpio as active low and the gpio subsystem takes care of the additional inversion required. drivers/spi/spi.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 6f87fec409b5..b39c0f9956dd 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -725,7 +725,10 @@ static void spi_set_cs(struct spi_device *spi, bool enable) enable = !enable; if (gpio_is_valid(spi->cs_gpio)) { - gpio_set_value(spi->cs_gpio, !enable); + struct gpio_desc *gpio = gpio_to_desc(spi->cs_gpio); + + if (gpio) + gpiod_set_value(gpio, !enable); /* Some SPI masters need both GPIO CS & slave_select */ if ((spi->master->flags & SPI_MASTER_GPIO_SS) && spi->master->set_cs)