lkml.org 
[lkml]   [2019]   [May]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.9 24/25] spi: ST ST95HF NFC: declare missing of table
    Date
    From: Daniel Gomez <dagmcr@gmail.com>

    [ Upstream commit d04830531d0c4a99c897a44038e5da3d23331d2f ]

    Add missing <of_device_id> table for SPI driver relying on SPI
    device match since compatible is in a DT binding or in a DTS.

    Before this patch:
    modinfo drivers/nfc/st95hf/st95hf.ko | grep alias
    alias: spi:st95hf

    After this patch:
    modinfo drivers/nfc/st95hf/st95hf.ko | grep alias
    alias: spi:st95hf
    alias: of:N*T*Cst,st95hfC*
    alias: of:N*T*Cst,st95hf

    Reported-by: Javier Martinez Canillas <javier@dowhile0.org>
    Signed-off-by: Daniel Gomez <dagmcr@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/nfc/st95hf/core.c | 7 +++++++
    1 file changed, 7 insertions(+)

    diff --git a/drivers/nfc/st95hf/core.c b/drivers/nfc/st95hf/core.c
    index c2840e412962..850e75571c8e 100644
    --- a/drivers/nfc/st95hf/core.c
    +++ b/drivers/nfc/st95hf/core.c
    @@ -1074,6 +1074,12 @@ static const struct spi_device_id st95hf_id[] = {
    };
    MODULE_DEVICE_TABLE(spi, st95hf_id);

    +static const struct of_device_id st95hf_spi_of_match[] = {
    + { .compatible = "st,st95hf" },
    + { },
    +};
    +MODULE_DEVICE_TABLE(of, st95hf_spi_of_match);
    +
    static int st95hf_probe(struct spi_device *nfc_spi_dev)
    {
    int ret;
    @@ -1260,6 +1266,7 @@ static struct spi_driver st95hf_driver = {
    .driver = {
    .name = "st95hf",
    .owner = THIS_MODULE,
    + .of_match_table = of_match_ptr(st95hf_spi_of_match),
    },
    .id_table = st95hf_id,
    .probe = st95hf_probe,
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-05-07 07:45    [W:4.828 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site