diff options
| author | Sonic Zhang <sonic.zhang@analog.com> | 2013-11-18 14:12:39 +0800 |
|---|---|---|
| committer | Sonic Zhang <sonic.zhang@analog.com> | 2013-12-06 16:06:51 +0800 |
| commit | 76db0fde5bc8e61ebfd04a940cd28ea331874104 (patch) | |
| tree | dbf1a66f6ed4df73d6a28d10036bbee8b8c4ad4b /arch/blackfin | |
| parent | e45eb6b960e4ae062a533c960f2dab557637cecd (diff) | |
| download | blackbird-obmc-uboot-76db0fde5bc8e61ebfd04a940cd28ea331874104.tar.gz blackbird-obmc-uboot-76db0fde5bc8e61ebfd04a940cd28ea331874104.zip | |
blackfin: If none ADI_GPIOX macro is defined, use ADI_GPIO1 as default
Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Diffstat (limited to 'arch/blackfin')
| -rw-r--r-- | arch/blackfin/cpu/gpio.c | 2 | ||||
| -rw-r--r-- | arch/blackfin/include/asm/gpio.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/blackfin/cpu/gpio.c b/arch/blackfin/cpu/gpio.c index 5e9c68af85..86da706f08 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, diff --git a/arch/blackfin/include/asm/gpio.h b/arch/blackfin/include/asm/gpio.h index 376ec02b65..6ebcf01aff 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); |
