lkml.org 
[lkml]   [2018]   [May]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.16 013/110] spi: bcm-qspi: Always read and set BSPI_MAST_N_BOOT_CTRL
    Date
    4.16-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Kamal Dasu <kdasu.kdev@gmail.com>

    commit 602805fb618b018b7a41fbb3f93c1992b078b1ae upstream.

    Always confirm the BSPI_MAST_N_BOOT_CTRL bit when enabling
    or disabling BSPI transfers.

    Fixes: 4e3b2d236fe00 ("spi: bcm-qspi: Add BSPI spi-nor flash controller driver")
    Signed-off-by: Kamal Dasu <kdasu.kdev@gmail.com>
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Cc: stable@vger.kernel.org
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/spi/spi-bcm-qspi.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/drivers/spi/spi-bcm-qspi.c
    +++ b/drivers/spi/spi-bcm-qspi.c
    @@ -490,7 +490,7 @@ static int bcm_qspi_bspi_set_mode(struct

    static void bcm_qspi_enable_bspi(struct bcm_qspi *qspi)
    {
    - if (!has_bspi(qspi) || (qspi->bspi_enabled))
    + if (!has_bspi(qspi))
    return;

    qspi->bspi_enabled = 1;
    @@ -505,7 +505,7 @@ static void bcm_qspi_enable_bspi(struct

    static void bcm_qspi_disable_bspi(struct bcm_qspi *qspi)
    {
    - if (!has_bspi(qspi) || (!qspi->bspi_enabled))
    + if (!has_bspi(qspi))
    return;

    qspi->bspi_enabled = 0;

    \
     
     \ /
      Last update: 2018-05-21 23:53    [W:2.091 / U:0.988 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site