summaryrefslogtreecommitdiffstats
path: root/drivers/mfd
diff options
context:
space:
mode:
authorCharles Keepax <ckeepax@opensource.wolfsonmicro.com>2013-10-03 16:16:01 +0100
committerLee Jones <lee.jones@linaro.org>2013-10-23 16:21:44 +0100
commit91c739359ac9946a8e74a9640527a3f1034a76a7 (patch)
tree0e76bf8fa3b51fab52430799372f7473fc8493b1 /drivers/mfd
parent22d7dc8aba3bf34fdf324f43718c238075cc7cf7 (diff)
downloadlinux-stable-91c739359ac9946a8e74a9640527a3f1034a76a7.tar.gz
linux-stable-91c739359ac9946a8e74a9640527a3f1034a76a7.tar.bz2
linux-stable-91c739359ac9946a8e74a9640527a3f1034a76a7.zip
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. Reported-by: Heather Lomond <heather.lomond@wolfsonmicro.com> Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/arizona-core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
index a2f5beff99d7..ba808b744238 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 {