From 4306784f351778f724fd801cca957d05cd4c391e Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Thu, 18 Aug 2005 01:40:14 -0700 Subject: [PATCH] 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. --- arch/arm/plat-omap/gpio.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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++) { -- 2.41.1