lkml.org 
[lkml]   [2019]   [Nov]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.4 37/77] mfd: max8997: Enale irq-wakeup unconditionally
    Date
    From: Marek Szyprowski <m.szyprowski@samsung.com>

    [ Upstream commit efddff27c886e729a7f84a7205bd84d7d4af7336 ]

    IRQ wake up support for MAX8997 driver was initially configured by
    respective property in pdata. However, after the driver conversion to
    device-tree, setting it was left as 'todo'. Nowadays most of other PMIC MFD
    drivers initialized from device-tree assume that they can be an irq wakeup
    source, so enable it also for MAX8997. This fixes support for wakeup from
    MAX8997 RTC alarm.

    Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
    Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org>
    Signed-off-by: Lee Jones <lee.jones@linaro.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/mfd/max8997.c | 8 +-------
    include/linux/mfd/max8997.h | 1 -
    2 files changed, 1 insertion(+), 8 deletions(-)

    diff --git a/drivers/mfd/max8997.c b/drivers/mfd/max8997.c
    index 156ed6f92aa32..2d9ae7cf948f8 100644
    --- a/drivers/mfd/max8997.c
    +++ b/drivers/mfd/max8997.c
    @@ -156,12 +156,6 @@ static struct max8997_platform_data *max8997_i2c_parse_dt_pdata(

    pd->ono = irq_of_parse_and_map(dev->of_node, 1);

    - /*
    - * ToDo: the 'wakeup' member in the platform data is more of a linux
    - * specfic information. Hence, there is no binding for that yet and
    - * not parsed here.
    - */
    -
    return pd;
    }

    @@ -249,7 +243,7 @@ static int max8997_i2c_probe(struct i2c_client *i2c,
    */

    /* MAX8997 has a power button input. */
    - device_init_wakeup(max8997->dev, pdata->wakeup);
    + device_init_wakeup(max8997->dev, true);

    return ret;

    diff --git a/include/linux/mfd/max8997.h b/include/linux/mfd/max8997.h
    index cf815577bd686..3ae1fe743bc34 100644
    --- a/include/linux/mfd/max8997.h
    +++ b/include/linux/mfd/max8997.h
    @@ -178,7 +178,6 @@ struct max8997_led_platform_data {
    struct max8997_platform_data {
    /* IRQ */
    int ono;
    - int wakeup;

    /* ---- PMIC ---- */
    struct max8997_regulator_data *regulators;
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-11-16 16:58    [W:3.092 / U:0.472 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site