From: 黄涛 <huangtao@rock-chips.com>
Date: Thu, 6 Sep 2012 08:30:12 +0000 (+0800)
Subject: rk3066b: gpio: never define RK30_PIN4_PA0 to RK30_PIN6_PB7
X-Git-Tag: firefly_0821_release~8710
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=696e363cd8e1ebe604a79b89372097e82f260e05;p=firefly-linux-kernel-4.4.55.git

rk3066b: gpio: never define RK30_PIN4_PA0 to RK30_PIN6_PB7
---

diff --git a/arch/arm/mach-rk30/include/mach/gpio.h b/arch/arm/mach-rk30/include/mach/gpio.h
index e2cc0ffc0fb8..43c915d1102b 100755
--- a/arch/arm/mach-rk30/include/mach/gpio.h
+++ b/arch/arm/mach-rk30/include/mach/gpio.h
@@ -205,6 +205,7 @@
 #define	RK30_PIN3_PD6		(3*NUM_GROUP + PIN_BASE + 30)
 #define	RK30_PIN3_PD7		(3*NUM_GROUP + PIN_BASE + 31)
 
+#if !defined(CONFIG_ARCH_RK3066B)
 #define	RK30_PIN4_PA0		(4*NUM_GROUP + PIN_BASE + 0) 
 #define	RK30_PIN4_PA1		(4*NUM_GROUP + PIN_BASE + 1) 
 #define	RK30_PIN4_PA2		(4*NUM_GROUP + PIN_BASE + 2) 
@@ -254,6 +255,7 @@
 #define	RK30_PIN6_PB5		(5*NUM_GROUP + PIN_BASE + 13)
 #define	RK30_PIN6_PB6		(5*NUM_GROUP + PIN_BASE + 14)
 #define	RK30_PIN6_PB7		(5*NUM_GROUP + PIN_BASE + 15)
+#endif
 
 #if defined(CONFIG_SPI_FPGA_GPIO)
 #define	FPGA_PIO0_00 (SPI_FPGA_EXPANDER_BASE + 0*NUM_GROUP + 0)