lkml.org 
[lkml]   [2020]   [Jun]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.7 086/163] spi: bcm-qspi: Handle clock probe deferral
    Date
    From: Florian Fainelli <f.fainelli@gmail.com>

    commit 0392727c261bab65a35cd4f82ee9459bc237591d upstream.

    The clock provider may not be ready by the time spi-bcm-qspi gets
    probed, handle probe deferral using devm_clk_get_optional().

    Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
    Signed-off-by: Kamal Dasu <kdasu.kdev@gmail.com>
    Cc: stable@vger.kernel.org
    Link: https://lore.kernel.org/r/20200420190853.45614-2-kdasu.kdev@gmail.com
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/spi/spi-bcm-qspi.c | 12 +++++-------
    1 file changed, 5 insertions(+), 7 deletions(-)

    --- a/drivers/spi/spi-bcm-qspi.c
    +++ b/drivers/spi/spi-bcm-qspi.c
    @@ -1222,6 +1222,11 @@ int bcm_qspi_probe(struct platform_devic
    }

    qspi = spi_master_get_devdata(master);
    +
    + qspi->clk = devm_clk_get_optional(&pdev->dev, NULL);
    + if (IS_ERR(qspi->clk))
    + return PTR_ERR(qspi->clk);
    +
    qspi->pdev = pdev;
    qspi->trans_pos.trans = NULL;
    qspi->trans_pos.byte = 0;
    @@ -1335,13 +1340,6 @@ int bcm_qspi_probe(struct platform_devic
    qspi->soc_intc = NULL;
    }

    - qspi->clk = devm_clk_get(&pdev->dev, NULL);
    - if (IS_ERR(qspi->clk)) {
    - dev_warn(dev, "unable to get clock\n");
    - ret = PTR_ERR(qspi->clk);
    - goto qspi_probe_err;
    - }
    -
    ret = clk_prepare_enable(qspi->clk);
    if (ret) {
    dev_err(dev, "failed to prepare clock\n");

    \
     
     \ /
      Last update: 2020-06-16 18:10    [W:5.103 / U:1.160 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site