diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-11-21 22:00:37 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-11-21 22:00:37 +0100 |
| commit | c829ff2e3d1bec9b2019480d82638149327db99e (patch) | |
| tree | 0bd760629b01f50e0829405abebaa66d1332b7c1 /arch/nios2/include/asm | |
| parent | 05622191e510e495b6a06da6342126e80a3fed8f (diff) | |
| parent | 4279c53e5b594ed9b09c752df3cf0b4eacf57788 (diff) | |
| download | u-boot-imx-c829ff2e3d1bec9b2019480d82638149327db99e.zip u-boot-imx-c829ff2e3d1bec9b2019480d82638149327db99e.tar.gz u-boot-imx-c829ff2e3d1bec9b2019480d82638149327db99e.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-nios
* 'master' of git://git.denx.de/u-boot-nios:
nios2: Offer ft_board_setup() capability and call fdt_fixup_ethernet().
board/nios2-generic: Use altera_pio driver and remove board specific driver
gpio: Add driver for Altera's PIO core
nios2: Pseudo implement dcache_status/enable/disable()
Diffstat (limited to 'arch/nios2/include/asm')
| -rw-r--r-- | arch/nios2/include/asm/gpio.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/arch/nios2/include/asm/gpio.h b/arch/nios2/include/asm/gpio.h index 4b21c8f..908381f 100644 --- a/arch/nios2/include/asm/gpio.h +++ b/arch/nios2/include/asm/gpio.h @@ -5,8 +5,8 @@ * bit[0] data * bit[1] output enable * - * when CONFIG_SYS_GPIO_BASE is not defined, board may provide - * its own driver. + * When CONFIG_SYS_GPIO_BASE is not defined, the board may either + * provide its own driver or the altera_pio driver may be used. * * Copyright (C) 2010 Thomas Chou <thomas@wytron.com.tw> * @@ -58,6 +58,15 @@ static inline int gpio_is_valid(int number) return ((unsigned)number) < CONFIG_SYS_GPIO_WIDTH; } #else +#ifdef CONFIG_ALTERA_PIO +extern int altera_pio_init(u32 base, u8 width, char iot, + u32 rstval, u32 negmask, + const char *label); + +extern void altera_pio_info(void); +#define gpio_status() altera_pio_info() +#endif + extern int gpio_request(unsigned gpio, const char *label); extern int gpio_free(unsigned gpio); extern int gpio_direction_input(unsigned gpio); |