diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-02-09 19:54:53 (GMT) |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-02-09 19:54:53 (GMT) |
| commit | 65b57ebb3031a60dddd451097dc5c435fb051b6f (patch) | |
| tree | 5454164b2ec4bb59131b615360b31bf6c262588a /board | |
| parent | fced09ae386d1aa7fcfdf9111c99da4be56e5b43 (diff) | |
| parent | d8a593c68bac7b9d9b26af6fa8c392671213ce93 (diff) | |
| download | u-boot-65b57ebb3031a60dddd451097dc5c435fb051b6f.tar.xz | |
Merge branch 'next' of git://git.denx.de/u-boot-nios
Diffstat (limited to 'board')
| -rw-r--r-- | board/altera/nios2-generic/custom_fpga.h | 1 | ||||
| -rw-r--r-- | board/altera/nios2-generic/gpio.c | 11 |
2 files changed, 12 insertions, 0 deletions
diff --git a/board/altera/nios2-generic/custom_fpga.h b/board/altera/nios2-generic/custom_fpga.h index a11add5..f7f3853 100644 --- a/board/altera/nios2-generic/custom_fpga.h +++ b/board/altera/nios2-generic/custom_fpga.h @@ -50,6 +50,7 @@ /* led_pio.s1 is a altera_avalon_pio */ #define LED_PIO_BASE 0x82120870 +#define LED_PIO_WIDTH 8 /* high_res_timer.s1 is a altera_avalon_timer */ #define CONFIG_SYS_TIMER_BASE 0x82120820 diff --git a/board/altera/nios2-generic/gpio.c b/board/altera/nios2-generic/gpio.c index d449684..4a30564 100644 --- a/board/altera/nios2-generic/gpio.c +++ b/board/altera/nios2-generic/gpio.c @@ -10,6 +10,7 @@ #ifndef CONFIG_SYS_GPIO_BASE #define ALTERA_PIO_BASE LED_PIO_BASE +#define ALTERA_PIO_WIDTH LED_PIO_WIDTH #define ALTERA_PIO_DATA (ALTERA_PIO_BASE + 0) #define ALTERA_PIO_DIR (ALTERA_PIO_BASE + 4) static u32 pio_data_reg; @@ -20,6 +21,11 @@ int gpio_request(unsigned gpio, const char *label) return 0; } +int gpio_free(unsigned gpio) +{ + return 0; +} + int gpio_direction_input(unsigned gpio) { u32 mask = 1 << gpio; @@ -57,4 +63,9 @@ void gpio_set_value(unsigned gpio, int value) pio_data_reg &= ~mask; writel(pio_data_reg, ALTERA_PIO_DATA); } + +int gpio_is_valid(int number) +{ + return ((unsigned)number) < ALTERA_PIO_WIDTH; +} #endif |