Skip to contentSkip to conversation

mfd: arizona: Correct handling of device tree gpio defaults

PATCH Applied Charles Keepax 2 participants 2 messages Oct 3, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 mfd: arizona: Correct handling of device tree gpio defaults

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.

---

Hi,

Sorry, your explanation is certainly fine with me.

Thanks,
Charles

 drivers/mfd/arizona-core.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/mfd/arizona-core.c +1 -1
index 5ac3aa4..e13355b 100644
@@ -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 {
Signature · 1 line
1.7.2.5
Applied
#1 lore raw
Quoted 17 lines · 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.

---

Hi,

Quoted 7 lines

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.

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