From patchwork Fri Oct 16 15:29:03 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Franklin Cooper X-Patchwork-Id: 7417161 Return-Path: X-Original-To: patchwork-linux-spi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E1FB89F443 for ; Fri, 16 Oct 2015 15:29:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1DE9A20A3E for ; Fri, 16 Oct 2015 15:29:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3AE4420A33 for ; Fri, 16 Oct 2015 15:29:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932213AbbJPP3g (ORCPT ); Fri, 16 Oct 2015 11:29:36 -0400 Received: from mail-ob0-f176.google.com ([209.85.214.176]:33667 "EHLO mail-ob0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932427AbbJPP3I (ORCPT ); Fri, 16 Oct 2015 11:29:08 -0400 Received: by obbwb3 with SMTP id wb3so66978148obb.0; Fri, 16 Oct 2015 08:29:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=from:to:cc:subject:date:message-id; bh=/uNbv2Ruhks1BmLg3zftxgLdB36RzrGmfZpUerSmmNw=; b=FtX5y2Bjv7lwaMSkzJVaVcW+1a5ltw1EvP06YIyMyKPI3UlsE/lhQMr4iplZfrAS9H HPkwzfYyYDbL6GgDuOLHBu1djiXw313z9zrp/lnyyUGtlRBPVwhAo7qz8tMO+X55uMBo at+vRc9u/Ep8/trAi9Dh1lLo+N16YwcEi9NfoAqjAixtDxYepK4GXy3eZ/fJgsmrO3Sl QqL54TH4lUHNi7PFIJGQSapTzYnh8QmCFRBdE3xA+5SFnZe2JIWcVu/twzrCT847FFiT msWP09VAZvYvEcI2aFFFnXoy9XNBgCjraQ3gNTAjXAIoyw2iNhgfqjck4vfS38zGccb/ t6Sw== X-Received: by 10.60.43.105 with SMTP id v9mr10004369oel.6.1445009347581; Fri, 16 Oct 2015 08:29:07 -0700 (PDT) Received: from localhost.localdomain (pool-71-97-41-79.dllstx.fios.verizon.net. [71.97.41.79]) by smtp.gmail.com with ESMTPSA id wa2sm8588639oeb.2.2015.10.16.08.29.06 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 16 Oct 2015 08:29:07 -0700 (PDT) From: Franklin S Cooper Jr To: linux-kernel@vger.kernel.org, linux-spi@vger.kernel.org, broonie@kernel.org, nsekhar@ti.com, ssantosh@kernel.org, iivanov@mm-sol.com, m-karicheri2@ti.com, iivanov.xz@gmail.com, andy.shevchenko@gmail.com, jarkko.nikula@linux.intel.com, hkallweit1@gmail.com Cc: Franklin S Cooper Jr Subject: [PATCH v2] spi: Setup the master controller driver before setting the chipselect Date: Fri, 16 Oct 2015 10:29:03 -0500 Message-Id: <1445009343-28307-1-git-send-email-fcooper@ti.com> X-Mailer: git-send-email 2.6.1 Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP SPI controllers may need to be properly setup before chip selects can be used. Therefore, wait until the spi controller has a chance to perform their setup procedure before trying to use the chip select. This also insures that the chip selects pins are in a good state before asseting them which otherwise may cause confusion. Signed-off-by: Franklin S Cooper Jr Tested-by: Grygorii Strashko Tested-by: Ivan Khoronzhuk Tested-by: Ivan Khoronzhuk --- Keystone 2 devices currently fail to boot in linux-next after the below commit was applied: spi: bitbang: switch to the generic implementation of transfer_one_message commit: 0037686596832572bbca05ab168d9884d7d704c1 This patch allows Keystone 2 devices to boot again in linux-next. Tested this patch on K2E evm and am437 starterkit which both have SPI devices to insure regressions aren't seen. V2 Changes: Update commit message. drivers/spi/spi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 4c638f3..9d5525a 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -2059,11 +2059,11 @@ int spi_setup(struct spi_device *spi) if (!spi->max_speed_hz) spi->max_speed_hz = spi->master->max_speed_hz; - spi_set_cs(spi, false); - if (spi->master->setup) status = spi->master->setup(spi); + spi_set_cs(spi, false); + dev_dbg(&spi->dev, "setup mode %d, %s%s%s%s%u bits/w, %u Hz max --> %d\n", (int) (spi->mode & (SPI_CPOL | SPI_CPHA)), (spi->mode & SPI_CS_HIGH) ? "cs_high, " : "",