From patchwork Thu Oct 27 19:29:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 9400273 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 9DDB760588 for ; Thu, 27 Oct 2016 19:29:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7C4ED2A396 for ; Thu, 27 Oct 2016 19:29:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 712D32A398; Thu, 27 Oct 2016 19:29:54 +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=-6.3 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 1B0BD2A396 for ; Thu, 27 Oct 2016 19:29:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751280AbcJ0T3x (ORCPT ); Thu, 27 Oct 2016 15:29:53 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:36602 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754493AbcJ0T3x (ORCPT ); Thu, 27 Oct 2016 15:29:53 -0400 Received: by mail-wm0-f68.google.com with SMTP id c17so4174243wmc.3 for ; Thu, 27 Oct 2016 12:29:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:subject:to:references:cc:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=jpRcL8B9aZmk/mLbD74uCYMnybpn50Wjm94NShvFcto=; b=RPauWxnfQB9tHgnurvCbBzvW7ACji4MmLNrZ2JLoV1boUvxtIcNadxB0sVSWCG4Wzd 3vLHE5ZfaauLg+niDtim7fl8oChX8rg2nH1aOPXq75O6ph8PTq6tqucT5SBjspgi83E7 9QUiP3ZIO7Sv302AaeV+6Da04bS13inWJKh+T8xIv6ccf/QcWDjdYE1uxoALO4pvcceV bZrr3yT0fmwGaRqT0hMi1remfdOqNy1akD8J4QPYsiSroFMBmSE3s6k6LdWVP0J9ldjD Fj47NahCS9EgoB2U7a9c9DI1X+v9YMGHxZU2Gh/a5njisYGf5P1ZzwjXK/h1g0wV3ZDU 6fWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:subject:to:references:cc:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=jpRcL8B9aZmk/mLbD74uCYMnybpn50Wjm94NShvFcto=; b=f7eXm+FFN8vFHZadUUy3QGwT0i8D+LqXaW3tzc5yz5iZljsTSPQhWslDsI4dKYwdzq na9JjrAjsvQSx2TFAlphg4PPGLLfFHuk/fjp3m+kdiTBybLj0ddlGdeduJuP37nmHlbB oCmRLSJeu72Mss4uMGMARGsvyAbafpWz/XS8fAbrOAZDUMmy6ePIET/5ZRM9yyAXp1Cs nCLdezsrbjjlZFNt4fQnylOp9Q1smh9mXKtzltDfHwJR//sRE0HBR7KAAZ/7fRby/4YB 2VMSzQwLwm/jpo0/YaggUzshWZtTrI2GFBko4I0hSEOP0YEd7Wq1kUFW7ycSw1eX7gyn pd3w== X-Gm-Message-State: ABUngvcxlAZgFMald5WsvrSz9WbWvV0NxNZxOfB9Ev0ZuJYbY6E2OgsH8aF0/NWUA2C+pA== X-Received: by 10.194.203.6 with SMTP id km6mr8128619wjc.226.1477596591571; Thu, 27 Oct 2016 12:29:51 -0700 (PDT) Received: from ?IPv6:2003:62:5f6e:ba00:49f8:f47b:2191:41c4? (p200300625F6EBA0049F8F47B219141C4.dip0.t-ipconnect.de. [2003:62:5f6e:ba00:49f8:f47b:2191:41c4]) by smtp.googlemail.com with ESMTPSA id rv12sm10130436wjb.29.2016.10.27.12.29.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 27 Oct 2016 12:29:51 -0700 (PDT) From: Heiner Kallweit Subject: [PATCH v2 09/09] spi: fsl-espi: add support for dual read mode To: Mark Brown References: <5b98be38-17a2-79a2-14da-fb2bb6f8820f@gmail.com> Cc: "linux-spi@vger.kernel.org" Message-ID: <76530bca-7f84-2e97-9276-9b9c4dd229f6@gmail.com> Date: Thu, 27 Oct 2016 21:29:30 +0200 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.4.0 MIME-Version: 1.0 In-Reply-To: <5b98be38-17a2-79a2-14da-fb2bb6f8820f@gmail.com> 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 patch adds support for dual output read mode. It was successfully tested on a P1014-based device with a S25FL128S spi nor flash. Signed-off-by: Heiner Kallweit --- v2: - rebased - extended commit message --- drivers/spi/spi-fsl-espi.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/drivers/spi/spi-fsl-espi.c b/drivers/spi/spi-fsl-espi.c index e32dc30..5753b1e 100644 --- a/drivers/spi/spi-fsl-espi.c +++ b/drivers/spi/spi-fsl-espi.c @@ -205,10 +205,11 @@ static int fsl_espi_check_message(struct spi_message *m) } static void fsl_espi_check_rxskip_mode(struct spi_message *m, - struct mpc8xxx_spi *mspi) + struct mpc8xxx_spi *mspi, + struct spi_transfer *tr) { struct spi_transfer *t; - unsigned int i = 0, rxskip_len = 0; + unsigned int i = 0, rxskip_len = 0, rx_nbits = SPI_NBITS_SINGLE; mspi->rxskip = 0; @@ -222,6 +223,9 @@ static void fsl_espi_check_rxskip_mode(struct spi_message *m, * low-level transfer implementation. * This constraint doesn't affect SPI NOR reads as typical use case * for rxskip mode as the read command has only few bytes. + * + * Store rx_nbits of the read transfer for later assessment + * whether single or dual mode is requested. */ list_for_each_entry(t, &m->transfers, transfer_list) { if (i == 0) { @@ -232,12 +236,15 @@ static void fsl_espi_check_rxskip_mode(struct spi_message *m, } else if (i == 1) { if (t->tx_buf || !t->rx_buf) return; + rx_nbits = t->rx_nbits; } i++; } - if (i == 2) + if (i == 2) { mspi->rxskip = rxskip_len; + tr->rx_nbits = rx_nbits; + } } static void fsl_espi_fill_tx_fifo(struct mpc8xxx_spi *mspi, u32 events) @@ -340,6 +347,8 @@ static int fsl_espi_bufs(struct spi_device *spi, struct spi_transfer *t) mpc8xxx_spi->tx_len = mpc8xxx_spi->rxskip; mpc8xxx_spi->rx_len = t->len - mpc8xxx_spi->rxskip; mpc8xxx_spi->rx = t->rx_buf + mpc8xxx_spi->rxskip; + if (t->rx_nbits == SPI_NBITS_DUAL) + spcom |= SPCOM_DO; } fsl_espi_write_reg(mpc8xxx_spi, ESPI_SPCOM, spcom); @@ -374,7 +383,7 @@ static int fsl_espi_trans(struct spi_message *m, struct spi_transfer *trans) struct spi_device *spi = m->spi; int ret; - fsl_espi_check_rxskip_mode(m, mspi); + fsl_espi_check_rxskip_mode(m, mspi, trans); fsl_espi_copy_to_buf(m, mspi); fsl_espi_setup_transfer(spi, trans); @@ -588,6 +597,7 @@ static int fsl_espi_probe(struct device *dev, struct resource *mem, mpc8xxx_spi_probe(dev, mem, irq); + master->mode_bits |= SPI_RX_DUAL; master->bits_per_word_mask = SPI_BPW_RANGE_MASK(4, 16); master->setup = fsl_espi_setup; master->cleanup = fsl_espi_cleanup;