From: Maoguang Meng <[email protected]>
This patch implement irq_set_wake for suspend resume.
Signed-off-by: Maoguang Meng <[email protected]>
---
drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
index ad1ea16..a3d137e 100644
--- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
@@ -1,7 +1,9 @@
/*
* mt65xx pinctrl driver based on Allwinner A1X pinctrl driver.
* Copyright (c) 2014 MediaTek Inc.
- * Author: Hongzhou.Yang <[email protected]>
+ * Author:
+ * Hongzhou.Yang <[email protected]>
+ * Maoguang.Meng <[email protected]>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
@@ -1062,6 +1064,16 @@ static int mtk_eint_set_type(struct irq_data *d,
return 0;
}
+static int mtk_eint_irq_set_wake(struct irq_data *d, unsigned int on)
+{
+ if (on)
+ d->chip->flags |= IRQF_NO_SUSPEND;
+ else
+ d->chip->flags &= ~IRQF_NO_SUSPEND;
+
+ return 0;
+}
+
static void mtk_eint_ack(struct irq_data *d)
{
struct mtk_pinctrl *pctl = irq_data_get_irq_chip_data(d);
@@ -1075,11 +1087,13 @@ static void mtk_eint_ack(struct irq_data *d)
}
static struct irq_chip mtk_pinctrl_irq_chip = {
- .name = "mt-eint",
+ .name = "mtk-eint",
+ .irq_disable = mtk_eint_mask,
.irq_mask = mtk_eint_mask,
.irq_unmask = mtk_eint_unmask,
.irq_ack = mtk_eint_ack,
.irq_set_type = mtk_eint_set_type,
+ .irq_set_wake = mtk_eint_irq_set_wake,
.irq_request_resources = mtk_pinctrl_irq_request_resources,
.irq_release_resources = mtk_pinctrl_irq_release_resources,
};
--
1.8.1.1.dirty
On Wed, Jul 29, 2015 at 11:36 AM, <[email protected]> wrote:
> From: Maoguang Meng <[email protected]>
>
> This patch implement irq_set_wake for suspend resume.
>
> Signed-off-by: Maoguang Meng <[email protected]>
Hongzhou/Yingjoe: are you OK with this patch? Can I have your ACKs?
Yours,
Linus Walleij
On Mon, 2015-08-10 at 14:43 +0200, Linus Walleij wrote:
> On Wed, Jul 29, 2015 at 11:36 AM, <[email protected]> wrote:
>
> > From: Maoguang Meng <[email protected]>
> >
> > This patch implement irq_set_wake for suspend resume.
> >
> > Signed-off-by: Maoguang Meng <[email protected]>
>
> Hongzhou/Yingjoe: are you OK with this patch? Can I have your ACKs?
>
> Yours,
> Linus Walleij
Hi Linus,
Yes, you can. Thank you.
Acked-by: Hongzhou Yang <[email protected]>
Hongzhou
On Tue, Aug 11, 2015 at 9:51 AM, Hongzhou Yang
<[email protected]> wrote:
> On Mon, 2015-08-10 at 14:43 +0200, Linus Walleij wrote:
>> On Wed, Jul 29, 2015 at 11:36 AM, <[email protected]> wrote:
>>
>> > From: Maoguang Meng <[email protected]>
>> >
>> > This patch implement irq_set_wake for suspend resume.
>> >
>> > Signed-off-by: Maoguang Meng <[email protected]>
>>
>> Hongzhou/Yingjoe: are you OK with this patch? Can I have your ACKs?
>>
>> Yours,
>> Linus Walleij
>
> Hi Linus,
>
> Yes, you can. Thank you.
>
> Acked-by: Hongzhou Yang <[email protected]>
NAK.
maoguang removes almost all of this patch in what I think is v2 of
this same patch:
https://patchwork.kernel.org/patch/6967441/
maoguang, please squash the two version of this patch together, and
upload a separate, correct patch.
-Dan
>
> Hongzhou
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/