[PATCH v3] mfd: arizona: Correct handling of device tree gpio defaults

[PATCH v3] mfd: arizona: Correct handling of device tree gpio defaults

[Charles Keepax]

When setting GPIO defaults we are required to make a distinction
between writing 0x0000 to the registers and leaving them untouched.

When we receive between 0x0000 and 0xFFFF (inclusive) from either
Platform Data or Device Tree, we should write the provided
configuration to the device. Conversely, when we receive >0xFFFF we
should leave the device configuration at its default setting.

This patch fixes a bug and ensures that configuration 0x0000 isn't
mistakenly written when the intention was to keep the default one.

Reported-by: Heather Lomond <heather.lomond@wolfsonmicro.com>
Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
---

Hi,

Sorry, your explanation is certainly fine with me.

Thanks,
Charles

 drivers/mfd/arizona-core.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
index 5ac3aa4..e13355b 100644
--- a/drivers/mfd/arizona-core.c
+++ b/drivers/mfd/arizona-core.c
@@ -540,7 +540,7 @@ static int arizona_of_get_core_pdata(struct arizona *arizona)
 		for (i = 0; i < ARRAY_SIZE(arizona->pdata.gpio_defaults); i++) {
 			if (arizona->pdata.gpio_defaults[i] > 0xffff)
 				arizona->pdata.gpio_defaults[i] = 0;
-			if (arizona->pdata.gpio_defaults[i] == 0)
+			else if (arizona->pdata.gpio_defaults[i] == 0)
 				arizona->pdata.gpio_defaults[i] = 0x10000;
 		}
 	} else {
-- 
1.7.2.5

Re: [PATCH v3] mfd: arizona: Correct handling of device tree gpio defaults

[Lee Jones]

On Thu, 03 Oct 2013, Charles Keepax wrote:

> When setting GPIO defaults we are required to make a distinction
> between writing 0x0000 to the registers and leaving them untouched.
> 
> When we receive between 0x0000 and 0xFFFF (inclusive) from either
> Platform Data or Device Tree, we should write the provided
> configuration to the device. Conversely, when we receive >0xFFFF we
> should leave the device configuration at its default setting.
> 
> This patch fixes a bug and ensures that configuration 0x0000 isn't
> mistakenly written when the intention was to keep the default one.
> 
> Reported-by: Heather Lomond <heather.lomond@wolfsonmicro.com>
> Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
> ---
> 
> Hi,
> 
> Sorry, your explanation is certainly fine with me.
> 
> Thanks,
> Charles
> 
>  drivers/mfd/arizona-core.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)

Applied, thanks Charles.

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog