From patchwork Mon Jan 7 15:51:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 10750747 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 58E9F6C5 for ; Mon, 7 Jan 2019 15:56:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4901428723 for ; Mon, 7 Jan 2019 15:56:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3CBE928725; Mon, 7 Jan 2019 15:56:57 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI 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 C3EBF28723 for ; Mon, 7 Jan 2019 15:56:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726903AbfAGP44 (ORCPT ); Mon, 7 Jan 2019 10:56:56 -0500 Received: from mail-lj1-f193.google.com ([209.85.208.193]:36994 "EHLO mail-lj1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727469AbfAGP4z (ORCPT ); Mon, 7 Jan 2019 10:56:55 -0500 Received: by mail-lj1-f193.google.com with SMTP id t18-v6so763149ljd.4 for ; Mon, 07 Jan 2019 07:56:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dbTeetkKkenvzLrTieSfQxTaPQNcOHrf+mj+vmNzfaU=; b=N1uNOoa2AW/HAtLpjdEHtAPnCKtpXGgl50xhmpPWdozAwrnCWaLYMiGmyhzHvpSrHd JhzUfQLp/+SaevIh9SeHkRsSKJgX3CzSFg9huOoIAXut51wUwkapQVundnsqwA2G+RIV T6o9YLTUQ/jS8DhR0k25D68sFBZlUqqJ1e9CU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dbTeetkKkenvzLrTieSfQxTaPQNcOHrf+mj+vmNzfaU=; b=Eo500J9HGpfs3n5lTllbyso9lcqVZLExpSP80XyDbqeVjivaFkyui14Sx/NFQKOooz Pz4+nypXLivv9U26zv/7IFSx6xcR9hTxDmRFn1FLm76hBH2CFvtUVZ0RfUbvhQK7ivRy Uhfskmq920b+ldF33mFAyaHk1mTYgQzgWabejdA1SwdK6Ipvl1bhFXZmsM913n/8Yfs4 u7wa/46zKFRp8XLFhhe4Yzz1zDufy3zScKzUdIME0l6AN3cs3tEbek4ZvCCeWIvqKQLu l3SzEQ/+zDOvfPNNjpal+91tgsPwU3WIin1w2A3sCDRp8H3/bRHAwnrCR4e3YKtqTpqH w+Hw== X-Gm-Message-State: AJcUukfqo8dZzUO7aqI1KhzSXggclVpd/oAI7LrL7ULr5oRRxtyJiXM1 b1QrbHXDYWFzKi8p4eIdya5Cpw== X-Google-Smtp-Source: ALg8bN41xcb7NiOYlwD96NfNQYQDSBHKfXg+2n8uTsSMX/qaGpU7P9Fa4C8cLpPvCsEkpvbWsVDLgA== X-Received: by 2002:a2e:484:: with SMTP id a4-v6mr34176665ljf.27.1546876613517; Mon, 07 Jan 2019 07:56:53 -0800 (PST) Received: from localhost.localdomain (c-ae7b71d5.014-348-6c756e10.bbcust.telenor.se. [213.113.123.174]) by smtp.gmail.com with ESMTPSA id t22sm13269164lfb.0.2019.01.07.07.56.52 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 07 Jan 2019 07:56:52 -0800 (PST) From: Linus Walleij To: Mark Brown , linux-spi@vger.kernel.org Cc: linux-gpio@vger.kernel.org, Bartosz Golaszewski , linuxarm@huawei.com, Linus Walleij , Talel Shenhar , Simon Goldschmidt , Alexandre Belloni Subject: [PATCH 7/7 v2] spi: dw: Convert to use CS GPIO descriptors Date: Mon, 7 Jan 2019 16:51:56 +0100 Message-Id: <20190107155156.3738-8-linus.walleij@linaro.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190107155156.3738-1-linus.walleij@linaro.org> References: <20190107155156.3738-1-linus.walleij@linaro.org> MIME-Version: 1.0 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 This converts the DesignWare (dw) SPI master driver to use GPIO descriptors for chip select handling. This driver has a duplicate DT parser in addition to the one in the core, sets up the line as non-asserted and relies on the core to drive the GPIOs. It is a pretty straight-forward conversion. Cc: Talel Shenhar Cc: Simon Goldschmidt Cc: Alexandre Belloni Cc: Linuxarm Tested-by: Jay Fang Reviewed-by: Alexandre Belloni Signed-off-by: Linus Walleij --- ChangeLog v1->v2: - Rebase on v5.0-rc1 --- drivers/spi/spi-dw-mmio.c | 22 ---------------------- drivers/spi/spi-dw.c | 9 +-------- 2 files changed, 1 insertion(+), 30 deletions(-) diff --git a/drivers/spi/spi-dw-mmio.c b/drivers/spi/spi-dw-mmio.c index d0dd7814e997..4bd59a93d988 100644 --- a/drivers/spi/spi-dw-mmio.c +++ b/drivers/spi/spi-dw-mmio.c @@ -18,7 +18,6 @@ #include #include #include -#include #include #include #include @@ -185,27 +184,6 @@ static int dw_spi_mmio_probe(struct platform_device *pdev) dws->num_cs = num_cs; - if (pdev->dev.of_node) { - int i; - - for (i = 0; i < dws->num_cs; i++) { - int cs_gpio = of_get_named_gpio(pdev->dev.of_node, - "cs-gpios", i); - - if (cs_gpio == -EPROBE_DEFER) { - ret = cs_gpio; - goto out; - } - - if (gpio_is_valid(cs_gpio)) { - ret = devm_gpio_request(&pdev->dev, cs_gpio, - dev_name(&pdev->dev)); - if (ret) - goto out; - } - } - } - init_func = device_get_match_data(&pdev->dev); if (init_func) { ret = init_func(pdev, dwsmmio); diff --git a/drivers/spi/spi-dw.c b/drivers/spi/spi-dw.c index 2e822a56576a..531f6ce5900d 100644 --- a/drivers/spi/spi-dw.c +++ b/drivers/spi/spi-dw.c @@ -20,7 +20,6 @@ #include #include #include -#include #include "spi-dw.h" @@ -425,13 +424,6 @@ static int dw_spi_setup(struct spi_device *spi) chip->tmode = SPI_TMOD_TR; - if (gpio_is_valid(spi->cs_gpio)) { - ret = gpio_direction_output(spi->cs_gpio, - !(spi->mode & SPI_CS_HIGH)); - if (ret) - return ret; - } - return 0; } @@ -496,6 +488,7 @@ int dw_spi_add_host(struct device *dev, struct dw_spi *dws) goto err_free_master; } + master->use_gpio_descriptors = true; master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_LOOP; master->bits_per_word_mask = SPI_BPW_RANGE_MASK(4, 16); master->bus_num = dws->bus_num;