From patchwork Tue Sep 6 12:41:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulrich Hecht X-Patchwork-Id: 9316595 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 EDC8260869 for ; Tue, 6 Sep 2016 12:41:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DDD4C286D7 for ; Tue, 6 Sep 2016 12:41:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D227628CFD; Tue, 6 Sep 2016 12:41:25 +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=-4.4 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, 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 7F6632884F for ; Tue, 6 Sep 2016 12:41:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932406AbcIFMlY (ORCPT ); Tue, 6 Sep 2016 08:41:24 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:34525 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932286AbcIFMlX (ORCPT ); Tue, 6 Sep 2016 08:41:23 -0400 Received: by mail-wm0-f67.google.com with SMTP id w12so8819097wmf.1; Tue, 06 Sep 2016 05:41:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=VM2ArUVAbdualv8EZ/pI6ax/OcsPv6nnf6FNmzcC6x8=; b=AErJplh1+iSiEMZrVqvrbS74zKI2q+hHaVtGlzCmQ5RziZgve/0VLoPdaz401NdyDS KTSq2iTWOduxECB/hnxfAlKxxLFhSdYNWFVjgjKtm5+lbVaDA6M5CV7q9rxz3enXbvKS pbvOFNU83ssqAHeTKW1pAjFbgKA29FxFg9s0Z+m2n8CjB3N313gGV9Ji8fWYWS7qtFJo 8bZKNo44C+C5pnVmTCliHuUHSTH1Hle+dhM9YDPJ3zLGv36sfNErFXLJ+nOh+PcWAIi+ Wu7YHdQMUvgMzuwSLpxjhJwCYW32IqiNehh/HbTOAsJjNof8NWKrIWo0EACy25rxqu54 KzmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=VM2ArUVAbdualv8EZ/pI6ax/OcsPv6nnf6FNmzcC6x8=; b=MexESNBTCJ2EFOsawgdjvs/8B6pEli6crLww4ab36ytE42Q1hhC2rMxUZ88CoEZCwW yQWZ2rsfY3av5muJyAnIAI2aXX+x8/OXdXgndsiDO7gnkZkDr+LM5EpNPcNAM0RASHOW STJx2eo0fqVp/4lSDpSJhmW7ywpaLZ2WTkC8lhngHdoSDFenue3GQhXGZ60gJPBRGKa3 VqpTeiBE3q4dS92jKu401/lYEgWtiluywJSr39s4/drfAxzXU0Y6xwaMz2XyOHOrnuRM oTGbUpwuq2SksQ0zIiKU69wOMJboTwABX6blDa0Ey3N43ohSU4/jVzTNWF8WsM27K6Sl Tf/g== X-Gm-Message-State: AE9vXwP5/zmnPN5//PXfVxZ1fe98vxeFhQ9W9wtq0VuKMKFtr/GOFoA+UxLwwenCBxxPZA== X-Received: by 10.194.90.239 with SMTP id bz15mr24020881wjb.146.1473165682198; Tue, 06 Sep 2016 05:41:22 -0700 (PDT) Received: from groucho.site (ip9234f10a.dynamic.kabel-deutschland.de. [146.52.241.10]) by smtp.gmail.com with ESMTPSA id q65sm26345266wmd.24.2016.09.06.05.41.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 06 Sep 2016 05:41:21 -0700 (PDT) From: Ulrich Hecht To: linux-renesas-soc@vger.kernel.org, geert@linux-m68k.org Cc: broonie@kernel.org, linux-spi@vger.kernel.org, wsa@the-dreams.de, magnus.damm@gmail.com, ulrich.hecht+renesas@gmail.com Subject: [PATCH v2] spi: sh-msiof: request and set cs-gpio direction to output Date: Tue, 6 Sep 2016 14:41:18 +0200 Message-Id: <20160906124118.13979-1-ulrich.hecht+renesas@gmail.com> X-Mailer: git-send-email 2.9.3 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 Required for the CS signal to actually be visible to the device. Signed-off-by: Ulrich Hecht --- This revision uses devm_gpio_request_one() instead of gpio_request()/ gpio_direction_output(), as suggested by Geert. CU Uli drivers/spi/spi-sh-msiof.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c index 6852552a..ed01289 100644 --- a/drivers/spi/spi-sh-msiof.c +++ b/drivers/spi/spi-sh-msiof.c @@ -541,15 +541,32 @@ static int sh_msiof_spi_setup(struct spi_device *spi) !!(spi->mode & SPI_LSB_FIRST), !!(spi->mode & SPI_CS_HIGH)); - if (spi->cs_gpio >= 0) - gpio_set_value(spi->cs_gpio, !(spi->mode & SPI_CS_HIGH)); + if (spi->cs_gpio >= 0 && !spi_get_ctldata(spi)) { + int ret = devm_gpio_request_one(&p->pdev->dev, spi->cs_gpio, + spi->mode & SPI_CS_HIGH ? GPIOF_OUT_INIT_LOW : + GPIOF_OUT_INIT_HIGH, dev_name(&spi->dev)); + + if (ret < 0) + return ret; + spi_set_ctldata(spi, (void *)spi->cs_gpio); + } pm_runtime_put(&p->pdev->dev); return 0; } +static void sh_msiof_spi_cleanup(struct spi_device *spi) +{ + struct sh_msiof_spi_priv *p = spi_master_get_devdata(spi->master); + + if (spi->cs_gpio >= 0) + devm_gpio_free(&p->pdev->dev, spi->cs_gpio); + + spi_set_ctldata(spi, NULL); +} + static int sh_msiof_prepare_message(struct spi_master *master, struct spi_message *msg) { @@ -1263,6 +1280,7 @@ static int sh_msiof_spi_probe(struct platform_device *pdev) master->dev.of_node = pdev->dev.of_node; master->num_chipselect = p->info->num_chipselect; master->setup = sh_msiof_spi_setup; + master->cleanup = sh_msiof_spi_cleanup; master->prepare_message = sh_msiof_prepare_message; master->bits_per_word_mask = SPI_BPW_RANGE_MASK(8, 32); master->auto_runtime_pm = true;