From: Tony Lindgren <tony@atomide.com>
Date: Thu, 18 Aug 2005 08:40:14 +0000 (-0700)
Subject: ARM: OMAP: Fix cpu_is_omap1610() tests in gpio.c
X-Git-Tag: v2.6.13-omap1~18
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=4306784f351778f724fd801cca957d05cd4c391e;p=linux-2.6-omap-h63xx.git

ARM: OMAP: Fix cpu_is_omap1610() tests in gpio.c

Fix cpu_is_omap1610() tests in gpio.c. This was suggested by
Kyungmin Park. Also recent 24xx patch added two more
cpu_is_omap1610() tests.
---

diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c
index e554ea72b2e..c4fb50ed5ed 100644
--- a/arch/arm/plat-omap/gpio.c
+++ b/arch/arm/plat-omap/gpio.c
@@ -998,7 +998,7 @@ static int __init _omap_gpio_init(void)
 
 	/* Enable system clock for GPIO module.
 	 * The CAM_CLK_CTRL *is* really the right place. */
-	if (cpu_is_omap1610() || cpu_is_omap1710())
+	if (cpu_is_omap16xx())
 		omap_writel(omap_readl(ULPD_CAM_CLK_CTRL) | 0x04, ULPD_CAM_CLK_CTRL);
 
 	return 0;
@@ -1009,7 +1009,7 @@ static int omap_gpio_suspend(struct sys_device *dev, pm_message_t mesg)
 {
 	int i;
 
-	if (!cpu_is_omap24xx() && !cpu_is_omap1610())
+	if (!cpu_is_omap24xx() && !cpu_is_omap16xx())
 		return 0;
 
 	for (i = 0; i < gpio_bank_count; i++) {
@@ -1047,7 +1047,7 @@ static int omap_gpio_resume(struct sys_device *dev)
 {
 	int i;
 
-	if (!cpu_is_omap24xx() && !cpu_is_omap1610())
+	if (!cpu_is_omap24xx() && !cpu_is_omap16xx())
 		return 0;
 
 	for (i = 0; i < gpio_bank_count; i++) {