2022-10-05 15:22:05

by Alexandre Mergnat

[permalink] [raw]
Subject: [PATCH v2 5/5] Input: mtk-pmic-keys: add MT6357 support

From: Fabien Parent <[email protected]>

Add PMIC Keys support on MT6357 SoC.

Signed-off-by: Fabien Parent <[email protected]>
Signed-off-by: Alexandre Mergnat <[email protected]>
---
drivers/input/keyboard/mtk-pmic-keys.c | 17 +++++++++++++++++
1 file changed, 17 insertions(+)

diff --git a/drivers/input/keyboard/mtk-pmic-keys.c b/drivers/input/keyboard/mtk-pmic-keys.c
index 9b34da0ec260..2a63e0718eb6 100644
--- a/drivers/input/keyboard/mtk-pmic-keys.c
+++ b/drivers/input/keyboard/mtk-pmic-keys.c
@@ -10,6 +10,7 @@
#include <linux/kernel.h>
#include <linux/mfd/mt6323/registers.h>
#include <linux/mfd/mt6331/registers.h>
+#include <linux/mfd/mt6357/registers.h>
#include <linux/mfd/mt6358/registers.h>
#include <linux/mfd/mt6397/core.h>
#include <linux/mfd/mt6397/registers.h>
@@ -90,6 +91,19 @@ static const struct mtk_pmic_regs mt6331_regs = {
.rst_lprst_mask = MTK_PMIC_MT6331_RST_DU_MASK,
};

+static const struct mtk_pmic_regs mt6357_regs = {
+ .keys_regs[MTK_PMIC_PWRKEY_INDEX] =
+ MTK_PMIC_KEYS_REGS(MT6357_TOPSTATUS,
+ 0x2, MT6357_PSC_TOP_INT_CON0, 0x5,
+ MTK_PMIC_PWRKEY_RST),
+ .keys_regs[MTK_PMIC_HOMEKEY_INDEX] =
+ MTK_PMIC_KEYS_REGS(MT6357_TOPSTATUS,
+ 0x8, MT6357_PSC_TOP_INT_CON0, 0xa,
+ MTK_PMIC_HOMEKEY_INDEX),
+ .pmic_rst_reg = MT6357_TOP_RST_MISC,
+ .rst_lprst_mask = MTK_PMIC_RST_DU_MASK,
+};
+
static const struct mtk_pmic_regs mt6358_regs = {
.keys_regs[MTK_PMIC_PWRKEY_INDEX] =
MTK_PMIC_KEYS_REGS(MT6358_TOPSTATUS,
@@ -276,6 +290,9 @@ static const struct of_device_id of_mtk_pmic_keys_match_tbl[] = {
}, {
.compatible = "mediatek,mt6331-keys",
.data = &mt6331_regs,
+ }, {
+ .compatible = "mediatek,mt6357-keys",
+ .data = &mt6357_regs,
}, {
.compatible = "mediatek,mt6358-keys",
.data = &mt6358_regs,

--
b4 0.10.1


2022-10-06 07:48:02

by Mattijs Korpershoek

[permalink] [raw]
Subject: Re: [PATCH v2 5/5] Input: mtk-pmic-keys: add MT6357 support

On Wed, Oct 05, 2022 at 16:57, Alexandre Mergnat <[email protected]> wrote:

> From: Fabien Parent <[email protected]>
>
> Add PMIC Keys support on MT6357 SoC.
>
> Signed-off-by: Fabien Parent <[email protected]>
> Signed-off-by: Alexandre Mergnat <[email protected]>

Reviewed-by: Mattijs Korpershoek <[email protected]>

> ---
> drivers/input/keyboard/mtk-pmic-keys.c | 17 +++++++++++++++++
> 1 file changed, 17 insertions(+)
>
> diff --git a/drivers/input/keyboard/mtk-pmic-keys.c b/drivers/input/keyboard/mtk-pmic-keys.c
> index 9b34da0ec260..2a63e0718eb6 100644
> --- a/drivers/input/keyboard/mtk-pmic-keys.c
> +++ b/drivers/input/keyboard/mtk-pmic-keys.c
> @@ -10,6 +10,7 @@
> #include <linux/kernel.h>
> #include <linux/mfd/mt6323/registers.h>
> #include <linux/mfd/mt6331/registers.h>
> +#include <linux/mfd/mt6357/registers.h>
> #include <linux/mfd/mt6358/registers.h>
> #include <linux/mfd/mt6397/core.h>
> #include <linux/mfd/mt6397/registers.h>
> @@ -90,6 +91,19 @@ static const struct mtk_pmic_regs mt6331_regs = {
> .rst_lprst_mask = MTK_PMIC_MT6331_RST_DU_MASK,
> };
>
> +static const struct mtk_pmic_regs mt6357_regs = {
> + .keys_regs[MTK_PMIC_PWRKEY_INDEX] =
> + MTK_PMIC_KEYS_REGS(MT6357_TOPSTATUS,
> + 0x2, MT6357_PSC_TOP_INT_CON0, 0x5,
> + MTK_PMIC_PWRKEY_RST),
> + .keys_regs[MTK_PMIC_HOMEKEY_INDEX] =
> + MTK_PMIC_KEYS_REGS(MT6357_TOPSTATUS,
> + 0x8, MT6357_PSC_TOP_INT_CON0, 0xa,
> + MTK_PMIC_HOMEKEY_INDEX),
> + .pmic_rst_reg = MT6357_TOP_RST_MISC,
> + .rst_lprst_mask = MTK_PMIC_RST_DU_MASK,
> +};
> +
> static const struct mtk_pmic_regs mt6358_regs = {
> .keys_regs[MTK_PMIC_PWRKEY_INDEX] =
> MTK_PMIC_KEYS_REGS(MT6358_TOPSTATUS,
> @@ -276,6 +290,9 @@ static const struct of_device_id of_mtk_pmic_keys_match_tbl[] = {
> }, {
> .compatible = "mediatek,mt6331-keys",
> .data = &mt6331_regs,
> + }, {
> + .compatible = "mediatek,mt6357-keys",
> + .data = &mt6357_regs,
> }, {
> .compatible = "mediatek,mt6358-keys",
> .data = &mt6358_regs,
>
> --
> b4 0.10.1

Subject: Re: [PATCH v2 5/5] Input: mtk-pmic-keys: add MT6357 support

Il 05/10/22 16:57, Alexandre Mergnat ha scritto:
> From: Fabien Parent <[email protected]>
>
> Add PMIC Keys support on MT6357 SoC.
>
> Signed-off-by: Fabien Parent <[email protected]>
> Signed-off-by: Alexandre Mergnat <[email protected]>
> Reviewed-by: Mattijs Korpershoek <[email protected]>

Reviewed-by: AngeloGioacchino Del Regno <[email protected]>


2022-10-10 18:33:42

by Dmitry Torokhov

[permalink] [raw]
Subject: Re: [PATCH v2 5/5] Input: mtk-pmic-keys: add MT6357 support

On Wed, Oct 05, 2022 at 04:57:25PM +0200, Alexandre Mergnat wrote:
> From: Fabien Parent <[email protected]>
>
> Add PMIC Keys support on MT6357 SoC.
>
> Signed-off-by: Fabien Parent <[email protected]>
> Signed-off-by: Alexandre Mergnat <[email protected]>

Acked-by: Dmitry Torokhov <[email protected]>

Please merge through MFD tree with the rest of the patches.

> ---
> drivers/input/keyboard/mtk-pmic-keys.c | 17 +++++++++++++++++
> 1 file changed, 17 insertions(+)
>
> diff --git a/drivers/input/keyboard/mtk-pmic-keys.c b/drivers/input/keyboard/mtk-pmic-keys.c
> index 9b34da0ec260..2a63e0718eb6 100644
> --- a/drivers/input/keyboard/mtk-pmic-keys.c
> +++ b/drivers/input/keyboard/mtk-pmic-keys.c
> @@ -10,6 +10,7 @@
> #include <linux/kernel.h>
> #include <linux/mfd/mt6323/registers.h>
> #include <linux/mfd/mt6331/registers.h>
> +#include <linux/mfd/mt6357/registers.h>
> #include <linux/mfd/mt6358/registers.h>
> #include <linux/mfd/mt6397/core.h>
> #include <linux/mfd/mt6397/registers.h>
> @@ -90,6 +91,19 @@ static const struct mtk_pmic_regs mt6331_regs = {
> .rst_lprst_mask = MTK_PMIC_MT6331_RST_DU_MASK,
> };
>
> +static const struct mtk_pmic_regs mt6357_regs = {
> + .keys_regs[MTK_PMIC_PWRKEY_INDEX] =
> + MTK_PMIC_KEYS_REGS(MT6357_TOPSTATUS,
> + 0x2, MT6357_PSC_TOP_INT_CON0, 0x5,
> + MTK_PMIC_PWRKEY_RST),
> + .keys_regs[MTK_PMIC_HOMEKEY_INDEX] =
> + MTK_PMIC_KEYS_REGS(MT6357_TOPSTATUS,
> + 0x8, MT6357_PSC_TOP_INT_CON0, 0xa,
> + MTK_PMIC_HOMEKEY_INDEX),
> + .pmic_rst_reg = MT6357_TOP_RST_MISC,
> + .rst_lprst_mask = MTK_PMIC_RST_DU_MASK,
> +};
> +
> static const struct mtk_pmic_regs mt6358_regs = {
> .keys_regs[MTK_PMIC_PWRKEY_INDEX] =
> MTK_PMIC_KEYS_REGS(MT6358_TOPSTATUS,
> @@ -276,6 +290,9 @@ static const struct of_device_id of_mtk_pmic_keys_match_tbl[] = {
> }, {
> .compatible = "mediatek,mt6331-keys",
> .data = &mt6331_regs,
> + }, {
> + .compatible = "mediatek,mt6357-keys",
> + .data = &mt6357_regs,
> }, {
> .compatible = "mediatek,mt6358-keys",
> .data = &mt6358_regs,
>
> --
> b4 0.10.1

Thanks.

--
Dmitry

2022-10-24 15:59:50

by Lee Jones

[permalink] [raw]
Subject: Re: [PATCH v2 5/5] Input: mtk-pmic-keys: add MT6357 support

On Mon, 10 Oct 2022, Dmitry Torokhov wrote:

> On Wed, Oct 05, 2022 at 04:57:25PM +0200, Alexandre Mergnat wrote:
> > From: Fabien Parent <[email protected]>
> >
> > Add PMIC Keys support on MT6357 SoC.
> >
> > Signed-off-by: Fabien Parent <[email protected]>
> > Signed-off-by: Alexandre Mergnat <[email protected]>
>
> Acked-by: Dmitry Torokhov <[email protected]>
>
> Please merge through MFD tree with the rest of the patches.

The MFD part is only a small doc change. The Input and Regulator
changes should be merged through their own subsystems IMHO.

--
Lee Jones [李琼斯]