lkml.org 
[lkml]   [2018]   [Mar]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 058/241] Input: qt1070 - add OF device ID table
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

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

    From: Javier Martinez Canillas <javier@osg.samsung.com>


    [ Upstream commit cf5cd9d4480a87da78768718cac194a71079b5cb ]

    The driver doesn't have a struct of_device_id table but supported devices
    are registered via Device Trees. This is working on the assumption that a
    I2C device registered via OF will always match a legacy I2C device ID and
    that the MODALIAS reported will always be of the form i2c:<device>.

    But this could change in the future so the correct approach is to have an
    OF device ID table if the devices are registered via OF.

    The compatible strings don't have a vendor prefix because that's how it's
    used currently, and changing this will be a Device Tree ABI break.

    Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
    Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/input/keyboard/qt1070.c | 9 +++++++++
    1 file changed, 9 insertions(+)

    --- a/drivers/input/keyboard/qt1070.c
    +++ b/drivers/input/keyboard/qt1070.c
    @@ -274,9 +274,18 @@ static const struct i2c_device_id qt1070
    };
    MODULE_DEVICE_TABLE(i2c, qt1070_id);

    +#ifdef CONFIG_OF
    +static const struct of_device_id qt1070_of_match[] = {
    + { .compatible = "qt1070", },
    + { },
    +};
    +MODULE_DEVICE_TABLE(of, qt1070_of_match);
    +#endif
    +
    static struct i2c_driver qt1070_driver = {
    .driver = {
    .name = "qt1070",
    + .of_match_table = of_match_ptr(qt1070_of_match),
    .pm = &qt1070_pm_ops,
    },
    .id_table = qt1070_id,

    \
     
     \ /
      Last update: 2018-03-19 20:46    [W:4.328 / U:0.068 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site