diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-07-07 00:39:43 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-07-07 00:39:43 +0200 |
| commit | b223017f081d7e0daa33ad17a3cd05b0c1f7d9ba (patch) | |
| tree | 1dd125cc150e22b887d06a31334685cdb9d59e98 /include | |
| parent | 3070a9a3cb41ed6b19f79590f7713d5685ab1066 (diff) | |
| parent | 5f723a3b98c630bde33de74351f2121691fdef14 (diff) | |
| download | u-boot-imx-b223017f081d7e0daa33ad17a3cd05b0c1f7d9ba.zip u-boot-imx-b223017f081d7e0daa33ad17a3cd05b0c1f7d9ba.tar.gz u-boot-imx-b223017f081d7e0daa33ad17a3cd05b0c1f7d9ba.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot-avr32
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-avr32/arch-at32ap700x/gpio.h | 8 | ||||
| -rw-r--r-- | include/configs/atngw100.h | 6 |
2 files changed, 14 insertions, 0 deletions
diff --git a/include/asm-avr32/arch-at32ap700x/gpio.h b/include/asm-avr32/arch-at32ap700x/gpio.h index ef20cea..8c922c7 100644 --- a/include/asm-avr32/arch-at32ap700x/gpio.h +++ b/include/asm-avr32/arch-at32ap700x/gpio.h @@ -180,6 +180,11 @@ #define GPIO_PIN_PE25 (GPIO_PIOE_BASE + 25) #define GPIO_PIN_PE26 (GPIO_PIOE_BASE + 26) +#define GPIOF_PULLUP 0x00000001 /* (not-OUT) Enable pull-up */ +#define GPIOF_OUTPUT 0x00000002 /* (OUT) Enable output driver */ +#define GPIOF_DEGLITCH 0x00000004 /* (IN) Filter glitches */ +#define GPIOF_MULTIDRV 0x00000008 /* Enable multidriver option */ + static inline void *gpio_pin_to_addr(unsigned int pin) { switch (pin >> 5) { @@ -200,6 +205,9 @@ static inline void *gpio_pin_to_addr(unsigned int pin) void gpio_select_periph_A(unsigned int pin, int use_pullup); void gpio_select_periph_B(unsigned int pin, int use_pullup); +void gpio_select_pio(unsigned int pin, unsigned long gpiof_flags); +void gpio_set_value(unsigned int pin, int value); +int gpio_get_value(unsigned int pin); void gpio_enable_ebi(void); diff --git a/include/configs/atngw100.h b/include/configs/atngw100.h index 3fc9975..7ac51b5 100644 --- a/include/configs/atngw100.h +++ b/include/configs/atngw100.h @@ -114,6 +114,8 @@ #define CONFIG_CMD_FAT #define CONFIG_CMD_JFFS2 #define CONFIG_CMD_MMC +#define CONFIG_CMD_SF +#define CONFIG_CMD_SPI #undef CONFIG_CMD_AUTOSCRIPT #undef CONFIG_CMD_FPGA @@ -126,6 +128,10 @@ #define CFG_NR_PIOS 5 #define CFG_HSDRAMC 1 #define CONFIG_MMC 1 +#define CONFIG_ATMEL_SPI 1 + +#define CONFIG_SPI_FLASH 1 +#define CONFIG_SPI_FLASH_ATMEL 1 #define CFG_DCACHE_LINESZ 32 #define CFG_ICACHE_LINESZ 32 |