lkml.org 
[lkml]   [2022]   [Jan]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v5 4/4] spi: s3c64xx: allow controller-data to be optional
    Date
    The Samsung SoC SPI driver requires to provide controller-data node
    for each of SPI peripheral device nodes. Make this controller-data node
    optional, so DTS could be simpler.

    Suggested-by: Rob Herring <robh@kernel.org>
    Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
    Reviewed-by: Sam Protsenko <semen.protsenko@linaro.org>
    Reviewed-by: Andi Shyti <andi@etezian.org>
    ---
    drivers/spi/spi-s3c64xx.c | 14 ++++++--------
    1 file changed, 6 insertions(+), 8 deletions(-)

    diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c
    index 8755cd85e83c..386550fca81c 100644
    --- a/drivers/spi/spi-s3c64xx.c
    +++ b/drivers/spi/spi-s3c64xx.c
    @@ -796,16 +796,14 @@ static struct s3c64xx_spi_csinfo *s3c64xx_get_slave_ctrldata(
    return ERR_PTR(-EINVAL);
    }

    - data_np = of_get_child_by_name(slave_np, "controller-data");
    - if (!data_np) {
    - dev_err(&spi->dev, "child node 'controller-data' not found\n");
    - return ERR_PTR(-EINVAL);
    - }
    -
    cs = kzalloc(sizeof(*cs), GFP_KERNEL);
    - if (!cs) {
    - of_node_put(data_np);
    + if (!cs)
    return ERR_PTR(-ENOMEM);
    +
    + data_np = of_get_child_by_name(slave_np, "controller-data");
    + if (!data_np) {
    + dev_info(&spi->dev, "feedback delay set to default (0)\n");
    + return cs;
    }

    of_property_read_u32(data_np, "samsung,spi-feedback-delay", &fb_delay);
    --
    2.32.0
    \
     
     \ /
      Last update: 2022-01-20 18:59    [W:3.004 / U:0.860 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site