diff options
author | Haojian Zhuang <haojian.zhuang@marvell.com> | 2011-10-17 09:07:15 -0400 |
---|---|---|
committer | Haojian Zhuang <hzhuang1@hexinfolabs.org> | 2011-11-15 06:09:10 -0500 |
commit | be24168f144122b3730beab257fa058745d14cb4 (patch) | |
tree | a195eac4e931ea5b4228f02b2d069372d03ec8ff /drivers/gpio | |
parent | 157d2644cb0c1e71a18baaffca56d2b1d0ebf10f (diff) |
ARM: mmp: clear gpio edge detect
Append code to clear gpio edge detect in gpio-pxa driver.
Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Diffstat (limited to 'drivers/gpio')
-rw-r--r-- | drivers/gpio/gpio-pxa.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpio/gpio-pxa.c b/drivers/gpio/gpio-pxa.c index 079f97fde2c7..bfd755531f7a 100644 --- a/drivers/gpio/gpio-pxa.c +++ b/drivers/gpio/gpio-pxa.c | |||
@@ -46,6 +46,7 @@ | |||
46 | #define GFER_OFFSET 0x3C | 46 | #define GFER_OFFSET 0x3C |
47 | #define GEDR_OFFSET 0x48 | 47 | #define GEDR_OFFSET 0x48 |
48 | #define GAFR_OFFSET 0x54 | 48 | #define GAFR_OFFSET 0x54 |
49 | #define ED_MASK_OFFSET 0x9C /* GPIO edge detection for AP side */ | ||
49 | 50 | ||
50 | #define BANK_OFF(n) (((n) < 3) ? (n) << 2 : 0x100 + (((n) - 3) << 2)) | 51 | #define BANK_OFF(n) (((n) < 3) ? (n) << 2 : 0x100 + (((n) - 3) << 2)) |
51 | 52 | ||
@@ -496,6 +497,9 @@ static int __devinit pxa_gpio_probe(struct platform_device *pdev) | |||
496 | writel_relaxed(0, c->regbase + GFER_OFFSET); | 497 | writel_relaxed(0, c->regbase + GFER_OFFSET); |
497 | writel_relaxed(0, c->regbase + GRER_OFFSET); | 498 | writel_relaxed(0, c->regbase + GRER_OFFSET); |
498 | writel_relaxed(~0,c->regbase + GEDR_OFFSET); | 499 | writel_relaxed(~0,c->regbase + GEDR_OFFSET); |
500 | /* unmask GPIO edge detect for AP side */ | ||
501 | if (gpio_is_mmp_type(gpio_type)) | ||
502 | writel_relaxed(~0, c->regbase + ED_MASK_OFFSET); | ||
499 | } | 503 | } |
500 | 504 | ||
501 | #ifdef CONFIG_ARCH_PXA | 505 | #ifdef CONFIG_ARCH_PXA |