lkml.org 
[lkml]   [2013]   [Oct]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 1/4] Input: twl4030-pwrbutton - add device tree support
    Date
    Add device tree support for twl4030 power button driver.

    Signed-off-by: Sebastian Reichel <sre@debian.org>
    ---
    drivers/input/misc/twl4030-pwrbutton.c | 19 +++++++++++++++----
    1 file changed, 15 insertions(+), 4 deletions(-)

    diff --git a/drivers/input/misc/twl4030-pwrbutton.c b/drivers/input/misc/twl4030-pwrbutton.c
    index b9a05fd..e450947 100644
    --- a/drivers/input/misc/twl4030-pwrbutton.c
    +++ b/drivers/input/misc/twl4030-pwrbutton.c
    @@ -52,7 +52,7 @@ static irqreturn_t powerbutton_irq(int irq, void *_pwr)
    return IRQ_HANDLED;
    }

    -static int __init twl4030_pwrbutton_probe(struct platform_device *pdev)
    +static int twl4030_pwrbutton_probe(struct platform_device *pdev)
    {
    struct input_dev *pwr;
    int irq = platform_get_irq(pdev, 0);
    @@ -106,16 +106,27 @@ static int __exit twl4030_pwrbutton_remove(struct platform_device *pdev)
    return 0;
    }

    +#if IS_ENABLED(CONFIG_OF)
    +static const struct of_device_id twl4030_pwrbutton_dt_match_table[] = {
    + { .compatible = "ti,twl4030-pwrbutton" },
    + {},
    +};
    +MODULE_DEVICE_TABLE(of, twl4030_pwrbutton_dt_match_table);
    +#define twl4030_pwrbutton_dt_match of_match_ptr(twl4030_pwrbutton_dt_match_table)
    +#else
    +#define twl4030_pwrbutton_dt_match NULL
    +#endif
    +
    static struct platform_driver twl4030_pwrbutton_driver = {
    + .probe = twl4030_pwrbutton_probe,
    .remove = __exit_p(twl4030_pwrbutton_remove),
    .driver = {
    .name = "twl4030_pwrbutton",
    .owner = THIS_MODULE,
    + .of_match_table = twl4030_pwrbutton_dt_match,
    },
    };
    -
    -module_platform_driver_probe(twl4030_pwrbutton_driver,
    - twl4030_pwrbutton_probe);
    +module_platform_driver(twl4030_pwrbutton_driver);

    MODULE_ALIAS("platform:twl4030_pwrbutton");
    MODULE_DESCRIPTION("Triton2 Power Button");
    --
    1.8.4.rc3


    \
     
     \ /
      Last update: 2013-10-22 15:21    [W:3.959 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site