rk3066b: fix gpio usage

diff --git a/arch/arm/mach-rk30/io.c b/arch/arm/mach-rk30/io.c
index bb8e81564443593c24b4120a137d4b0d3738357f..f368f6d89547e80c49a3283637e0248322548caa 100755 (executable)
--- 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 99fb2ca7a280f2c82b64782123486e3efa2424a8..5b2ac0866d57deed89b65052b67e5a13298336b0 100644 (file)
--- 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