From ccda627e96ac71cb16cf10fd505c29caf082ac61 Mon Sep 17 00:00:00 2001 From: Sergio Aguirre Date: Wed, 3 Mar 2010 16:21:08 +0000 Subject: [PATCH] --- yaml --- r: 188423 b: refs/heads/master c: f00d649703fbedbdeb33d63c4c4731656e11297c h: refs/heads/master i: 188421: db6e979d07a4dd28253e915a82be66e59b4d56b6 188419: 67be187fa53b0b1df66b97c7ddb5cec8ed232154 188415: 57c45ddab1d9d032d0bbe5c363dcd4fa89523afe v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-omap/gpio.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 4431b459bd8f..a9653ddf04b4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 228893f9d2b70a7416267050ce03bfd9eb624713 +refs/heads/master: f00d649703fbedbdeb33d63c4c4731656e11297c diff --git a/trunk/arch/arm/plat-omap/gpio.c b/trunk/arch/arm/plat-omap/gpio.c index 337199ed3479..76a347b3ce07 100644 --- a/trunk/arch/arm/plat-omap/gpio.c +++ b/trunk/arch/arm/plat-omap/gpio.c @@ -2140,18 +2140,18 @@ void omap2_gpio_resume_after_retention(void) if (gen) { u32 old0, old1; - if (cpu_is_omap24xx() || cpu_is_omap44xx()) { + if (cpu_is_omap24xx() || cpu_is_omap34xx()) { old0 = __raw_readl(bank->base + OMAP24XX_GPIO_LEVELDETECT0); old1 = __raw_readl(bank->base + OMAP24XX_GPIO_LEVELDETECT1); - __raw_writel(old0 | gen, bank->base + + __raw_writel(old0 | gen, bank->base + OMAP24XX_GPIO_LEVELDETECT0); - __raw_writel(old1 | gen, bank->base + + __raw_writel(old1 | gen, bank->base + OMAP24XX_GPIO_LEVELDETECT1); - __raw_writel(old0, bank->base + + __raw_writel(old0, bank->base + OMAP24XX_GPIO_LEVELDETECT0); - __raw_writel(old1, bank->base + + __raw_writel(old1, bank->base + OMAP24XX_GPIO_LEVELDETECT1); }