From patchwork Mon Jan 7 15:51:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 1021397 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-gpio-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="UM1SFyu6"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43YKl70gfRz9sDP for ; Tue, 8 Jan 2019 02:56:51 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727788AbfAGP4u (ORCPT ); Mon, 7 Jan 2019 10:56:50 -0500 Received: from mail-lj1-f193.google.com ([209.85.208.193]:36695 "EHLO mail-lj1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727469AbfAGP4u (ORCPT ); Mon, 7 Jan 2019 10:56:50 -0500 Received: by mail-lj1-f193.google.com with SMTP id g11-v6so765461ljk.3 for ; Mon, 07 Jan 2019 07:56:48 -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=U/f3ju9GAcQU2D9t1vnukcnrS930aDOZrrMHtBThSv0=; b=UM1SFyu6VOe2ezjzpBKx2/3g5foqiuj7bAQfTVVs0kJrk4kxE8ncStmKououjitABI WRFxaPdPwpboTTWpkTwzKlZYzOyK2UyHXWuPD9S1pZo21S+zFN0W6hsBqimIxxHVlq5a ZGK2a97sSe5eEurZhIJVfN1qSTWeZw0idYB14= 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=U/f3ju9GAcQU2D9t1vnukcnrS930aDOZrrMHtBThSv0=; b=kMPSIWUQ9NPW2VPCC2hppv+ZjusERuSsZriCwaU+gvss14FDi+h2uezwSiZKeF95Xu su6DXj0unynu/4T8nqW7nFKCJQUqZC0JQGh7aBVXl/rOWu0sARyWwOaO8+D45a78ngkN 0CXvdrVNV4HRFeNQfICkRM0X9cvCbwpaHtQavNtxc21tSUlOlbXybAVqL/WA6SolFs0U pJOH9S++iLHXZjkO/5fjkfquAzk2ap7cHfqkFXGNthsvMatMV474W68UeTGSkvn6OcoZ bTmBMMton18qOG0Yu6zuyqqIjCyTu2CJGz0FNYGvtd6sbUc6ox4nkB/G9oy6GAOchZoh yh1w== X-Gm-Message-State: AJcUukf8mN+mdoIgO1+k6iG1Q1T6zRcjXmMHUXtxNgU8F3SKnmNYC0n7 Bfn6BbRr3/L32XYQGy3upaX+ng== X-Google-Smtp-Source: ALg8bN4bDohuTnjf2rtS9BCemh6PA09Z1Rdgjk8D0FdOC6EyE9pxJFuNRAVPGmcaKWAX0Pi24opzLQ== X-Received: by 2002:a2e:2d11:: with SMTP id t17-v6mr33714989ljt.159.1546876608141; Mon, 07 Jan 2019 07:56:48 -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.46 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 07 Jan 2019 07:56:47 -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 , Alexander Shiyan Subject: [PATCH 5/7 v2] spi: clps711x: Convert to use CS GPIO descriptors Date: Mon, 7 Jan 2019 16:51:54 +0100 Message-Id: <20190107155156.3738-6-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-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org This converts the CLPS711x SPI master driver to use GPIO descriptors for chip select handling. The CLPS711x driver was merely requesting the GPIO and setting the CS line non-asserted so this was a pretty straight-forward conversion. The setup callback goes away. Cc: Alexander Shiyan Cc: Linuxarm Signed-off-by: Linus Walleij --- ChangeLog v1->v2: - Rebase on v5.0-rc1 --- drivers/spi/spi-clps711x.c | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/drivers/spi/spi-clps711x.c b/drivers/spi/spi-clps711x.c index 18193df2eba8..8c03c409fc07 100644 --- a/drivers/spi/spi-clps711x.c +++ b/drivers/spi/spi-clps711x.c @@ -11,7 +11,7 @@ #include #include -#include +#include #include #include #include @@ -36,25 +36,6 @@ struct spi_clps711x_data { int len; }; -static int spi_clps711x_setup(struct spi_device *spi) -{ - if (!spi->controller_state) { - int ret; - - ret = devm_gpio_request(&spi->master->dev, spi->cs_gpio, - dev_name(&spi->master->dev)); - if (ret) - return ret; - - spi->controller_state = spi; - } - - /* We are expect that SPI-device is not selected */ - gpio_direction_output(spi->cs_gpio, !(spi->mode & SPI_CS_HIGH)); - - return 0; -} - static int spi_clps711x_prepare_message(struct spi_master *master, struct spi_message *msg) { @@ -125,11 +106,11 @@ static int spi_clps711x_probe(struct platform_device *pdev) if (!master) return -ENOMEM; + master->use_gpio_descriptors = true; master->bus_num = -1; master->mode_bits = SPI_CPHA | SPI_CS_HIGH; master->bits_per_word_mask = SPI_BPW_RANGE_MASK(1, 8); master->dev.of_node = pdev->dev.of_node; - master->setup = spi_clps711x_setup; master->prepare_message = spi_clps711x_prepare_message; master->transfer_one = spi_clps711x_transfer_one;