UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[Blackfin] arch: GPIO API cleanup and anomaly update 

- Add anomaly workaround for bfin_gpio_reset_spi0_ssel1
 - Fix style
 - Update copyright
 - Remove BUG_ON checks for functions intended to be used only by arch
   support. GPIO users should only access using the generic GPIO API
 - Make all GPIO identifier unsigned int

Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Bryan Wu <bryan.wu@analog.com>
This commit is contained in:
Michael Hennerich 2008-01-22 17:20:10 +08:00 committed by Bryan Wu
parent acbcd26319
commit a2c8cfef6a
2 changed files with 64 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
arch/blackfin/kernel/bfin_gpio.c
View File

@ -7,7 +7,7 @@
* Description: GPIO Abstraction Layer * Description: GPIO Abstraction Layer
* *
* Modified: * Modified:
* Copyright 2007 Analog Devices Inc. * Copyright 2008 Analog Devices Inc.
* *
* Bugs: Enter bugs at http://blackfin.uclinux.org/ * Bugs: Enter bugs at http://blackfin.uclinux.org/
* *
@ -137,7 +137,6 @@ static unsigned short *port_fer[gpio_bank(MAX_BLACKFIN_GPIOS)] = {
(unsigned short *) PORTG_FER, (unsigned short *) PORTG_FER,
(unsigned short *) PORTH_FER, (unsigned short *) PORTH_FER,
}; };
#endif #endif
#ifdef BF527_FAMILY #ifdef BF527_FAMILY
@ -211,7 +210,7 @@ static unsigned int sic_iwr_irqs[gpio_bank(MAX_BLACKFIN_GPIOS)] = {IRQ_PROG0_INT
#endif /* CONFIG_PM */ #endif /* CONFIG_PM */
#if defined(BF548_FAMILY) #if defined(BF548_FAMILY)
inline int check_gpio(unsigned short gpio) inline int check_gpio(unsigned gpio)
{ {
if (gpio == GPIO_PB15 || gpio == GPIO_PC14 || gpio == GPIO_PC15 if (gpio == GPIO_PB15 || gpio == GPIO_PC14 || gpio == GPIO_PC15
|| gpio == GPIO_PH14 || gpio == GPIO_PH15 || gpio == GPIO_PH14 || gpio == GPIO_PH15
@ -221,7 +220,7 @@ inline int check_gpio(unsigned short gpio)
return 0; return 0;
} }
#else #else
inline int check_gpio(unsigned short gpio) inline int check_gpio(unsigned gpio)
{ {
if (gpio >= MAX_BLACKFIN_GPIOS) if (gpio >= MAX_BLACKFIN_GPIOS)
return -EINVAL; return -EINVAL;
@ -236,7 +235,6 @@ void gpio_error(unsigned gpio)
static void set_label(unsigned short ident, const char *label) static void set_label(unsigned short ident, const char *label)
{ {
if (label && str_ident) { if (label && str_ident) {
strncpy(str_ident[ident].name, label, strncpy(str_ident[ident].name, label,
RESOURCE_LABEL_SIZE); RESOURCE_LABEL_SIZE);
@ -267,7 +265,7 @@ static int cmp_label(unsigned short ident, const char *label)
} }
#if defined(BF527_FAMILY) || defined(BF537_FAMILY) #if defined(BF527_FAMILY) || defined(BF537_FAMILY)
static void port_setup(unsigned short gpio, unsigned short usage) static void port_setup(unsigned gpio, unsigned short usage)
{ {
if (!check_gpio(gpio)) { if (!check_gpio(gpio)) {
if (usage == GPIO_USAGE) if (usage == GPIO_USAGE)
@ -278,7 +276,7 @@ static void port_setup(unsigned short gpio, unsigned short usage)
} }
} }
#elif defined(BF548_FAMILY) #elif defined(BF548_FAMILY)
static void port_setup(unsigned short gpio, unsigned short usage) static void port_setup(unsigned gpio, unsigned short usage)
{ {
if (usage == GPIO_USAGE) if (usage == GPIO_USAGE)
gpio_array[gpio_bank(gpio)]->port_fer &= ~gpio_bit(gpio); gpio_array[gpio_bank(gpio)]->port_fer &= ~gpio_bit(gpio);
@ -399,7 +397,7 @@ inline void portmux_setup(unsigned short portno, unsigned short function)
#endif #endif
#ifndef BF548_FAMILY #ifndef BF548_FAMILY
static void default_gpio(unsigned short gpio) static void default_gpio(unsigned gpio)
{ {
unsigned short bank, bitmask; unsigned short bank, bitmask;
unsigned long flags; unsigned long flags;
@ -419,7 +417,6 @@ static void default_gpio(unsigned short gpio)
gpio_bankb[bank]->edge &= ~bitmask; gpio_bankb[bank]->edge &= ~bitmask;
AWA_DUMMY_READ(edge); AWA_DUMMY_READ(edge);
local_irq_restore(flags); local_irq_restore(flags);
} }
#else #else
# define default_gpio(...) do { } while (0) # define default_gpio(...) do { } while (0)
@ -457,10 +454,9 @@ arch_initcall(bfin_gpio_init);
/* Set a specific bit */ /* Set a specific bit */
#define SET_GPIO(name) \ #define SET_GPIO(name) \
void set_gpio_ ## name(unsigned short gpio, unsigned short arg) \ void set_gpio_ ## name(unsigned gpio, unsigned short arg) \
{ \ { \
unsigned long flags; \ unsigned long flags; \
BUG_ON(!(reserved_gpio_map[gpio_bank(gpio)] & gpio_bit(gpio))); \
local_irq_save(flags); \ local_irq_save(flags); \
if (arg) \ if (arg) \
gpio_bankb[gpio_bank(gpio)]->name |= gpio_bit(gpio); \ gpio_bankb[gpio_bank(gpio)]->name |= gpio_bit(gpio); \
@ -480,10 +476,9 @@ SET_GPIO(both)
#if ANOMALY_05000311 || ANOMALY_05000323 #if ANOMALY_05000311 || ANOMALY_05000323
#define SET_GPIO_SC(name) \ #define SET_GPIO_SC(name) \
void set_gpio_ ## name(unsigned short gpio, unsigned short arg) \ void set_gpio_ ## name(unsigned gpio, unsigned short arg) \
{ \ { \
unsigned long flags; \ unsigned long flags; \
BUG_ON(!(reserved_gpio_map[gpio_bank(gpio)] & gpio_bit(gpio))); \
local_irq_save(flags); \ local_irq_save(flags); \
if (arg) \ if (arg) \
gpio_bankb[gpio_bank(gpio)]->name ## _set = gpio_bit(gpio); \ gpio_bankb[gpio_bank(gpio)]->name ## _set = gpio_bit(gpio); \
@ -495,9 +490,8 @@ void set_gpio_ ## name(unsigned short gpio, unsigned short arg) \
EXPORT_SYMBOL(set_gpio_ ## name); EXPORT_SYMBOL(set_gpio_ ## name);
#else #else
#define SET_GPIO_SC(name) \ #define SET_GPIO_SC(name) \
void set_gpio_ ## name(unsigned short gpio, unsigned short arg) \ void set_gpio_ ## name(unsigned gpio, unsigned short arg) \
{ \ { \
BUG_ON(!(reserved_gpio_map[gpio_bank(gpio)] & gpio_bit(gpio))); \
if (arg) \ if (arg) \
gpio_bankb[gpio_bank(gpio)]->name ## _set = gpio_bit(gpio); \ gpio_bankb[gpio_bank(gpio)]->name ## _set = gpio_bit(gpio); \
else \ else \
@ -511,19 +505,17 @@ SET_GPIO_SC(maskb)
SET_GPIO_SC(data) SET_GPIO_SC(data)
#if ANOMALY_05000311 || ANOMALY_05000323 #if ANOMALY_05000311 || ANOMALY_05000323
void set_gpio_toggle(unsigned short gpio) void set_gpio_toggle(unsigned gpio)
{ {
unsigned long flags; unsigned long flags;
BUG_ON(!(reserved_gpio_map[gpio_bank(gpio)] & gpio_bit(gpio)));
local_irq_save(flags); local_irq_save(flags);
gpio_bankb[gpio_bank(gpio)]->toggle = gpio_bit(gpio); gpio_bankb[gpio_bank(gpio)]->toggle = gpio_bit(gpio);
AWA_DUMMY_READ(toggle); AWA_DUMMY_READ(toggle);
local_irq_restore(flags); local_irq_restore(flags);
} }
#else #else
void set_gpio_toggle(unsigned short gpio) void set_gpio_toggle(unsigned gpio)
{ {
BUG_ON(!(reserved_gpio_map[gpio_bank(gpio)] & gpio_bit(gpio)));
gpio_bankb[gpio_bank(gpio)]->toggle = gpio_bit(gpio); gpio_bankb[gpio_bank(gpio)]->toggle = gpio_bit(gpio);
} }
#endif #endif
@ -534,7 +526,7 @@ EXPORT_SYMBOL(set_gpio_toggle);
#if ANOMALY_05000311 || ANOMALY_05000323 #if ANOMALY_05000311 || ANOMALY_05000323
#define SET_GPIO_P(name) \ #define SET_GPIO_P(name) \
void set_gpiop_ ## name(unsigned short gpio, unsigned short arg) \ void set_gpiop_ ## name(unsigned gpio, unsigned short arg) \
{ \ { \
unsigned long flags; \ unsigned long flags; \
local_irq_save(flags); \ local_irq_save(flags); \
@ -545,7 +537,7 @@ void set_gpiop_ ## name(unsigned short gpio, unsigned short arg) \
EXPORT_SYMBOL(set_gpiop_ ## name); EXPORT_SYMBOL(set_gpiop_ ## name);
#else #else
#define SET_GPIO_P(name) \ #define SET_GPIO_P(name) \
void set_gpiop_ ## name(unsigned short gpio, unsigned short arg) \ void set_gpiop_ ## name(unsigned gpio, unsigned short arg) \
{ \ { \
gpio_bankb[gpio_bank(gpio)]->name = arg; \ gpio_bankb[gpio_bank(gpio)]->name = arg; \
} \ } \
@ -561,11 +553,10 @@ SET_GPIO_P(both)
SET_GPIO_P(maska) SET_GPIO_P(maska)
SET_GPIO_P(maskb) SET_GPIO_P(maskb)
/* Get a specific bit */ /* Get a specific bit */
#if ANOMALY_05000311 || ANOMALY_05000323 #if ANOMALY_05000311 || ANOMALY_05000323
#define GET_GPIO(name) \ #define GET_GPIO(name) \
unsigned short get_gpio_ ## name(unsigned short gpio) \ unsigned short get_gpio_ ## name(unsigned gpio) \
{ \ { \
unsigned long flags; \ unsigned long flags; \
unsigned short ret; \ unsigned short ret; \
@ -578,7 +569,7 @@ unsigned short get_gpio_ ## name(unsigned short gpio) \
EXPORT_SYMBOL(get_gpio_ ## name); EXPORT_SYMBOL(get_gpio_ ## name);
#else #else
#define GET_GPIO(name) \ #define GET_GPIO(name) \
unsigned short get_gpio_ ## name(unsigned short gpio) \ unsigned short get_gpio_ ## name(unsigned gpio) \
{ \ { \
return (0x01 & (gpio_bankb[gpio_bank(gpio)]->name >> gpio_sub_n(gpio))); \ return (0x01 & (gpio_bankb[gpio_bank(gpio)]->name >> gpio_sub_n(gpio))); \
} \ } \
@ -598,7 +589,7 @@ GET_GPIO(maskb)
#if ANOMALY_05000311 || ANOMALY_05000323 #if ANOMALY_05000311 || ANOMALY_05000323
#define GET_GPIO_P(name) \ #define GET_GPIO_P(name) \
unsigned short get_gpiop_ ## name(unsigned short gpio) \ unsigned short get_gpiop_ ## name(unsigned gpio) \
{ \ { \
unsigned long flags; \ unsigned long flags; \
unsigned short ret; \ unsigned short ret; \
@ -611,7 +602,7 @@ unsigned short get_gpiop_ ## name(unsigned short gpio) \
EXPORT_SYMBOL(get_gpiop_ ## name); EXPORT_SYMBOL(get_gpiop_ ## name);
#else #else
#define GET_GPIO_P(name) \ #define GET_GPIO_P(name) \
unsigned short get_gpiop_ ## name(unsigned short gpio) \ unsigned short get_gpiop_ ## name(unsigned gpio) \
{ \ { \
return (gpio_bankb[gpio_bank(gpio)]->name);\ return (gpio_bankb[gpio_bank(gpio)]->name);\
} \ } \
@ -648,7 +639,7 @@ GET_GPIO_P(maskb)
************************************************************* *************************************************************
* MODIFICATION HISTORY : * MODIFICATION HISTORY :
**************************************************************/ **************************************************************/
int gpio_pm_wakeup_request(unsigned short gpio, unsigned char type) int gpio_pm_wakeup_request(unsigned gpio, unsigned char type)
{ {
unsigned long flags; unsigned long flags;
@ -656,7 +647,6 @@ int gpio_pm_wakeup_request(unsigned short gpio, unsigned char type)
return -EINVAL; return -EINVAL;
local_irq_save(flags); local_irq_save(flags);
wakeup_map[gpio_bank(gpio)] |= gpio_bit(gpio); wakeup_map[gpio_bank(gpio)] |= gpio_bit(gpio);
wakeup_flags_map[gpio] = type; wakeup_flags_map[gpio] = type;
local_irq_restore(flags); local_irq_restore(flags);
@ -665,7 +655,7 @@ int gpio_pm_wakeup_request(unsigned short gpio, unsigned char type)
} }
EXPORT_SYMBOL(gpio_pm_wakeup_request); EXPORT_SYMBOL(gpio_pm_wakeup_request);
void gpio_pm_wakeup_free(unsigned short gpio) void gpio_pm_wakeup_free(unsigned gpio)
{ {
unsigned long flags; unsigned long flags;
@ -680,7 +670,7 @@ void gpio_pm_wakeup_free(unsigned short gpio)
} }
EXPORT_SYMBOL(gpio_pm_wakeup_free); EXPORT_SYMBOL(gpio_pm_wakeup_free);
static int bfin_gpio_wakeup_type(unsigned short gpio, unsigned char type) static int bfin_gpio_wakeup_type(unsigned gpio, unsigned char type)
{ {
port_setup(gpio, GPIO_USAGE); port_setup(gpio, GPIO_USAGE);
set_gpio_dir(gpio, 0); set_gpio_dir(gpio, 0);
@ -789,7 +779,7 @@ void gpio_pm_restore(void)
#endif #endif
#else /* BF548_FAMILY */ #else /* BF548_FAMILY */
unsigned short get_gpio_dir(unsigned short gpio) unsigned short get_gpio_dir(unsigned gpio)
{ {
return (0x01 & (gpio_array[gpio_bank(gpio)]->port_dir_clear >> gpio_sub_n(gpio))); return (0x01 & (gpio_array[gpio_bank(gpio)]->port_dir_clear >> gpio_sub_n(gpio)));
} }
@ -1123,7 +1113,6 @@ int gpio_direction_input(unsigned gpio)
return -EINVAL; return -EINVAL;
} }
local_irq_save(flags); local_irq_save(flags);
gpio_array[gpio_bank(gpio)]->port_dir_clear = gpio_bit(gpio); gpio_array[gpio_bank(gpio)]->port_dir_clear = gpio_bit(gpio);
gpio_array[gpio_bank(gpio)]->port_inen |= gpio_bit(gpio); gpio_array[gpio_bank(gpio)]->port_inen |= gpio_bit(gpio);
@ -1158,7 +1147,6 @@ void gpio_set_value(unsigned gpio, int arg)
gpio_array[gpio_bank(gpio)]->port_set = gpio_bit(gpio); gpio_array[gpio_bank(gpio)]->port_set = gpio_bit(gpio);
else else
gpio_array[gpio_bank(gpio)]->port_clear = gpio_bit(gpio); gpio_array[gpio_bank(gpio)]->port_clear = gpio_bit(gpio);
} }
EXPORT_SYMBOL(gpio_set_value); EXPORT_SYMBOL(gpio_set_value);
@ -1200,7 +1188,12 @@ int gpio_direction_output(unsigned gpio, int value)
local_irq_save(flags); local_irq_save(flags);
gpio_bankb[gpio_bank(gpio)]->inen &= ~gpio_bit(gpio); gpio_bankb[gpio_bank(gpio)]->inen &= ~gpio_bit(gpio);
gpio_set_value(gpio, value);
if (value)
gpio_bankb[gpio_bank(gpio)]->data_set = gpio_bit(gpio);
else
gpio_bankb[gpio_bank(gpio)]->data_clear = gpio_bit(gpio);
gpio_bankb[gpio_bank(gpio)]->dir |= gpio_bit(gpio); gpio_bankb[gpio_bank(gpio)]->dir |= gpio_bit(gpio);
AWA_DUMMY_READ(dir); AWA_DUMMY_READ(dir);
local_irq_restore(flags); local_irq_restore(flags);
@ -1225,6 +1218,7 @@ void bfin_gpio_reset_spi0_ssel1(void)
port_setup(gpio, GPIO_USAGE); port_setup(gpio, GPIO_USAGE);
gpio_bankb[gpio_bank(gpio)]->data_set = gpio_bit(gpio); gpio_bankb[gpio_bank(gpio)]->data_set = gpio_bit(gpio);
AWA_DUMMY_READ(data_set);
udelay(1); udelay(1);
} }
@ -1259,6 +1253,5 @@ static __init int gpio_register_proc(void)
proc_gpio->read_proc = gpio_proc_read; proc_gpio->read_proc = gpio_proc_read;
return proc_gpio != NULL; return proc_gpio != NULL;
} }
__initcall(gpio_register_proc); __initcall(gpio_register_proc);
#endif #endif

72
include/asm-blackfin/gpio.h
View File

@ -7,7 +7,7 @@
* Description: * Description:
* *
* Modified: * Modified:
* Copyright 2004-2006 Analog Devices Inc. * Copyright 2004-2008 Analog Devices Inc.
* *
* Bugs: Enter bugs at http://blackfin.uclinux.org/ * Bugs: Enter bugs at http://blackfin.uclinux.org/
* *
@ -304,39 +304,39 @@
**************************************************************/ **************************************************************/
#ifndef BF548_FAMILY #ifndef BF548_FAMILY
void set_gpio_dir(unsigned short, unsigned short); void set_gpio_dir(unsigned, unsigned short);
void set_gpio_inen(unsigned short, unsigned short); void set_gpio_inen(unsigned, unsigned short);
void set_gpio_polar(unsigned short, unsigned short); void set_gpio_polar(unsigned, unsigned short);
void set_gpio_edge(unsigned short, unsigned short); void set_gpio_edge(unsigned, unsigned short);
void set_gpio_both(unsigned short, unsigned short); void set_gpio_both(unsigned, unsigned short);
void set_gpio_data(unsigned short, unsigned short); void set_gpio_data(unsigned, unsigned short);
void set_gpio_maska(unsigned short, unsigned short); void set_gpio_maska(unsigned, unsigned short);
void set_gpio_maskb(unsigned short, unsigned short); void set_gpio_maskb(unsigned, unsigned short);
void set_gpio_toggle(unsigned short); void set_gpio_toggle(unsigned);
void set_gpiop_dir(unsigned short, unsigned short); void set_gpiop_dir(unsigned, unsigned short);
void set_gpiop_inen(unsigned short, unsigned short); void set_gpiop_inen(unsigned, unsigned short);
void set_gpiop_polar(unsigned short, unsigned short); void set_gpiop_polar(unsigned, unsigned short);
void set_gpiop_edge(unsigned short, unsigned short); void set_gpiop_edge(unsigned, unsigned short);
void set_gpiop_both(unsigned short, unsigned short); void set_gpiop_both(unsigned, unsigned short);
void set_gpiop_data(unsigned short, unsigned short); void set_gpiop_data(unsigned, unsigned short);
void set_gpiop_maska(unsigned short, unsigned short); void set_gpiop_maska(unsigned, unsigned short);
void set_gpiop_maskb(unsigned short, unsigned short); void set_gpiop_maskb(unsigned, unsigned short);
unsigned short get_gpio_dir(unsigned short); unsigned short get_gpio_dir(unsigned);
unsigned short get_gpio_inen(unsigned short); unsigned short get_gpio_inen(unsigned);
unsigned short get_gpio_polar(unsigned short); unsigned short get_gpio_polar(unsigned);
unsigned short get_gpio_edge(unsigned short); unsigned short get_gpio_edge(unsigned);
unsigned short get_gpio_both(unsigned short); unsigned short get_gpio_both(unsigned);
unsigned short get_gpio_maska(unsigned short); unsigned short get_gpio_maska(unsigned);
unsigned short get_gpio_maskb(unsigned short); unsigned short get_gpio_maskb(unsigned);
unsigned short get_gpio_data(unsigned short); unsigned short get_gpio_data(unsigned);
unsigned short get_gpiop_dir(unsigned short); unsigned short get_gpiop_dir(unsigned);
unsigned short get_gpiop_inen(unsigned short); unsigned short get_gpiop_inen(unsigned);
unsigned short get_gpiop_polar(unsigned short); unsigned short get_gpiop_polar(unsigned);
unsigned short get_gpiop_edge(unsigned short); unsigned short get_gpiop_edge(unsigned);
unsigned short get_gpiop_both(unsigned short); unsigned short get_gpiop_both(unsigned);
unsigned short get_gpiop_maska(unsigned short); unsigned short get_gpiop_maska(unsigned);
unsigned short get_gpiop_maskb(unsigned short); unsigned short get_gpiop_maskb(unsigned);
unsigned short get_gpiop_data(unsigned short); unsigned short get_gpiop_data(unsigned);
struct gpio_port_t { struct gpio_port_t {
unsigned short data; unsigned short data;
@ -382,8 +382,8 @@ struct gpio_port_t {
#define PM_WAKE_LOW 0x8 #define PM_WAKE_LOW 0x8
#define PM_WAKE_BOTH_EDGES (PM_WAKE_RISING | PM_WAKE_FALLING) #define PM_WAKE_BOTH_EDGES (PM_WAKE_RISING | PM_WAKE_FALLING)
int gpio_pm_wakeup_request(unsigned short gpio, unsigned char type); int gpio_pm_wakeup_request(unsigned gpio, unsigned char type);
void gpio_pm_wakeup_free(unsigned short gpio); void gpio_pm_wakeup_free(unsigned gpio);
unsigned int gpio_pm_setup(void); unsigned int gpio_pm_setup(void);
void gpio_pm_restore(void); void gpio_pm_restore(void);