From patchwork Tue Sep 18 17:45:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 10604687 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 397F51508 for ; Tue, 18 Sep 2018 17:46:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2C02C2B4AF for ; Tue, 18 Sep 2018 17:46:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 202A92B2E8; Tue, 18 Sep 2018 17:46: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=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable 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 C2E302B277 for ; Tue, 18 Sep 2018 17:46:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729999AbeIRXUD (ORCPT ); Tue, 18 Sep 2018 19:20:03 -0400 Received: from heliosphere.sirena.org.uk ([172.104.155.198]:34304 "EHLO heliosphere.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729928AbeIRXUD (ORCPT ); Tue, 18 Sep 2018 19:20:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Date:Message-Id:In-Reply-To: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner: List-Archive; bh=zKI4Kj4ahwadqOUaI8J707VCqYsUn2Mkh5071Zvum6w=; b=J4B6PPoCyBxf a+ZYtaNkByZBC1TDo/apu7ZOjWyAZkzQkN8eOmMdVqRB+es1BTT3qn6PzflXXBxr+Y9A1fx8uKmv2 7/HRxJ3KxQRyKELtGvZAr2toJKsXt4YjdmXMq8ZON6TIH/+nQAy05GJm76ybeU2oTq/F5M1YeXAOB Dywj4=; Received: from [209.121.128.187] (helo=finisterre.ee.mobilebroadband) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1g2K4N-0003XN-Oh; Tue, 18 Sep 2018 17:45:52 +0000 Received: by finisterre.ee.mobilebroadband (Postfix, from userid 1000) id DE9B4440078; Tue, 18 Sep 2018 18:45:49 +0100 (BST) From: Mark Brown To: David Lechner Cc: Mark Brown , linux-spi@vger.kernel.org, linux-iio@vger.kernel.org, Jonathan Cameron , Hartmut Knaack , Lars-Peter Clausen , Peter Meerwald-Stadler , Mark Brown , Geert Uytterhoeven , linux-kernel@vger.kernel.org, linux-spi@vger.kernel.org Subject: Applied "spi: spi-davinci: Don't error when SPI_CS_WORD and cs_gpio" to the spi tree In-Reply-To: <20180918170850.2749-3-david@lechnology.com> Message-Id: <20180918174549.DE9B4440078@finisterre.ee.mobilebroadband> Date: Tue, 18 Sep 2018 18:45:49 +0100 (BST) Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The patch spi: spi-davinci: Don't error when SPI_CS_WORD and cs_gpio has been applied to the spi tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark From f34ecdbd5661816ce8bbd7511f33181ffa8f4895 Mon Sep 17 00:00:00 2001 From: David Lechner Date: Tue, 18 Sep 2018 12:08:49 -0500 Subject: [PATCH] spi: spi-davinci: Don't error when SPI_CS_WORD and cs_gpio This remove the check and subsequent return of error for the case when a SPI device requires SPI_CS_WORD and is also configured to use a GPIO for the CS line. Commit a134cc414e86 ("spi: always use software fallback for SPI_CS_WORD when using cs_gio") handles this case now, so this check is no longer necessary. Signed-off-by: David Lechner Signed-off-by: Mark Brown --- drivers/spi/spi-davinci.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/spi/spi-davinci.c b/drivers/spi/spi-davinci.c index 205f763c7383..56adec83f8fc 100644 --- a/drivers/spi/spi-davinci.c +++ b/drivers/spi/spi-davinci.c @@ -441,9 +441,6 @@ static int davinci_spi_setup(struct spi_device *spi) if (internal_cs) { set_io_bits(dspi->base + SPIPC0, 1 << spi->chip_select); - } else if (spi->mode & SPI_CS_WORD) { - dev_err(&spi->dev, "SPI_CS_WORD can't be use with GPIO CS\n"); - return -EINVAL; } }