lkml.org 
[lkml]   [2020]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 647/717] spi: fsl: fix use of spisel_boot signal on MPC8309
    Date
    From: Rasmus Villemoes <rasmus.villemoes@prevas.dk>

    commit 122541f2b10897b08f7f7e6db5f1eb693e51f0a1 upstream.

    Commit 0f0581b24bd0 ("spi: fsl: Convert to use CS GPIO descriptors")
    broke the use of the SPISEL_BOOT signal as a chip select on the
    MPC8309.

    pdata->max_chipselect, which becomes master->num_chipselect, must be
    initialized to take into account the possibility that there's one more
    chip select in use than the number of GPIO chip selects.

    Cc: stable@vger.kernel.org # v5.4+
    Cc: Christophe Leroy <christophe.leroy@c-s.fr>
    Cc: Linus Walleij <linus.walleij@linaro.org>
    Fixes: 0f0581b24bd0 ("spi: fsl: Convert to use CS GPIO descriptors")
    Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
    Link: https://lore.kernel.org/r/20201127152947.376-1-rasmus.villemoes@prevas.dk
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/spi/spi-fsl-spi.c | 11 ++++++++---
    1 file changed, 8 insertions(+), 3 deletions(-)

    --- a/drivers/spi/spi-fsl-spi.c
    +++ b/drivers/spi/spi-fsl-spi.c
    @@ -716,10 +716,11 @@ static int of_fsl_spi_probe(struct platf
    type = fsl_spi_get_type(&ofdev->dev);
    if (type == TYPE_FSL) {
    struct fsl_spi_platform_data *pdata = dev_get_platdata(dev);
    + bool spisel_boot = false;
    #if IS_ENABLED(CONFIG_FSL_SOC)
    struct mpc8xxx_spi_probe_info *pinfo = to_of_pinfo(pdata);
    - bool spisel_boot = of_property_read_bool(np, "fsl,spisel_boot");

    + spisel_boot = of_property_read_bool(np, "fsl,spisel_boot");
    if (spisel_boot) {
    pinfo->immr_spi_cs = ioremap(get_immrbase() + IMMR_SPI_CS_OFFSET, 4);
    if (!pinfo->immr_spi_cs)
    @@ -734,10 +735,14 @@ static int of_fsl_spi_probe(struct platf
    * supported on the GRLIB variant.
    */
    ret = gpiod_count(dev, "cs");
    - if (ret <= 0)
    + if (ret < 0)
    + ret = 0;
    + if (ret == 0 && !spisel_boot) {
    pdata->max_chipselect = 1;
    - else
    + } else {
    + pdata->max_chipselect = ret + spisel_boot;
    pdata->cs_control = fsl_spi_cs_control;
    + }
    }

    ret = of_address_to_resource(np, 0, &mem);

    \
     
     \ /
      Last update: 2020-12-28 15:34    [W:2.517 / U:1.376 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site