diff options
author | Michael Hennerich <michael.hennerich@analog.com> | 2007-07-01 23:45:50 -0400 |
---|---|---|
committer | Bryan Wu <bryan.wu@analog.com> | 2007-07-01 23:45:50 -0400 |
commit | cefe658bca9cf1d4af841c45d170ebd0f881889e (patch) | |
tree | bddd2bc1f4467ca550d386fdc888baf78be64fcf /include | |
parent | e3f2300036b5e0f60cb64063a9686361b6be8555 (diff) |
Blackfin arch: add BF54x missing GPIO access functions
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Bryan Wu <bryan.wu@analog.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-blackfin/gpio.h | 4 | ||||
-rw-r--r-- | include/asm-blackfin/mach-bf548/gpio.h | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/include/asm-blackfin/gpio.h b/include/asm-blackfin/gpio.h index bc0cca02850b..e679703f7ae5 100644 --- a/include/asm-blackfin/gpio.h +++ b/include/asm-blackfin/gpio.h | |||
@@ -234,6 +234,7 @@ | |||
234 | * MODIFICATION HISTORY : | 234 | * MODIFICATION HISTORY : |
235 | **************************************************************/ | 235 | **************************************************************/ |
236 | 236 | ||
237 | #ifndef BF548_FAMILY | ||
237 | void set_gpio_dir(unsigned short, unsigned short); | 238 | void set_gpio_dir(unsigned short, unsigned short); |
238 | void set_gpio_inen(unsigned short, unsigned short); | 239 | void set_gpio_inen(unsigned short, unsigned short); |
239 | void set_gpio_polar(unsigned short, unsigned short); | 240 | void set_gpio_polar(unsigned short, unsigned short); |
@@ -268,7 +269,6 @@ unsigned short get_gpiop_maska(unsigned short); | |||
268 | unsigned short get_gpiop_maskb(unsigned short); | 269 | unsigned short get_gpiop_maskb(unsigned short); |
269 | unsigned short get_gpiop_data(unsigned short); | 270 | unsigned short get_gpiop_data(unsigned short); |
270 | 271 | ||
271 | #ifndef BF548_FAMILY | ||
272 | struct gpio_port_t { | 272 | struct gpio_port_t { |
273 | unsigned short data; | 273 | unsigned short data; |
274 | unsigned short dummy1; | 274 | unsigned short dummy1; |
@@ -363,8 +363,10 @@ void gpio_free(unsigned short); | |||
363 | void gpio_set_value(unsigned short gpio, unsigned short arg); | 363 | void gpio_set_value(unsigned short gpio, unsigned short arg); |
364 | unsigned short gpio_get_value(unsigned short gpio); | 364 | unsigned short gpio_get_value(unsigned short gpio); |
365 | 365 | ||
366 | #ifndef BF548_FAMILY | ||
366 | #define gpio_get_value(gpio) get_gpio_data(gpio) | 367 | #define gpio_get_value(gpio) get_gpio_data(gpio) |
367 | #define gpio_set_value(gpio, value) set_gpio_data(gpio, value) | 368 | #define gpio_set_value(gpio, value) set_gpio_data(gpio, value) |
369 | #endif | ||
368 | 370 | ||
369 | void gpio_direction_input(unsigned short gpio); | 371 | void gpio_direction_input(unsigned short gpio); |
370 | void gpio_direction_output(unsigned short gpio); | 372 | void gpio_direction_output(unsigned short gpio); |
diff --git a/include/asm-blackfin/mach-bf548/gpio.h b/include/asm-blackfin/mach-bf548/gpio.h index 45289425ce59..8c5847a6680b 100644 --- a/include/asm-blackfin/mach-bf548/gpio.h +++ b/include/asm-blackfin/mach-bf548/gpio.h | |||
@@ -187,8 +187,8 @@ | |||
187 | #define GPIO_PJ11 155 | 187 | #define GPIO_PJ11 155 |
188 | #define GPIO_PJ12 156 | 188 | #define GPIO_PJ12 156 |
189 | #define GPIO_PJ13 157 | 189 | #define GPIO_PJ13 157 |
190 | #define GPIO_PJ14 158 | 190 | #define GPIO_PJ14 158 /* N/A */ |
191 | #define GPIO_PJ15 159 | 191 | #define GPIO_PJ15 159 /* N/A */ |
192 | 192 | ||
193 | #define MAX_BLACKFIN_GPIOS 160 | 193 | #define MAX_BLACKFIN_GPIOS 160 |
194 | 194 | ||