[PATCH] mfd: stmpe: Support disabling sub-functions

[PATCH] mfd: stmpe: Support disabling sub-functions

[Francesco Dolcini]

From: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>

Add support of sub-functions disabling. It allows one to define
an stmpe sub-function device in devicetree, but keep it disabled.

Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
Cc: Oleksandr Suvorov <oleksandr.suvorov@foundries.io>
Signed-off-by: Francesco Dolcini <francesco.dolcini@toradex.com>
---
Hello,
the main reason for this patch is to allow enabling/disabling sub-fuctions
using DTS overlay to enable more flexibility on SoM/Carrier boards
combinations.
---
 drivers/mfd/stmpe.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mfd/stmpe.c b/drivers/mfd/stmpe.c
index e928df95e316..aeb9ea55f97d 100644
--- a/drivers/mfd/stmpe.c
+++ b/drivers/mfd/stmpe.c
@@ -1361,7 +1361,7 @@ static void stmpe_of_probe(struct stmpe_platform_data *pdata,
 
 	pdata->autosleep = (pdata->autosleep_timeout) ? true : false;
 
-	for_each_child_of_node(np, child) {
+	for_each_available_child_of_node(np, child) {
 		if (of_node_name_eq(child, "stmpe_gpio")) {
 			pdata->blocks |= STMPE_BLOCK_GPIO;
 		} else if (of_node_name_eq(child, "stmpe_keypad")) {
-- 
2.25.1

Re: [PATCH] mfd: stmpe: Support disabling sub-functions

[Marcel Ziswiler]

Hi Francesco

On Wed, 2021-10-27 at 10:21 +0200, Francesco Dolcini wrote:
> From: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
> 
> Add support of sub-functions disabling. It allows one to define
> an stmpe sub-function device in devicetree, but keep it disabled.
> 
> Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
> Cc: Oleksandr Suvorov <oleksandr.suvorov@foundries.io>
> Signed-off-by: Francesco Dolcini <francesco.dolcini@toradex.com>

Reviewed-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>

> ---
> Hello,
> the main reason for this patch is to allow enabling/disabling sub-fuctions

:s/sub-fuctions/sub-functions/

> using DTS overlay to enable more flexibility on SoM/Carrier boards

:s/boards/board/

> combinations.
> ---
>  drivers/mfd/stmpe.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/mfd/stmpe.c b/drivers/mfd/stmpe.c
> index e928df95e316..aeb9ea55f97d 100644
> --- a/drivers/mfd/stmpe.c
> +++ b/drivers/mfd/stmpe.c
> @@ -1361,7 +1361,7 @@ static void stmpe_of_probe(struct stmpe_platform_data *pdata,
>  
>         pdata->autosleep = (pdata->autosleep_timeout) ? true : false;
>  
> -       for_each_child_of_node(np, child) {
> +       for_each_available_child_of_node(np, child) {
>                 if (of_node_name_eq(child, "stmpe_gpio")) {
>                         pdata->blocks |= STMPE_BLOCK_GPIO;
>                 } else if (of_node_name_eq(child, "stmpe_keypad")) {

Cheers

Marcel

Re: [PATCH] mfd: stmpe: Support disabling sub-functions

[Linus Walleij]

On Wed, Oct 27, 2021 at 10:23 AM Francesco Dolcini
<francesco.dolcini@toradex.com> wrote:

> From: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
>
> Add support of sub-functions disabling. It allows one to define
> an stmpe sub-function device in devicetree, but keep it disabled.
>
> Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
> Cc: Oleksandr Suvorov <oleksandr.suvorov@foundries.io>
> Signed-off-by: Francesco Dolcini <francesco.dolcini@toradex.com>

Looks helpful.
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>

Yours,
Linus Walleij

Re: [PATCH] mfd: stmpe: Support disabling sub-functions

[Francesco Dolcini]

On Wed, Oct 27, 2021 at 10:21:55AM +0200, Francesco Dolcini wrote:
> From: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
> 
> Add support of sub-functions disabling. It allows one to define
> an stmpe sub-function device in devicetree, but keep it disabled.
> 
> Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
> Cc: Oleksandr Suvorov <oleksandr.suvorov@foundries.io>
> Signed-off-by: Francesco Dolcini <francesco.dolcini@toradex.com>

Hello Lee,
any chance you could take this one line patch for this merge window?

Francesco

Re: [PATCH] mfd: stmpe: Support disabling sub-functions

[Lee Jones]

On Mon, 01 Nov 2021, Francesco Dolcini wrote:

> On Wed, Oct 27, 2021 at 10:21:55AM +0200, Francesco Dolcini wrote:
> > From: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
> > 
> > Add support of sub-functions disabling. It allows one to define
> > an stmpe sub-function device in devicetree, but keep it disabled.
> > 
> > Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
> > Cc: Oleksandr Suvorov <oleksandr.suvorov@foundries.io>
> > Signed-off-by: Francesco Dolcini <francesco.dolcini@toradex.com>
> 
> Hello Lee,
> any chance you could take this one line patch for this merge window?

For a patch sent 0.5 weeks before the merge-window?  Nope. :)

-- 
Lee Jones [李琼斯]
Senior Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog

Re: [PATCH] mfd: stmpe: Support disabling sub-functions

[Francesco Dolcini]

On Mon, Nov 01, 2021 at 12:13:23PM +0000, Lee Jones wrote:
> On Mon, 01 Nov 2021, Francesco Dolcini wrote:
> > Hello Lee,
> > any chance you could take this one line patch for this merge window?
> 
> For a patch sent 0.5 weeks before the merge-window?  Nope. :)

Hello Lee,
no problem, I thought it was that trivial to not create any worries.
I'll resend it in a while unless you take it before.

Francesco

Re: [PATCH] mfd: stmpe: Support disabling sub-functions

[Lee Jones]

On Tue, 02 Nov 2021, Francesco Dolcini wrote:

> On Mon, Nov 01, 2021 at 12:13:23PM +0000, Lee Jones wrote:
> > On Mon, 01 Nov 2021, Francesco Dolcini wrote:
> > > Hello Lee,
> > > any chance you could take this one line patch for this merge window?
> > 
> > For a patch sent 0.5 weeks before the merge-window?  Nope. :)
> 
> Hello Lee,
> no problem, I thought it was that trivial to not create any worries.
> I'll resend it in a while unless you take it before.

I like *all* patches to have a soak in -next.

You don't need to resend it.  I'll apply it in due course.

-- 
Lee Jones [李琼斯]
Senior Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog

Re: [PATCH] mfd: stmpe: Support disabling sub-functions

[Lee Jones]

On Wed, 27 Oct 2021, Francesco Dolcini wrote:

> From: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
> 
> Add support of sub-functions disabling. It allows one to define
> an stmpe sub-function device in devicetree, but keep it disabled.
> 
> Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
> Cc: Oleksandr Suvorov <oleksandr.suvorov@foundries.io>
> Signed-off-by: Francesco Dolcini <francesco.dolcini@toradex.com>
> ---
> Hello,
> the main reason for this patch is to allow enabling/disabling sub-fuctions
> using DTS overlay to enable more flexibility on SoM/Carrier boards
> combinations.
> ---
>  drivers/mfd/stmpe.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied, thanks.

-- 
Lee Jones [李琼斯]
Senior Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog

[PATCH] mfd: stmpe: Support disabling sub-functions

[Oleksandr Suvorov]

Add support of sub-functions disabling. It allows one to define
an stmpe sub-function device in devicetree, but keep it disabled.

Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
---

 drivers/mfd/stmpe.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/mfd/stmpe.c b/drivers/mfd/stmpe.c
index 90f3292230c9..2182607b75f6 100644
--- a/drivers/mfd/stmpe.c
+++ b/drivers/mfd/stmpe.c
@@ -1358,6 +1358,9 @@ static void stmpe_of_probe(struct stmpe_platform_data *pdata,
 	pdata->autosleep = (pdata->autosleep_timeout) ? true : false;
 
 	for_each_child_of_node(np, child) {
+		/* skip disabled sub-function */
+		if (!of_device_is_available(child))
+			continue;
 		if (of_node_name_eq(child, "stmpe_gpio")) {
 			pdata->blocks |= STMPE_BLOCK_GPIO;
 		} else if (of_node_name_eq(child, "stmpe_keypad")) {
-- 
2.29.2