lkml.org 
[lkml]   [2020]   [Jun]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.7 018/274] spi: spi-mem: Fix Dual/Quad modes on Octal-capable devices
    Date
    From: Geert Uytterhoeven <geert+renesas@glider.be>

    [ Upstream commit 80300a7d5f2d7178335652f41d2e55ba898b4ec1 ]

    Currently buswidths 2 and 4 are rejected for a device that advertises
    Octal capabilities. Allow these buswidths, just like is done for
    buswidth 2 and Quad-capable devices.

    Fixes: b12a084c8729ef42 ("spi: spi-mem: add support for octal mode I/O data transfer")
    Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
    Link: https://lore.kernel.org/r/20200416101418.14379-1-geert+renesas@glider.be
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/spi/spi-mem.c | 10 ++++++----
    1 file changed, 6 insertions(+), 4 deletions(-)

    diff --git a/drivers/spi/spi-mem.c b/drivers/spi/spi-mem.c
    index adaa0c49f966..9a86cc27fcc0 100644
    --- a/drivers/spi/spi-mem.c
    +++ b/drivers/spi/spi-mem.c
    @@ -108,15 +108,17 @@ static int spi_check_buswidth_req(struct spi_mem *mem, u8 buswidth, bool tx)
    return 0;

    case 2:
    - if ((tx && (mode & (SPI_TX_DUAL | SPI_TX_QUAD))) ||
    - (!tx && (mode & (SPI_RX_DUAL | SPI_RX_QUAD))))
    + if ((tx &&
    + (mode & (SPI_TX_DUAL | SPI_TX_QUAD | SPI_TX_OCTAL))) ||
    + (!tx &&
    + (mode & (SPI_RX_DUAL | SPI_RX_QUAD | SPI_RX_OCTAL))))
    return 0;

    break;

    case 4:
    - if ((tx && (mode & SPI_TX_QUAD)) ||
    - (!tx && (mode & SPI_RX_QUAD)))
    + if ((tx && (mode & (SPI_TX_QUAD | SPI_TX_OCTAL))) ||
    + (!tx && (mode & (SPI_RX_QUAD | SPI_RX_OCTAL))))
    return 0;

    break;
    --
    2.25.1
    \
     
     \ /
      Last update: 2020-06-09 01:07    [W:4.142 / U:0.204 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site