* [PATCH v3 0/5] Add MediaTek PMIC keys support @ 2017-08-25 6:32 Chen Zhong 2017-08-25 6:32 ` [PATCH v3 1/5] mfd: mt6397: create irq mappings in mfd core driver Chen Zhong ` (4 more replies) 0 siblings, 5 replies; 19+ messages in thread From: Chen Zhong @ 2017-08-25 6:32 UTC (permalink / raw) To: Dmitry Torokhov Cc: Rob Herring, Mark Rutland, Matthias Brugger, Lee Jones, Eddie Huang, Alessandro Zummo, Alexandre Belloni, Andi Shyti, Javier Martinez Canillas, Chen Zhong, Linus Walleij, Jaechul Lee, linux-input, devicetree, linux-arm-kernel, linux-mediatek, linux-kernel, linux-rtc MediaTek PMIC are multi-function devices that can handle key interrupts, typically there are two keys attached to PMIC, which called pwrkey and homekey. PWRKEY usually used to wake up system from sleep. Homekey can used as volume down key due to board design. Long press keys can shutdown PMIC, the mode can be choose to be one key only or two keys together. This series add support for key functions for MediaTek PMIC MT6397/MT6323. Chen Zhong (5): mfd: mt6397: create irq mappings in mfd core driver dt-bindings: input: Add document bindings for mtk-pmic-keys dt-bindings: mfd: Add bindings for the keys as subnode of PMIC input: Add MediaTek PMIC keys support mfd: mt6397: Add PMIC keys support to MT6397 driver .../devicetree/bindings/input/mtk-pmic-keys.txt | 38 +++ Documentation/devicetree/bindings/mfd/mt6397.txt | 6 + drivers/input/keyboard/Kconfig | 9 + drivers/input/keyboard/Makefile | 1 + drivers/input/keyboard/mtk-pmic-keys.c | 308 +++++++++++++++++++++ drivers/mfd/mt6397-core.c | 26 +- drivers/rtc/rtc-mt6397.c | 7 +- 7 files changed, 388 insertions(+), 7 deletions(-) create mode 100644 Documentation/devicetree/bindings/input/mtk-pmic-keys.txt create mode 100644 drivers/input/keyboard/mtk-pmic-keys.c -- 1.9.1 ^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH v3 1/5] mfd: mt6397: create irq mappings in mfd core driver 2017-08-25 6:32 [PATCH v3 0/5] Add MediaTek PMIC keys support Chen Zhong @ 2017-08-25 6:32 ` Chen Zhong 2017-08-25 8:39 ` Alexandre Belloni 2017-08-25 6:32 ` [PATCH v3 2/5] dt-bindings: input: Add document bindings for mtk-pmic-keys Chen Zhong ` (3 subsequent siblings) 4 siblings, 1 reply; 19+ messages in thread From: Chen Zhong @ 2017-08-25 6:32 UTC (permalink / raw) To: Dmitry Torokhov Cc: Rob Herring, Mark Rutland, Matthias Brugger, Lee Jones, Eddie Huang, Alessandro Zummo, Alexandre Belloni, Andi Shyti, Javier Martinez Canillas, Chen Zhong, Linus Walleij, Jaechul Lee, linux-input, devicetree, linux-arm-kernel, linux-mediatek, linux-kernel, linux-rtc The core driver should create and manage irq mappings instead of leaf drivers. This patch change to pass irq domain to devm_mfd_add_devices() and it will create mapping for irq resources automatically. And remove irq mapping in rtc driver since this has been done in core driver. Acked-for-MFD-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Chen Zhong <chen.zhong@mediatek.com> --- drivers/mfd/mt6397-core.c | 4 ++-- drivers/rtc/rtc-mt6397.c | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/mfd/mt6397-core.c b/drivers/mfd/mt6397-core.c index 04a601f..6546d7f 100644 --- a/drivers/mfd/mt6397-core.c +++ b/drivers/mfd/mt6397-core.c @@ -289,7 +289,7 @@ static int mt6397_probe(struct platform_device *pdev) ret = devm_mfd_add_devices(&pdev->dev, -1, mt6323_devs, ARRAY_SIZE(mt6323_devs), NULL, - 0, NULL); + 0, pmic->irq_domain); break; case MT6397_CID_CODE: @@ -304,7 +304,7 @@ static int mt6397_probe(struct platform_device *pdev) ret = devm_mfd_add_devices(&pdev->dev, -1, mt6397_devs, ARRAY_SIZE(mt6397_devs), NULL, - 0, NULL); + 0, pmic->irq_domain); break; default: diff --git a/drivers/rtc/rtc-mt6397.c b/drivers/rtc/rtc-mt6397.c index 1a61fa5..385f830 100644 --- a/drivers/rtc/rtc-mt6397.c +++ b/drivers/rtc/rtc-mt6397.c @@ -322,10 +322,9 @@ static int mtk_rtc_probe(struct platform_device *pdev) res = platform_get_resource(pdev, IORESOURCE_MEM, 0); rtc->addr_base = res->start; - res = platform_get_resource(pdev, IORESOURCE_IRQ, 0); - rtc->irq = irq_create_mapping(mt6397_chip->irq_domain, res->start); - if (rtc->irq <= 0) - return -EINVAL; + rtc->irq = platform_get_irq(pdev, 0); + if (rtc->irq < 0) + return rtc->irq; rtc->regmap = mt6397_chip->regmap; rtc->dev = &pdev->dev; -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 19+ messages in thread
* Re: [PATCH v3 1/5] mfd: mt6397: create irq mappings in mfd core driver 2017-08-25 6:32 ` [PATCH v3 1/5] mfd: mt6397: create irq mappings in mfd core driver Chen Zhong @ 2017-08-25 8:39 ` Alexandre Belloni 0 siblings, 0 replies; 19+ messages in thread From: Alexandre Belloni @ 2017-08-25 8:39 UTC (permalink / raw) To: Chen Zhong Cc: Dmitry Torokhov, Rob Herring, Mark Rutland, Matthias Brugger, Lee Jones, Eddie Huang, Alessandro Zummo, Andi Shyti, Javier Martinez Canillas, Linus Walleij, Jaechul Lee, linux-input, devicetree, linux-arm-kernel, linux-mediatek, linux-kernel, linux-rtc On 25/08/2017 at 14:32:29 +0800, Chen Zhong wrote: > The core driver should create and manage irq mappings instead of > leaf drivers. This patch change to pass irq domain to > devm_mfd_add_devices() and it will create mapping for irq resources > automatically. And remove irq mapping in rtc driver since this has > been done in core driver. > > Acked-for-MFD-by: Lee Jones <lee.jones@linaro.org> > Signed-off-by: Chen Zhong <chen.zhong@mediatek.com> Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> > --- > drivers/mfd/mt6397-core.c | 4 ++-- > drivers/rtc/rtc-mt6397.c | 7 +++---- > 2 files changed, 5 insertions(+), 6 deletions(-) > > diff --git a/drivers/mfd/mt6397-core.c b/drivers/mfd/mt6397-core.c > index 04a601f..6546d7f 100644 > --- a/drivers/mfd/mt6397-core.c > +++ b/drivers/mfd/mt6397-core.c > @@ -289,7 +289,7 @@ static int mt6397_probe(struct platform_device *pdev) > > ret = devm_mfd_add_devices(&pdev->dev, -1, mt6323_devs, > ARRAY_SIZE(mt6323_devs), NULL, > - 0, NULL); > + 0, pmic->irq_domain); > break; > > case MT6397_CID_CODE: > @@ -304,7 +304,7 @@ static int mt6397_probe(struct platform_device *pdev) > > ret = devm_mfd_add_devices(&pdev->dev, -1, mt6397_devs, > ARRAY_SIZE(mt6397_devs), NULL, > - 0, NULL); > + 0, pmic->irq_domain); > break; > > default: > diff --git a/drivers/rtc/rtc-mt6397.c b/drivers/rtc/rtc-mt6397.c > index 1a61fa5..385f830 100644 > --- a/drivers/rtc/rtc-mt6397.c > +++ b/drivers/rtc/rtc-mt6397.c > @@ -322,10 +322,9 @@ static int mtk_rtc_probe(struct platform_device *pdev) > res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > rtc->addr_base = res->start; > > - res = platform_get_resource(pdev, IORESOURCE_IRQ, 0); > - rtc->irq = irq_create_mapping(mt6397_chip->irq_domain, res->start); > - if (rtc->irq <= 0) > - return -EINVAL; > + rtc->irq = platform_get_irq(pdev, 0); > + if (rtc->irq < 0) > + return rtc->irq; > > rtc->regmap = mt6397_chip->regmap; > rtc->dev = &pdev->dev; > -- > 1.7.9.5 > -- Alexandre Belloni, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com ^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH v3 2/5] dt-bindings: input: Add document bindings for mtk-pmic-keys 2017-08-25 6:32 [PATCH v3 0/5] Add MediaTek PMIC keys support Chen Zhong 2017-08-25 6:32 ` [PATCH v3 1/5] mfd: mt6397: create irq mappings in mfd core driver Chen Zhong @ 2017-08-25 6:32 ` Chen Zhong [not found] ` <1503642753-12385-3-git-send-email-chen.zhong-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org> 2017-08-25 6:32 ` [PATCH v3 4/5] input: Add MediaTek PMIC keys support Chen Zhong ` (2 subsequent siblings) 4 siblings, 1 reply; 19+ messages in thread From: Chen Zhong @ 2017-08-25 6:32 UTC (permalink / raw) To: Dmitry Torokhov Cc: Mark Rutland, Alessandro Zummo, devicetree, Chen Zhong, Linus Walleij, Jaechul Lee, linux-kernel, Andi Shyti, Javier Martinez Canillas, Rob Herring, Alexandre Belloni, linux-input, Matthias Brugger, linux-mediatek, Eddie Huang, Lee Jones, linux-arm-kernel, linux-rtc This patch adds the device tree binding documentation for the MediaTek pmic keys found on PMIC MT6397/MT6323. Signed-off-by: Chen Zhong <chen.zhong@mediatek.com> --- .../devicetree/bindings/input/mtk-pmic-keys.txt | 38 ++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 Documentation/devicetree/bindings/input/mtk-pmic-keys.txt diff --git a/Documentation/devicetree/bindings/input/mtk-pmic-keys.txt b/Documentation/devicetree/bindings/input/mtk-pmic-keys.txt new file mode 100644 index 0000000..100ec44 --- /dev/null +++ b/Documentation/devicetree/bindings/input/mtk-pmic-keys.txt @@ -0,0 +1,38 @@ +MediaTek MT6397/MT6323 PMIC Keys Device Driver + +There are two key functions provided by MT6397/MT6323 PMIC, pwrkey +and homekey. The key functions are defined as the subnode of the function +node provided by MT6397/MT6323 PMIC that is being defined as one kind +of Muti-Function Device (MFD) + +For MT6397/MT6323 MFD bindings see: +Documentation/devicetree/bindings/mfd/mt6397.txt + +Required properties: +- compatible: "mediatek,mt6397-keys" or "mediatek,mt6323-keys" +- linux,keycodes: Specifies the numeric keycode values to + be used for reporting keys presses. The array can + contain up to 2 entries. + +Optional Properties: +- wakeup-source: each key can be used as a wakeup source. +- mediatek,long-press-mode: Long press key shutdown setting, 1 for + pwrkey only, 2 for pwrkey/homekey together, others for disabled. +- debounce-interval: Long press key shutdown debouncing interval time + in seconds. 0/1/2/3 for 8/11/14/5 seconds. If not specified defaults to 0. + +Example: + + pmic: mt6397 { + compatible = "mediatek,mt6397"; + + ... + + mt6397keys: mt6397keys { + compatible = "mediatek,mt6397-keys"; + linux,keycodes = <KEY_POWER>, <KEY_VOLUMEDOWN>; + wakeup-source = <1>, <0>; + mediatek,long-press-mode = <1>; + debounce-interval = <0>; + }; + }; -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 19+ messages in thread
[parent not found: <1503642753-12385-3-git-send-email-chen.zhong-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>]
* Re: [PATCH v3 2/5] dt-bindings: input: Add document bindings for mtk-pmic-keys [not found] ` <1503642753-12385-3-git-send-email-chen.zhong-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org> @ 2017-08-31 19:52 ` Rob Herring 2017-09-01 2:00 ` Chen Zhong 2017-09-02 2:16 ` Chen Zhong 0 siblings, 2 replies; 19+ messages in thread From: Rob Herring @ 2017-08-31 19:52 UTC (permalink / raw) To: Chen Zhong Cc: Dmitry Torokhov, Mark Rutland, Matthias Brugger, Lee Jones, Eddie Huang, Alessandro Zummo, Alexandre Belloni, Andi Shyti, Javier Martinez Canillas, Linus Walleij, Jaechul Lee, linux-input-u79uwXL29TY76Z2rM5mHXA, devicetree-u79uwXL29TY76Z2rM5mHXA, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, linux-kernel-u79uwXL29TY76Z2rM5mHXA, linux-rtc-u79uwXL29TY76Z2rM5mHXA On Fri, Aug 25, 2017 at 02:32:30PM +0800, Chen Zhong wrote: > This patch adds the device tree binding documentation for the MediaTek > pmic keys found on PMIC MT6397/MT6323. > > Signed-off-by: Chen Zhong <chen.zhong-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org> > --- > .../devicetree/bindings/input/mtk-pmic-keys.txt | 38 ++++++++++++++++++++ > 1 file changed, 38 insertions(+) > create mode 100644 Documentation/devicetree/bindings/input/mtk-pmic-keys.txt > > diff --git a/Documentation/devicetree/bindings/input/mtk-pmic-keys.txt b/Documentation/devicetree/bindings/input/mtk-pmic-keys.txt > new file mode 100644 > index 0000000..100ec44 > --- /dev/null > +++ b/Documentation/devicetree/bindings/input/mtk-pmic-keys.txt > @@ -0,0 +1,38 @@ > +MediaTek MT6397/MT6323 PMIC Keys Device Driver > + > +There are two key functions provided by MT6397/MT6323 PMIC, pwrkey > +and homekey. The key functions are defined as the subnode of the function > +node provided by MT6397/MT6323 PMIC that is being defined as one kind > +of Muti-Function Device (MFD) > + > +For MT6397/MT6323 MFD bindings see: > +Documentation/devicetree/bindings/mfd/mt6397.txt > + > +Required properties: > +- compatible: "mediatek,mt6397-keys" or "mediatek,mt6323-keys" > +- linux,keycodes: Specifies the numeric keycode values to > + be used for reporting keys presses. The array can > + contain up to 2 entries. > + > +Optional Properties: > +- wakeup-source: each key can be used as a wakeup source. wakeup-source is defined as a boolean. > +- mediatek,long-press-mode: Long press key shutdown setting, 1 for > + pwrkey only, 2 for pwrkey/homekey together, others for disabled. > +- debounce-interval: Long press key shutdown debouncing interval time > + in seconds. 0/1/2/3 for 8/11/14/5 seconds. If not specified defaults to 0. > + > +Example: > + > + pmic: mt6397 { > + compatible = "mediatek,mt6397"; > + > + ... > + > + mt6397keys: mt6397keys { > + compatible = "mediatek,mt6397-keys"; > + linux,keycodes = <KEY_POWER>, <KEY_VOLUMEDOWN>; > + wakeup-source = <1>, <0>; > + mediatek,long-press-mode = <1>; > + debounce-interval = <0>; > + }; > + }; > -- > 1.7.9.5 > -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v3 2/5] dt-bindings: input: Add document bindings for mtk-pmic-keys 2017-08-31 19:52 ` Rob Herring @ 2017-09-01 2:00 ` Chen Zhong 2017-09-02 2:16 ` Chen Zhong 1 sibling, 0 replies; 19+ messages in thread From: Chen Zhong @ 2017-09-01 2:00 UTC (permalink / raw) To: Rob Herring Cc: Dmitry Torokhov, Mark Rutland, Matthias Brugger, Lee Jones, Eddie Huang, Alessandro Zummo, Alexandre Belloni, Andi Shyti, Javier Martinez Canillas, Linus Walleij, Jaechul Lee, linux-input, devicetree, linux-arm-kernel, linux-mediatek, linux-kernel, linux-rtc On Thu, 2017-08-31 at 14:52 -0500, Rob Herring wrote: > On Fri, Aug 25, 2017 at 02:32:30PM +0800, Chen Zhong wrote: > > This patch adds the device tree binding documentation for the MediaTek > > pmic keys found on PMIC MT6397/MT6323. > > > > Signed-off-by: Chen Zhong <chen.zhong@mediatek.com> > > --- > > .../devicetree/bindings/input/mtk-pmic-keys.txt | 38 ++++++++++++++++++++ > > 1 file changed, 38 insertions(+) > > create mode 100644 Documentation/devicetree/bindings/input/mtk-pmic-keys.txt > > > > diff --git a/Documentation/devicetree/bindings/input/mtk-pmic-keys.txt b/Documentation/devicetree/bindings/input/mtk-pmic-keys.txt > > new file mode 100644 > > index 0000000..100ec44 > > --- /dev/null > > +++ b/Documentation/devicetree/bindings/input/mtk-pmic-keys.txt > > @@ -0,0 +1,38 @@ > > +MediaTek MT6397/MT6323 PMIC Keys Device Driver > > + > > +There are two key functions provided by MT6397/MT6323 PMIC, pwrkey > > +and homekey. The key functions are defined as the subnode of the function > > +node provided by MT6397/MT6323 PMIC that is being defined as one kind > > +of Muti-Function Device (MFD) > > + > > +For MT6397/MT6323 MFD bindings see: > > +Documentation/devicetree/bindings/mfd/mt6397.txt > > + > > +Required properties: > > +- compatible: "mediatek,mt6397-keys" or "mediatek,mt6323-keys" > > +- linux,keycodes: Specifies the numeric keycode values to > > + be used for reporting keys presses. The array can > > + contain up to 2 entries. > > + > > +Optional Properties: > > +- wakeup-source: each key can be used as a wakeup source. > > wakeup-source is defined as a boolean. Hi Rob, We have two keys, maybe one key can be used as a wakeup source, another not.Since wakeup-source is defined as a boolean, we cannot distinguish the behavior of the two keys. May i know the better way to do this? Thank you. > > > +- mediatek,long-press-mode: Long press key shutdown setting, 1 for > > + pwrkey only, 2 for pwrkey/homekey together, others for disabled. > > +- debounce-interval: Long press key shutdown debouncing interval time > > + in seconds. 0/1/2/3 for 8/11/14/5 seconds. If not specified defaults to 0. > > + > > +Example: > > + > > + pmic: mt6397 { > > + compatible = "mediatek,mt6397"; > > + > > + ... > > + > > + mt6397keys: mt6397keys { > > + compatible = "mediatek,mt6397-keys"; > > + linux,keycodes = <KEY_POWER>, <KEY_VOLUMEDOWN>; > > + wakeup-source = <1>, <0>; > > + mediatek,long-press-mode = <1>; > > + debounce-interval = <0>; > > + }; > > + }; > > -- > > 1.7.9.5 > > ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v3 2/5] dt-bindings: input: Add document bindings for mtk-pmic-keys 2017-08-31 19:52 ` Rob Herring 2017-09-01 2:00 ` Chen Zhong @ 2017-09-02 2:16 ` Chen Zhong 2017-09-05 16:05 ` Rob Herring 1 sibling, 1 reply; 19+ messages in thread From: Chen Zhong @ 2017-09-02 2:16 UTC (permalink / raw) To: Rob Herring Cc: Dmitry Torokhov, Mark Rutland, Matthias Brugger, Lee Jones, Eddie Huang, Alessandro Zummo, Alexandre Belloni, Andi Shyti, Javier Martinez Canillas, Linus Walleij, Jaechul Lee, linux-input, devicetree, linux-arm-kernel, linux-mediatek, linux-kernel, linux-rtc On Thu, 2017-08-31 at 14:52 -0500, Rob Herring wrote: > On Fri, Aug 25, 2017 at 02:32:30PM +0800, Chen Zhong wrote: > > This patch adds the device tree binding documentation for the MediaTek > > pmic keys found on PMIC MT6397/MT6323. > > > > Signed-off-by: Chen Zhong <chen.zhong@mediatek.com> > > --- > > .../devicetree/bindings/input/mtk-pmic-keys.txt | 38 ++++++++++++++++++++ > > 1 file changed, 38 insertions(+) > > create mode 100644 Documentation/devicetree/bindings/input/mtk-pmic-keys.txt > > > > diff --git a/Documentation/devicetree/bindings/input/mtk-pmic-keys.txt b/Documentation/devicetree/bindings/input/mtk-pmic-keys.txt > > new file mode 100644 > > index 0000000..100ec44 > > --- /dev/null > > +++ b/Documentation/devicetree/bindings/input/mtk-pmic-keys.txt > > @@ -0,0 +1,38 @@ > > +MediaTek MT6397/MT6323 PMIC Keys Device Driver > > + > > +There are two key functions provided by MT6397/MT6323 PMIC, pwrkey > > +and homekey. The key functions are defined as the subnode of the function > > +node provided by MT6397/MT6323 PMIC that is being defined as one kind > > +of Muti-Function Device (MFD) > > + > > +For MT6397/MT6323 MFD bindings see: > > +Documentation/devicetree/bindings/mfd/mt6397.txt > > + > > +Required properties: > > +- compatible: "mediatek,mt6397-keys" or "mediatek,mt6323-keys" > > +- linux,keycodes: Specifies the numeric keycode values to > > + be used for reporting keys presses. The array can > > + contain up to 2 entries. > > + > > +Optional Properties: > > +- wakeup-source: each key can be used as a wakeup source. > > wakeup-source is defined as a boolean. Hi Rob, Could I modify it as this? mediatek,wakeup-keys = <1>, <0>; wakeup-source; Thanks. > > > +- mediatek,long-press-mode: Long press key shutdown setting, 1 for > > + pwrkey only, 2 for pwrkey/homekey together, others for disabled. > > +- debounce-interval: Long press key shutdown debouncing interval time > > + in seconds. 0/1/2/3 for 8/11/14/5 seconds. If not specified defaults to 0. > > + > > +Example: > > + > > + pmic: mt6397 { > > + compatible = "mediatek,mt6397"; > > + > > + ... > > + > > + mt6397keys: mt6397keys { > > + compatible = "mediatek,mt6397-keys"; > > + linux,keycodes = <KEY_POWER>, <KEY_VOLUMEDOWN>; > > + wakeup-source = <1>, <0>; > > + mediatek,long-press-mode = <1>; > > + debounce-interval = <0>; > > + }; > > + }; > > -- > > 1.7.9.5 > > ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v3 2/5] dt-bindings: input: Add document bindings for mtk-pmic-keys 2017-09-02 2:16 ` Chen Zhong @ 2017-09-05 16:05 ` Rob Herring 2017-09-07 3:05 ` Chen Zhong 0 siblings, 1 reply; 19+ messages in thread From: Rob Herring @ 2017-09-05 16:05 UTC (permalink / raw) To: Chen Zhong Cc: Dmitry Torokhov, Mark Rutland, Matthias Brugger, Lee Jones, Eddie Huang, Alessandro Zummo, Alexandre Belloni, Andi Shyti, Javier Martinez Canillas, Linus Walleij, Jaechul Lee, linux-input@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek, linux-kernel@vger.kernel.org On Fri, Sep 1, 2017 at 9:16 PM, Chen Zhong <chen.zhong@mediatek.com> wrote: > On Thu, 2017-08-31 at 14:52 -0500, Rob Herring wrote: >> On Fri, Aug 25, 2017 at 02:32:30PM +0800, Chen Zhong wrote: >> > This patch adds the device tree binding documentation for the MediaTek >> > pmic keys found on PMIC MT6397/MT6323. >> > >> > Signed-off-by: Chen Zhong <chen.zhong@mediatek.com> >> > --- >> > .../devicetree/bindings/input/mtk-pmic-keys.txt | 38 ++++++++++++++++++++ >> > 1 file changed, 38 insertions(+) >> > create mode 100644 Documentation/devicetree/bindings/input/mtk-pmic-keys.txt >> > >> > diff --git a/Documentation/devicetree/bindings/input/mtk-pmic-keys.txt b/Documentation/devicetree/bindings/input/mtk-pmic-keys.txt >> > new file mode 100644 >> > index 0000000..100ec44 >> > --- /dev/null >> > +++ b/Documentation/devicetree/bindings/input/mtk-pmic-keys.txt >> > @@ -0,0 +1,38 @@ >> > +MediaTek MT6397/MT6323 PMIC Keys Device Driver >> > + >> > +There are two key functions provided by MT6397/MT6323 PMIC, pwrkey >> > +and homekey. The key functions are defined as the subnode of the function >> > +node provided by MT6397/MT6323 PMIC that is being defined as one kind >> > +of Muti-Function Device (MFD) >> > + >> > +For MT6397/MT6323 MFD bindings see: >> > +Documentation/devicetree/bindings/mfd/mt6397.txt >> > + >> > +Required properties: >> > +- compatible: "mediatek,mt6397-keys" or "mediatek,mt6323-keys" >> > +- linux,keycodes: Specifies the numeric keycode values to >> > + be used for reporting keys presses. The array can >> > + contain up to 2 entries. >> > + >> > +Optional Properties: >> > +- wakeup-source: each key can be used as a wakeup source. >> >> wakeup-source is defined as a boolean. > > Hi Rob, > > Could I modify it as this? > > mediatek,wakeup-keys = <1>, <0>; > wakeup-source; What do the values and index signify? The power key is index 0 and the value 1 means enable wakeup? Or each value is the raw key (i.e. indexes in linux,keycode) that wakeup is enabled for? I don't think this should be in DT really. It's really up to the user (i.e. userspace) to decide what keys cause wakeup (or maybe that's only suspend). If you default to the power key causes wakeup, do you really need to support different options? If we do put this in DT, then it should be a common binding to specify keys that cause wake-up. Rob ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v3 2/5] dt-bindings: input: Add document bindings for mtk-pmic-keys 2017-09-05 16:05 ` Rob Herring @ 2017-09-07 3:05 ` Chen Zhong 0 siblings, 0 replies; 19+ messages in thread From: Chen Zhong @ 2017-09-07 3:05 UTC (permalink / raw) To: Rob Herring Cc: Dmitry Torokhov, Mark Rutland, Matthias Brugger, Lee Jones, Eddie Huang, Alessandro Zummo, Alexandre Belloni, Andi Shyti, Javier Martinez Canillas, Linus Walleij, Jaechul Lee, linux-input@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek, linux-kernel@vger.kernel.org On Tue, 2017-09-05 at 11:05 -0500, Rob Herring wrote: > On Fri, Sep 1, 2017 at 9:16 PM, Chen Zhong <chen.zhong@mediatek.com> wrote: > > On Thu, 2017-08-31 at 14:52 -0500, Rob Herring wrote: > >> On Fri, Aug 25, 2017 at 02:32:30PM +0800, Chen Zhong wrote: > >> > This patch adds the device tree binding documentation for the MediaTek > >> > pmic keys found on PMIC MT6397/MT6323. > >> > > >> > Signed-off-by: Chen Zhong <chen.zhong@mediatek.com> > >> > --- > >> > .../devicetree/bindings/input/mtk-pmic-keys.txt | 38 ++++++++++++++++++++ > >> > 1 file changed, 38 insertions(+) > >> > create mode 100644 Documentation/devicetree/bindings/input/mtk-pmic-keys.txt > >> > > >> > diff --git a/Documentation/devicetree/bindings/input/mtk-pmic-keys.txt b/Documentation/devicetree/bindings/input/mtk-pmic-keys.txt > >> > new file mode 100644 > >> > index 0000000..100ec44 > >> > --- /dev/null > >> > +++ b/Documentation/devicetree/bindings/input/mtk-pmic-keys.txt > >> > @@ -0,0 +1,38 @@ > >> > +MediaTek MT6397/MT6323 PMIC Keys Device Driver > >> > + > >> > +There are two key functions provided by MT6397/MT6323 PMIC, pwrkey > >> > +and homekey. The key functions are defined as the subnode of the function > >> > +node provided by MT6397/MT6323 PMIC that is being defined as one kind > >> > +of Muti-Function Device (MFD) > >> > + > >> > +For MT6397/MT6323 MFD bindings see: > >> > +Documentation/devicetree/bindings/mfd/mt6397.txt > >> > + > >> > +Required properties: > >> > +- compatible: "mediatek,mt6397-keys" or "mediatek,mt6323-keys" > >> > +- linux,keycodes: Specifies the numeric keycode values to > >> > + be used for reporting keys presses. The array can > >> > + contain up to 2 entries. > >> > + > >> > +Optional Properties: > >> > +- wakeup-source: each key can be used as a wakeup source. > >> > >> wakeup-source is defined as a boolean. > > > > Hi Rob, > > > > Could I modify it as this? > > > > mediatek,wakeup-keys = <1>, <0>; > > wakeup-source; > > What do the values and index signify? The power key is index 0 and the > value 1 means enable wakeup? Or each value is the raw key (i.e. > indexes in linux,keycode) that wakeup is enabled for? > > I don't think this should be in DT really. It's really up to the user > (i.e. userspace) to decide what keys cause wakeup (or maybe that's > only suspend). If you default to the power key causes wakeup, do you > really need to support different options? > > If we do put this in DT, then it should be a common binding to specify > keys that cause wake-up. > > Rob Hi Rob, Yes, we want to describe that power key is index 0 and is a wakeup source, homekey is index 1 and not a wakeup source. Since power key and homekey are two real HW keys, customer can decide which key to be the wakeup source or both due to their hw design, so we put this in DT and can be different for different boards. Thank you. Chen ^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH v3 4/5] input: Add MediaTek PMIC keys support 2017-08-25 6:32 [PATCH v3 0/5] Add MediaTek PMIC keys support Chen Zhong 2017-08-25 6:32 ` [PATCH v3 1/5] mfd: mt6397: create irq mappings in mfd core driver Chen Zhong 2017-08-25 6:32 ` [PATCH v3 2/5] dt-bindings: input: Add document bindings for mtk-pmic-keys Chen Zhong @ 2017-08-25 6:32 ` Chen Zhong 2017-08-28 16:57 ` Dmitry Torokhov 2017-08-29 7:34 ` Andi Shyti 2017-08-25 6:32 ` [PATCH v3 5/5] mfd: mt6397: Add PMIC keys support to MT6397 driver Chen Zhong [not found] ` <1503642753-12385-1-git-send-email-chen.zhong-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org> 4 siblings, 2 replies; 19+ messages in thread From: Chen Zhong @ 2017-08-25 6:32 UTC (permalink / raw) To: Dmitry Torokhov Cc: Rob Herring, Mark Rutland, Matthias Brugger, Lee Jones, Eddie Huang, Alessandro Zummo, Alexandre Belloni, Andi Shyti, Javier Martinez Canillas, Chen Zhong, Linus Walleij, Jaechul Lee, linux-input, devicetree, linux-arm-kernel, linux-mediatek, linux-kernel, linux-rtc This patch add support to handle MediaTek PMIC MT6397/MT6323 key interrupts including pwrkey and homekey, also add setting for long press key shutdown behavior. Signed-off-by: Chen Zhong <chen.zhong@mediatek.com> --- drivers/input/keyboard/Kconfig | 9 + drivers/input/keyboard/Makefile | 1 + drivers/input/keyboard/mtk-pmic-keys.c | 308 ++++++++++++++++++++++++++++++++ 3 files changed, 318 insertions(+) create mode 100644 drivers/input/keyboard/mtk-pmic-keys.c diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig index 4c4ab1c..bd4e20a 100644 --- a/drivers/input/keyboard/Kconfig +++ b/drivers/input/keyboard/Kconfig @@ -756,4 +756,13 @@ config KEYBOARD_BCM To compile this driver as a module, choose M here: the module will be called bcm-keypad. +config KEYBOARD_MTK_PMIC + tristate "MediaTek PMIC keys support" + depends on MFD_MT6397 + help + Say Y here if you want to use the pmic keys (powerkey/homekey). + + To compile this driver as a module, choose M here: the + module will be called pmic-keys. + endif diff --git a/drivers/input/keyboard/Makefile b/drivers/input/keyboard/Makefile index d2338ba..20c0b98 100644 --- a/drivers/input/keyboard/Makefile +++ b/drivers/input/keyboard/Makefile @@ -40,6 +40,7 @@ obj-$(CONFIG_KEYBOARD_MATRIX) += matrix_keypad.o obj-$(CONFIG_KEYBOARD_MAX7359) += max7359_keypad.o obj-$(CONFIG_KEYBOARD_MCS) += mcs_touchkey.o obj-$(CONFIG_KEYBOARD_MPR121) += mpr121_touchkey.o +obj-$(CONFIG_KEYBOARD_MTK_PMIC) += mtk-pmic-keys.o obj-$(CONFIG_KEYBOARD_NEWTON) += newtonkbd.o obj-$(CONFIG_KEYBOARD_NOMADIK) += nomadik-ske-keypad.o obj-$(CONFIG_KEYBOARD_NSPIRE) += nspire-keypad.o diff --git a/drivers/input/keyboard/mtk-pmic-keys.c b/drivers/input/keyboard/mtk-pmic-keys.c new file mode 100644 index 0000000..40518ce --- /dev/null +++ b/drivers/input/keyboard/mtk-pmic-keys.c @@ -0,0 +1,308 @@ +/* + * Copyright (C) 2017 MediaTek, Inc. + * + * Author: Chen Zhong <chen.zhong@mediatek.com> + * + * This software is licensed under the terms of the GNU General Public + * License version 2, as published by the Free Software Foundation, and + * may be copied, distributed, and modified under those terms. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + */ + +#include <linux/module.h> +#include <linux/kernel.h> +#include <linux/input.h> +#include <linux/interrupt.h> +#include <linux/platform_device.h> +#include <linux/kernel.h> +#include <linux/of.h> +#include <linux/of_device.h> +#include <linux/regmap.h> +#include <linux/mfd/mt6323/registers.h> +#include <linux/mfd/mt6397/registers.h> +#include <linux/mfd/mt6397/core.h> + +#define PWRKEY_RST_EN_MASK 0x1 +#define PWRKEY_RST_EN_SHIFT 6 +#define HOMEKEY_RST_EN_MASK 0x1 +#define HOMEKEY_RST_EN_SHIFT 5 +#define RST_DU_MASK 0x3 +#define RST_DU_SHIFT 8 + +#define PMIC_PWRKEY_INDEX 0 +#define PMIC_HOMEKEY_INDEX 1 +#define PMIC_MAX_KEY_COUNT 2 + +struct pmic_keys_regs { + u32 deb_reg; + u32 deb_mask; + u32 intsel_reg; + u32 intsel_mask; +}; + +#define PMIC_KEYS_REGS(_deb_reg, _deb_mask, _intsel_reg, _intsel_mask) \ +{ \ + .deb_reg = _deb_reg, \ + .deb_mask = _deb_mask, \ + .intsel_reg = _intsel_reg, \ + .intsel_mask = _intsel_mask, \ +} + +struct pmic_regs { + const struct pmic_keys_regs keys_regs[PMIC_MAX_KEY_COUNT]; + u32 pmic_rst_reg; +}; + +static const struct pmic_regs mt6397_regs = { + .keys_regs[PMIC_PWRKEY_INDEX] = PMIC_KEYS_REGS(MT6397_CHRSTATUS, + 0x8, MT6397_INT_RSV, 0x10), + .keys_regs[PMIC_HOMEKEY_INDEX] = PMIC_KEYS_REGS(MT6397_OCSTATUS2, + 0x10, MT6397_INT_RSV, 0x8), + .pmic_rst_reg = MT6397_TOP_RST_MISC, +}; + +static const struct pmic_regs mt6323_regs = { + .keys_regs[PMIC_PWRKEY_INDEX] = PMIC_KEYS_REGS(MT6323_CHRSTATUS, + 0x2, MT6323_INT_MISC_CON, 0x10), + .keys_regs[PMIC_HOMEKEY_INDEX] = PMIC_KEYS_REGS(MT6323_CHRSTATUS, + 0x4, MT6323_INT_MISC_CON, 0x8), + .pmic_rst_reg = MT6323_TOP_RST_MISC, +}; + +struct pmic_keys_info { + struct mtk_pmic_keys *keys; + const struct pmic_keys_regs *regs; + unsigned int keycode; + int irq; + bool wakeup:1; +}; + +struct mtk_pmic_keys { + struct input_dev *input_dev; + struct device *dev; + struct regmap *regmap; + struct pmic_keys_info keys[PMIC_MAX_KEY_COUNT]; +}; + +enum long_press_mode { + LP_DISABLE, + LP_ONEKEY, + LP_TWOKEY, +}; + +static void long_press_reset_setup(struct mtk_pmic_keys *keys, u32 pmic_rst_reg) +{ + int ret; + u32 long_press_mode, long_press_debounce; + + ret = of_property_read_u32(keys->dev->of_node, + "debounce-interval", &long_press_debounce); + if (ret) + long_press_debounce = 0; + + regmap_update_bits(keys->regmap, pmic_rst_reg, + RST_DU_MASK << RST_DU_SHIFT, + long_press_debounce << RST_DU_SHIFT); + + ret = of_property_read_u32(keys->dev->of_node, + "mediatek,long-press-mode", &long_press_mode); + if (ret) + long_press_mode = LP_DISABLE; + + switch (long_press_mode) { + case LP_ONEKEY: + regmap_update_bits(keys->regmap, pmic_rst_reg, + PWRKEY_RST_EN_MASK << PWRKEY_RST_EN_SHIFT, + PWRKEY_RST_EN_MASK << PWRKEY_RST_EN_SHIFT); + regmap_update_bits(keys->regmap, pmic_rst_reg, + HOMEKEY_RST_EN_MASK << HOMEKEY_RST_EN_SHIFT, + 0); + break; + case LP_TWOKEY: + regmap_update_bits(keys->regmap, pmic_rst_reg, + PWRKEY_RST_EN_MASK << PWRKEY_RST_EN_SHIFT, + PWRKEY_RST_EN_MASK << PWRKEY_RST_EN_SHIFT); + regmap_update_bits(keys->regmap, pmic_rst_reg, + HOMEKEY_RST_EN_MASK << HOMEKEY_RST_EN_SHIFT, + HOMEKEY_RST_EN_MASK << HOMEKEY_RST_EN_SHIFT); + break; + case LP_DISABLE: + regmap_update_bits(keys->regmap, pmic_rst_reg, + PWRKEY_RST_EN_MASK << PWRKEY_RST_EN_SHIFT, + 0); + regmap_update_bits(keys->regmap, pmic_rst_reg, + HOMEKEY_RST_EN_MASK << HOMEKEY_RST_EN_SHIFT, + 0); + break; + default: + break; + } +} + +static irqreturn_t mtk_pmic_keys_irq_handler_thread(int irq, void *data) +{ + struct pmic_keys_info *info = data; + u32 key_deb, pressed; + + regmap_read(info->keys->regmap, info->regs->deb_reg, &key_deb); + + key_deb &= info->regs->deb_mask; + + pressed = !key_deb; + + input_report_key(info->keys->input_dev, info->keycode, pressed); + input_sync(info->keys->input_dev); + + dev_dbg(info->keys->dev, "(%s) key =%d using PMIC\n", + pressed ? "pressed" : "released", info->keycode); + + return IRQ_HANDLED; +} + +static int mtk_pmic_key_setup(struct mtk_pmic_keys *keys, + struct pmic_keys_info *info) +{ + int ret; + + info->keys = keys; + + ret = regmap_update_bits(keys->regmap, info->regs->intsel_reg, + info->regs->intsel_mask, + info->regs->intsel_mask); + if (ret < 0) + return ret; + + ret = devm_request_threaded_irq(keys->dev, info->irq, NULL, + mtk_pmic_keys_irq_handler_thread, + IRQF_ONESHOT | IRQF_TRIGGER_HIGH, + "mtk-pmic-keys", info); + if (ret) { + dev_err(keys->dev, "Failed to request IRQ: %d: %d\n", + info->irq, ret); + return ret; + } + + if (info->wakeup) + irq_set_irq_wake(info->irq, 1); + + input_set_capability(keys->input_dev, EV_KEY, info->keycode); + + return 0; +} + +static const struct of_device_id of_pmic_keys_match_tbl[] = { + { + .compatible = "mediatek,mt6397-keys", + .data = &mt6397_regs, + }, { + .compatible = "mediatek,mt6323-keys", + .data = &mt6323_regs, + }, { + /* sentinel */ + } +}; +MODULE_DEVICE_TABLE(of, of_pmic_keys_match_tbl); + +static int mtk_pmic_keys_probe(struct platform_device *pdev) +{ + int error, index = 0; + unsigned int keycount; + unsigned int keycodes[PMIC_MAX_KEY_COUNT]; + unsigned int wakeup_srcs[PMIC_MAX_KEY_COUNT]; + struct mt6397_chip *pmic_chip = dev_get_drvdata(pdev->dev.parent); + struct mtk_pmic_keys *keys; + const struct pmic_regs *pmic_regs; + struct input_dev *input_dev; + const struct of_device_id *of_id = + of_match_device(of_pmic_keys_match_tbl, &pdev->dev); + + keys = devm_kzalloc(&pdev->dev, sizeof(*keys), GFP_KERNEL); + if (!keys) + return -ENOMEM; + + keys->dev = &pdev->dev; + keys->regmap = pmic_chip->regmap; + pmic_regs = of_id->data; + + keys->input_dev = input_dev = devm_input_allocate_device(keys->dev); + if (!input_dev) { + dev_err(keys->dev, "input allocate device fail.\n"); + return -ENOMEM; + } + + input_dev->name = "mtk-pmic-keys"; + input_dev->id.bustype = BUS_HOST; + input_dev->id.vendor = 0x0001; + input_dev->id.product = 0x0001; + input_dev->id.version = 0x0001; + + keycount = device_property_read_u32_array(keys->dev, "linux,keycodes", + NULL, 0); + if (keycount > PMIC_MAX_KEY_COUNT) { + dev_err(keys->dev, "too many keys defined (%d)\n", keycount); + return -EINVAL; + } + + error = device_property_read_u32_array(keys->dev, "linux,keycodes", + keycodes, keycount); + if (error) { + dev_err(keys->dev, + "failed to read linux,keycode property: %d\n", error); + return error; + } + + error = device_property_read_u32_array(keys->dev, "wakeup-source", + wakeup_srcs, keycount); + if (error) { + dev_err(keys->dev, + "failed to read wakeup-source property: %d\n", error); + return error; + } + + for (index = 0; index < keycount; index++) { + keys->keys[index].regs = &pmic_regs->keys_regs[index]; + + keys->keys[index].irq = platform_get_irq(pdev, index); + if (keys->keys[index].irq < 0) + return keys->keys[index].irq; + + keys->keys[index].keycode = keycodes[index]; + + if (wakeup_srcs[index]) + keys->keys[index].wakeup = true; + + error = mtk_pmic_key_setup(keys, &keys->keys[index]); + if (error) + return error; + } + + error = input_register_device(input_dev); + if (error) { + dev_err(&pdev->dev, + "register input device failed (%d)\n", error); + return error; + } + + long_press_reset_setup(keys, pmic_regs->pmic_rst_reg); + + return 0; +} + +static struct platform_driver pmic_keys_pdrv = { + .probe = mtk_pmic_keys_probe, + .driver = { + .name = "mtk-pmic-keys", + .of_match_table = of_pmic_keys_match_tbl, + }, +}; + +module_platform_driver(pmic_keys_pdrv); + +MODULE_LICENSE("GPL v2"); +MODULE_AUTHOR("Chen Zhong <chen.zhong@mediatek.com>"); +MODULE_DESCRIPTION("MTK pmic-keys driver v0.1"); -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 19+ messages in thread
* Re: [PATCH v3 4/5] input: Add MediaTek PMIC keys support 2017-08-25 6:32 ` [PATCH v3 4/5] input: Add MediaTek PMIC keys support Chen Zhong @ 2017-08-28 16:57 ` Dmitry Torokhov 2017-08-29 2:11 ` Chen Zhong 2017-08-29 7:34 ` Andi Shyti 1 sibling, 1 reply; 19+ messages in thread From: Dmitry Torokhov @ 2017-08-28 16:57 UTC (permalink / raw) To: Chen Zhong Cc: Rob Herring, Mark Rutland, Matthias Brugger, Lee Jones, Eddie Huang, Alessandro Zummo, Alexandre Belloni, Andi Shyti, Javier Martinez Canillas, Linus Walleij, Jaechul Lee, linux-input, devicetree, linux-arm-kernel, linux-mediatek, linux-kernel, linux-rtc Hi Chen, On Fri, Aug 25, 2017 at 02:32:32PM +0800, Chen Zhong wrote: > +static int mtk_pmic_key_setup(struct mtk_pmic_keys *keys, > + struct pmic_keys_info *info) > +{ > + int ret; > + > + info->keys = keys; > + > + ret = regmap_update_bits(keys->regmap, info->regs->intsel_reg, > + info->regs->intsel_mask, > + info->regs->intsel_mask); > + if (ret < 0) > + return ret; > + > + ret = devm_request_threaded_irq(keys->dev, info->irq, NULL, > + mtk_pmic_keys_irq_handler_thread, > + IRQF_ONESHOT | IRQF_TRIGGER_HIGH, > + "mtk-pmic-keys", info); > + if (ret) { > + dev_err(keys->dev, "Failed to request IRQ: %d: %d\n", > + info->irq, ret); > + return ret; > + } > + > + if (info->wakeup) > + irq_set_irq_wake(info->irq, 1); Normally we do this in suspend() (and undo in resume()), and I believe the drover API is enable_irq_wake() and disable_irq_wake(). Thanks. -- Dmitry ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v3 4/5] input: Add MediaTek PMIC keys support 2017-08-28 16:57 ` Dmitry Torokhov @ 2017-08-29 2:11 ` Chen Zhong 0 siblings, 0 replies; 19+ messages in thread From: Chen Zhong @ 2017-08-29 2:11 UTC (permalink / raw) To: Dmitry Torokhov Cc: Rob Herring, Mark Rutland, Matthias Brugger, Lee Jones, Eddie Huang, Alessandro Zummo, Alexandre Belloni, Andi Shyti, Javier Martinez Canillas, Linus Walleij, Jaechul Lee, linux-input, devicetree, linux-arm-kernel, linux-mediatek, linux-kernel, linux-rtc On Mon, 2017-08-28 at 09:57 -0700, Dmitry Torokhov wrote: > Hi Chen, > > On Fri, Aug 25, 2017 at 02:32:32PM +0800, Chen Zhong wrote: > > +static int mtk_pmic_key_setup(struct mtk_pmic_keys *keys, > > + struct pmic_keys_info *info) > > +{ > > + int ret; > > + > > + info->keys = keys; > > + > > + ret = regmap_update_bits(keys->regmap, info->regs->intsel_reg, > > + info->regs->intsel_mask, > > + info->regs->intsel_mask); > > + if (ret < 0) > > + return ret; > > + > > + ret = devm_request_threaded_irq(keys->dev, info->irq, NULL, > > + mtk_pmic_keys_irq_handler_thread, > > + IRQF_ONESHOT | IRQF_TRIGGER_HIGH, > > + "mtk-pmic-keys", info); > > + if (ret) { > > + dev_err(keys->dev, "Failed to request IRQ: %d: %d\n", > > + info->irq, ret); > > + return ret; > > + } > > + > > + if (info->wakeup) > > + irq_set_irq_wake(info->irq, 1); > > Normally we do this in suspend() (and undo in resume()), and I believe > the drover API is enable_irq_wake() and disable_irq_wake(). > Hi Dmitry, I'll add suspend/resume callback functions and do this with enable_irq_wake() and disable_irq_wake(). Thank you. > Thanks. > ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v3 4/5] input: Add MediaTek PMIC keys support 2017-08-25 6:32 ` [PATCH v3 4/5] input: Add MediaTek PMIC keys support Chen Zhong 2017-08-28 16:57 ` Dmitry Torokhov @ 2017-08-29 7:34 ` Andi Shyti 2017-08-29 7:40 ` Chen Zhong 1 sibling, 1 reply; 19+ messages in thread From: Andi Shyti @ 2017-08-29 7:34 UTC (permalink / raw) To: Chen Zhong Cc: Dmitry Torokhov, Rob Herring, Mark Rutland, Matthias Brugger, Lee Jones, Eddie Huang, Alessandro Zummo, Alexandre Belloni, Javier Martinez Canillas, Linus Walleij, Jaechul Lee, linux-input, devicetree, linux-arm-kernel, linux-mediatek, linux-kernel, linux-rtc Hi Chen, what I would ask you is to be consistent with the naming, if your driver is called mtk-pmic, then all your functions and global variables should be named accordingly as mtk_pmic or MTK_PMIC. Please check in between the lines for real examples: > +#define PWRKEY_RST_EN_MASK 0x1 > +#define PWRKEY_RST_EN_SHIFT 6 > +#define HOMEKEY_RST_EN_MASK 0x1 > +#define HOMEKEY_RST_EN_SHIFT 5 > +#define RST_DU_MASK 0x3 > +#define RST_DU_SHIFT 8 > + > +#define PMIC_PWRKEY_INDEX 0 > +#define PMIC_HOMEKEY_INDEX 1 > +#define PMIC_MAX_KEY_COUNT 2 #define MTK_PMIC_* > +struct pmic_keys_regs { struct mtk_pmic_keys_regs > + u32 deb_reg; > + u32 deb_mask; > + u32 intsel_reg; > + u32 intsel_mask; > +}; > + > +#define PMIC_KEYS_REGS(_deb_reg, _deb_mask, _intsel_reg, _intsel_mask) \ MTK_PMIC_KEYS_REGS > +{ \ > + .deb_reg = _deb_reg, \ > + .deb_mask = _deb_mask, \ > + .intsel_reg = _intsel_reg, \ > + .intsel_mask = _intsel_mask, \ > +} > + > +struct pmic_regs { mtk_pmic_regs and so on... you got the point. Andi ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v3 4/5] input: Add MediaTek PMIC keys support 2017-08-29 7:34 ` Andi Shyti @ 2017-08-29 7:40 ` Chen Zhong 0 siblings, 0 replies; 19+ messages in thread From: Chen Zhong @ 2017-08-29 7:40 UTC (permalink / raw) To: Andi Shyti Cc: Dmitry Torokhov, Rob Herring, Mark Rutland, Matthias Brugger, Lee Jones, Eddie Huang, Alessandro Zummo, Alexandre Belloni, Javier Martinez Canillas, Linus Walleij, Jaechul Lee, linux-input, devicetree, linux-arm-kernel, linux-mediatek, linux-kernel, linux-rtc Hi Andi, Sorry for that, i deleted some prefix since the namings will be such long. If this should be consistent, I'll check and modify them in the next version. Thank you. On Tue, 2017-08-29 at 16:34 +0900, Andi Shyti wrote: > Hi Chen, > > what I would ask you is to be consistent with the naming, if your > driver is called mtk-pmic, then all your functions and global > variables should be named accordingly as mtk_pmic or MTK_PMIC. > Please check in between the lines for real examples: > > > +#define PWRKEY_RST_EN_MASK 0x1 > > +#define PWRKEY_RST_EN_SHIFT 6 > > +#define HOMEKEY_RST_EN_MASK 0x1 > > +#define HOMEKEY_RST_EN_SHIFT 5 > > +#define RST_DU_MASK 0x3 > > +#define RST_DU_SHIFT 8 > > + > > +#define PMIC_PWRKEY_INDEX 0 > > +#define PMIC_HOMEKEY_INDEX 1 > > +#define PMIC_MAX_KEY_COUNT 2 > > #define MTK_PMIC_* > > > +struct pmic_keys_regs { > > struct mtk_pmic_keys_regs > > > + u32 deb_reg; > > + u32 deb_mask; > > + u32 intsel_reg; > > + u32 intsel_mask; > > +}; > > + > > +#define PMIC_KEYS_REGS(_deb_reg, _deb_mask, _intsel_reg, _intsel_mask) \ > > MTK_PMIC_KEYS_REGS > > > +{ \ > > + .deb_reg = _deb_reg, \ > > + .deb_mask = _deb_mask, \ > > + .intsel_reg = _intsel_reg, \ > > + .intsel_mask = _intsel_mask, \ > > +} > > + > > +struct pmic_regs { > > mtk_pmic_regs > > and so on... you got the point. > > Andi ^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH v3 5/5] mfd: mt6397: Add PMIC keys support to MT6397 driver 2017-08-25 6:32 [PATCH v3 0/5] Add MediaTek PMIC keys support Chen Zhong ` (2 preceding siblings ...) 2017-08-25 6:32 ` [PATCH v3 4/5] input: Add MediaTek PMIC keys support Chen Zhong @ 2017-08-25 6:32 ` Chen Zhong 2017-09-05 7:37 ` Lee Jones [not found] ` <1503642753-12385-1-git-send-email-chen.zhong-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org> 4 siblings, 1 reply; 19+ messages in thread From: Chen Zhong @ 2017-08-25 6:32 UTC (permalink / raw) To: Dmitry Torokhov Cc: Rob Herring, Mark Rutland, Matthias Brugger, Lee Jones, Eddie Huang, Alessandro Zummo, Alexandre Belloni, Andi Shyti, Javier Martinez Canillas, Chen Zhong, Linus Walleij, Jaechul Lee, linux-input, devicetree, linux-arm-kernel, linux-mediatek, linux-kernel, linux-rtc This patch adds compatible strings and interrupts for pmic keys which serves as child device of MFD. Signed-off-by: Chen Zhong <chen.zhong@mediatek.com> --- drivers/mfd/mt6397-core.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/drivers/mfd/mt6397-core.c b/drivers/mfd/mt6397-core.c index 6546d7f..77b64bd 100644 --- a/drivers/mfd/mt6397-core.c +++ b/drivers/mfd/mt6397-core.c @@ -43,6 +43,16 @@ }, }; +static const struct resource mt6323_keys_resources[] = { + DEFINE_RES_IRQ(MT6323_IRQ_STATUS_PWRKEY), + DEFINE_RES_IRQ(MT6323_IRQ_STATUS_FCHRKEY), +}; + +static const struct resource mt6397_keys_resources[] = { + DEFINE_RES_IRQ(MT6397_IRQ_PWRKEY), + DEFINE_RES_IRQ(MT6397_IRQ_HOMEKEY), +}; + static const struct mfd_cell mt6323_devs[] = { { .name = "mt6323-regulator", @@ -50,6 +60,11 @@ }, { .name = "mt6323-led", .of_compatible = "mediatek,mt6323-led" + }, { + .name = "mtk-pmic-keys", + .num_resources = ARRAY_SIZE(mt6323_keys_resources), + .resources = mt6323_keys_resources, + .of_compatible = "mediatek,mt6323-keys" }, }; @@ -71,7 +86,12 @@ }, { .name = "mt6397-pinctrl", .of_compatible = "mediatek,mt6397-pinctrl", - }, + }, { + .name = "mtk-pmic-keys", + .num_resources = ARRAY_SIZE(mt6397_keys_resources), + .resources = mt6397_keys_resources, + .of_compatible = "mediatek,mt6397-keys" + } }; static void mt6397_irq_lock(struct irq_data *data) -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 19+ messages in thread
* Re: [PATCH v3 5/5] mfd: mt6397: Add PMIC keys support to MT6397 driver 2017-08-25 6:32 ` [PATCH v3 5/5] mfd: mt6397: Add PMIC keys support to MT6397 driver Chen Zhong @ 2017-09-05 7:37 ` Lee Jones 0 siblings, 0 replies; 19+ messages in thread From: Lee Jones @ 2017-09-05 7:37 UTC (permalink / raw) To: Chen Zhong Cc: Dmitry Torokhov, Rob Herring, Mark Rutland, Matthias Brugger, Eddie Huang, Alessandro Zummo, Alexandre Belloni, Andi Shyti, Javier Martinez Canillas, Linus Walleij, Jaechul Lee, linux-input, devicetree, linux-arm-kernel, linux-mediatek, linux-kernel, linux-rtc On Fri, 25 Aug 2017, Chen Zhong wrote: > This patch adds compatible strings and interrupts for pmic keys > which serves as child device of MFD. > > Signed-off-by: Chen Zhong <chen.zhong@mediatek.com> > --- > drivers/mfd/mt6397-core.c | 22 +++++++++++++++++++++- > 1 file changed, 21 insertions(+), 1 deletion(-) For my own reference: Acked-for-MFD-by: Lee Jones <lee.jones@linaro.org> -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog ^ permalink raw reply [flat|nested] 19+ messages in thread
[parent not found: <1503642753-12385-1-git-send-email-chen.zhong-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>]
* [PATCH v3 3/5] dt-bindings: mfd: Add bindings for the keys as subnode of PMIC [not found] ` <1503642753-12385-1-git-send-email-chen.zhong-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org> @ 2017-08-25 6:32 ` Chen Zhong 2017-09-05 7:36 ` Lee Jones 2017-08-26 2:30 ` [PATCH v3 0/5] Add MediaTek PMIC keys support Chen Zhong 1 sibling, 1 reply; 19+ messages in thread From: Chen Zhong @ 2017-08-25 6:32 UTC (permalink / raw) To: Dmitry Torokhov Cc: Rob Herring, Mark Rutland, Matthias Brugger, Lee Jones, Eddie Huang, Alessandro Zummo, Alexandre Belloni, Andi Shyti, Javier Martinez Canillas, Chen Zhong, Linus Walleij, Jaechul Lee, linux-input-u79uwXL29TY76Z2rM5mHXA, devicetree-u79uwXL29TY76Z2rM5mHXA, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, linux-kernel-u79uwXL29TY76Z2rM5mHXA, linux-rtc-u79uwXL29TY76Z2rM5mHXA This patch adds documentation for device tree bindings for keys support as the subnode of MT6397/MT6323 PMIC. Acked-by: Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> Signed-off-by: Chen Zhong <chen.zhong-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org> --- Documentation/devicetree/bindings/mfd/mt6397.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Documentation/devicetree/bindings/mfd/mt6397.txt b/Documentation/devicetree/bindings/mfd/mt6397.txt index 522a3bb..d1df77f 100644 --- a/Documentation/devicetree/bindings/mfd/mt6397.txt +++ b/Documentation/devicetree/bindings/mfd/mt6397.txt @@ -7,6 +7,7 @@ MT6397/MT6323 is a multifunction device with the following sub modules: - GPIO - Clock - LED +- Keys It is interfaced to host controller using SPI interface by a proprietary hardware called PMIC wrapper or pwrap. MT6397/MT6323 MFD is a child device of pwrap. @@ -40,6 +41,11 @@ Optional subnodes: - compatible: "mediatek,mt6323-led" see Documentation/devicetree/bindings/leds/leds-mt6323.txt +- keys + Required properties: + - compatible: "mediatek,mt6397-keys" or "mediatek,mt6323-keys" + see Documentation/devicetree/bindings/input/mtk-pmic-keys.txt + Example: pwrap: pwrap@1000f000 { compatible = "mediatek,mt8135-pwrap"; -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply related [flat|nested] 19+ messages in thread
* Re: [PATCH v3 3/5] dt-bindings: mfd: Add bindings for the keys as subnode of PMIC 2017-08-25 6:32 ` [PATCH v3 3/5] dt-bindings: mfd: Add bindings for the keys as subnode of PMIC Chen Zhong @ 2017-09-05 7:36 ` Lee Jones 0 siblings, 0 replies; 19+ messages in thread From: Lee Jones @ 2017-09-05 7:36 UTC (permalink / raw) To: Chen Zhong Cc: Dmitry Torokhov, Rob Herring, Mark Rutland, Matthias Brugger, Eddie Huang, Alessandro Zummo, Alexandre Belloni, Andi Shyti, Javier Martinez Canillas, Linus Walleij, Jaechul Lee, linux-input, devicetree, linux-arm-kernel, linux-mediatek, linux-kernel, linux-rtc On Fri, 25 Aug 2017, Chen Zhong wrote: > This patch adds documentation for device tree bindings for keys support > as the subnode of MT6397/MT6323 PMIC. > > Acked-by: Rob Herring <robh@kernel.org> > Signed-off-by: Chen Zhong <chen.zhong@mediatek.com> > --- > Documentation/devicetree/bindings/mfd/mt6397.txt | 6 ++++++ > 1 file changed, 6 insertions(+) For my own reference: Acked-for-MFD-by: Lee Jones <lee.jones@linaro.org> -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v3 0/5] Add MediaTek PMIC keys support [not found] ` <1503642753-12385-1-git-send-email-chen.zhong-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org> 2017-08-25 6:32 ` [PATCH v3 3/5] dt-bindings: mfd: Add bindings for the keys as subnode of PMIC Chen Zhong @ 2017-08-26 2:30 ` Chen Zhong 1 sibling, 0 replies; 19+ messages in thread From: Chen Zhong @ 2017-08-26 2:30 UTC (permalink / raw) To: Dmitry Torokhov Cc: Rob Herring, Mark Rutland, Matthias Brugger, Lee Jones, Eddie Huang, Alessandro Zummo, Alexandre Belloni, Andi Shyti, Javier Martinez Canillas, Linus Walleij, Jaechul Lee, linux-input-u79uwXL29TY76Z2rM5mHXA, devicetree-u79uwXL29TY76Z2rM5mHXA, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, linux-kernel-u79uwXL29TY76Z2rM5mHXA, linux-rtc-u79uwXL29TY76Z2rM5mHXA Sorry for missing the change history. Changes since v2: - use standard properties for keycodes and debounce time - change to use platform_get_irq in leaf drivers - use better ways to define IRQ resources Changes since v1: - create irq mappings in mfd core driver instead of leaf drivers - remove some unused parts in mtk-pmic-keys driver On Fri, 2017-08-25 at 14:32 +0800, Chen Zhong wrote: > MediaTek PMIC are multi-function devices that can handle key interrupts, > typically there are two keys attached to PMIC, which called pwrkey > and homekey. PWRKEY usually used to wake up system from sleep. Homekey > can used as volume down key due to board design. Long press keys can > shutdown PMIC, the mode can be choose to be one key only or two keys > together. > This series add support for key functions for MediaTek PMIC MT6397/MT6323. > > Chen Zhong (5): > mfd: mt6397: create irq mappings in mfd core driver > dt-bindings: input: Add document bindings for mtk-pmic-keys > dt-bindings: mfd: Add bindings for the keys as subnode of PMIC > input: Add MediaTek PMIC keys support > mfd: mt6397: Add PMIC keys support to MT6397 driver > > .../devicetree/bindings/input/mtk-pmic-keys.txt | 38 +++ > Documentation/devicetree/bindings/mfd/mt6397.txt | 6 + > drivers/input/keyboard/Kconfig | 9 + > drivers/input/keyboard/Makefile | 1 + > drivers/input/keyboard/mtk-pmic-keys.c | 308 +++++++++++++++++++++ > drivers/mfd/mt6397-core.c | 26 +- > drivers/rtc/rtc-mt6397.c | 7 +- > 7 files changed, 388 insertions(+), 7 deletions(-) > create mode 100644 Documentation/devicetree/bindings/input/mtk-pmic-keys.txt > create mode 100644 drivers/input/keyboard/mtk-pmic-keys.c > -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 19+ messages in thread
end of thread, other threads:[~2017-09-07 3:05 UTC | newest] Thread overview: 19+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2017-08-25 6:32 [PATCH v3 0/5] Add MediaTek PMIC keys support Chen Zhong 2017-08-25 6:32 ` [PATCH v3 1/5] mfd: mt6397: create irq mappings in mfd core driver Chen Zhong 2017-08-25 8:39 ` Alexandre Belloni 2017-08-25 6:32 ` [PATCH v3 2/5] dt-bindings: input: Add document bindings for mtk-pmic-keys Chen Zhong [not found] ` <1503642753-12385-3-git-send-email-chen.zhong-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org> 2017-08-31 19:52 ` Rob Herring 2017-09-01 2:00 ` Chen Zhong 2017-09-02 2:16 ` Chen Zhong 2017-09-05 16:05 ` Rob Herring 2017-09-07 3:05 ` Chen Zhong 2017-08-25 6:32 ` [PATCH v3 4/5] input: Add MediaTek PMIC keys support Chen Zhong 2017-08-28 16:57 ` Dmitry Torokhov 2017-08-29 2:11 ` Chen Zhong 2017-08-29 7:34 ` Andi Shyti 2017-08-29 7:40 ` Chen Zhong 2017-08-25 6:32 ` [PATCH v3 5/5] mfd: mt6397: Add PMIC keys support to MT6397 driver Chen Zhong 2017-09-05 7:37 ` Lee Jones [not found] ` <1503642753-12385-1-git-send-email-chen.zhong-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org> 2017-08-25 6:32 ` [PATCH v3 3/5] dt-bindings: mfd: Add bindings for the keys as subnode of PMIC Chen Zhong 2017-09-05 7:36 ` Lee Jones 2017-08-26 2:30 ` [PATCH v3 0/5] Add MediaTek PMIC keys support Chen Zhong
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).