From 39fc3bc8712956c9bac1aedbdba2ce0695d17b87 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E9=BB=84=E6=B6=9B?= Date: Tue, 28 Aug 2012 09:35:26 +0800 Subject: [PATCH] rk3066b: fix gpio usage --- arch/arm/mach-rk30/io.c | 2 +- arch/arm/mach-rk30/pm.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-rk30/io.c b/arch/arm/mach-rk30/io.c index bb8e81564443..f368f6d89547 100755 --- a/arch/arm/mach-rk30/io.c +++ b/arch/arm/mach-rk30/io.c @@ -46,7 +46,7 @@ static struct map_desc rk30_io_desc[] __initdata = { RK30_DEVICE(GPIO1), RK30_DEVICE(GPIO2), RK30_DEVICE(GPIO3), -#ifdef CONFIG_ARCH_RK30 +#if !defined(CONFIG_ARCH_RK3066B) RK30_DEVICE(GPIO4), RK30_DEVICE(GPIO6), #endif diff --git a/arch/arm/mach-rk30/pm.c b/arch/arm/mach-rk30/pm.c index 99fb2ca7a280..5b2ac0866d57 100644 --- a/arch/arm/mach-rk30/pm.c +++ b/arch/arm/mach-rk30/pm.c @@ -190,7 +190,7 @@ static noinline void rk30_pm_dump_irq(void) printk("wakeup gpio2: %08x\n", readl_relaxed(RK30_GPIO2_BASE + GPIO_INT_STATUS)); if (irq_gpio & 8) printk("wakeup gpio3: %08x\n", readl_relaxed(RK30_GPIO3_BASE + GPIO_INT_STATUS)); -#ifdef CONFIG_ARCH_RK30 +#if !defined(CONFIG_ARCH_RK3066B) if (irq_gpio & 0x10) printk("wakeup gpio4: %08x\n", readl_relaxed(RK30_GPIO4_BASE + GPIO_INT_STATUS)); if (irq_gpio & 0x40) @@ -214,7 +214,7 @@ static noinline void rk30_pm_dump_inten(void) DUMP_GPIO_INTEN(1); DUMP_GPIO_INTEN(2); DUMP_GPIO_INTEN(3); -#ifdef CONFIG_ARCH_RK30 +#if !defined(CONFIG_ARCH_RK3066B) DUMP_GPIO_INTEN(4); DUMP_GPIO_INTEN(6); #endif -- 2.34.1