commit 84c38dac64d9f03c26236eabc59c70f46981c88d
author Sonic Zhang <sonic.zhang@analog.com> Mon Nov 18 14:12:39 2013 +0800
committer Sonic Zhang <sonic.zhang@analog.com> Fri Dec 06 16:06:51 2013 +0800
tree dbf1a66f6ed4df73d6a28d10036bbee8b8c4ad4b
parent 0ecdf7d6f65b907495f2e29f86cfd21661b239c7

blackfin: If none ADI_GPIOX macro is defined, use ADI_GPIO1 as default

Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>

arch/blackfin/cpu/gpio.c

diff --git a/arch/blackfin/cpu/gpio.c b/arch/blackfin/cpu/gpio.c
index 5e9c68a..86da706 100644
--- a/arch/blackfin/cpu/gpio.c
+++ b/arch/blackfin/cpu/gpio.c
@@ -12,7 +12,7 @@
 #include <asm/gpio.h>
 #include <asm/portmux.h>
 
-#ifdef CONFIG_ADI_GPIO1
+#ifndef CONFIG_ADI_GPIO2
 #if ANOMALY_05000311 || ANOMALY_05000323
 enum {
 	AWA_data = SYSCR,

arch/blackfin/include/asm/gpio.h

diff --git a/arch/blackfin/include/asm/gpio.h b/arch/blackfin/include/asm/gpio.h
index 376ec02..6ebcf01 100644
--- a/arch/blackfin/include/asm/gpio.h
+++ b/arch/blackfin/include/asm/gpio.h
@@ -72,7 +72,7 @@
 
 #ifndef __ASSEMBLY__
 
-#ifdef CONFIG_ADI_GPIO1
+#ifndef CONFIG_ADI_GPIO2
 void set_gpio_dir(unsigned, unsigned short);
 void set_gpio_inen(unsigned, unsigned short);
 void set_gpio_polar(unsigned, unsigned short);