diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-08-02 21:46:53 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-08-02 21:46:53 +0200 |
| commit | 1902692aa0b2dcbb9351172be03c57d1e82447e4 (patch) | |
| tree | f6250202aaa6e98a7beaa08841a55b9e2d54d670 /arch/blackfin/include/asm/portmux.h | |
| parent | cc4e6d25561b1aaa8501fa6017a0d17fd4f92ed6 (diff) | |
| parent | d8940a654435dfa48013229edf53bd3e353e97c1 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-blackfin
* 'master' of git://git.denx.de/u-boot-blackfin:
Blackfin: jtag-console: fix timer usage
Blackfin: switch to common display_options()
Blackfin: serial: move early debug strings into .rodata section
Blackfin: adi boards: also set stderr to nc with helper
Blackfin: update anomaly lists to latest public info
Blackfin: serial: convert to bfin_{read,write} helpers
Blackfin: split out async setup
Blackfin: adi boards: enable pretty flash progress output
Blackfin: drop unused dma.h header from start code
Blackfin: portmux: allow header to be included in assembly files
Blackfin: cm-bf537e/cm-bf537u/tcm-bf537: enable mmc_spi support
Blackfin: cm-bf537e/cm-bf537u/tcm-bf537: update network settings
Blackfin: sync MMR read/write helpers with Linux
Blackfin: gpio: optimize free path a little
Blackfin: post: setup default CONFIG_SYS_POST_WORD_ADDR
Blackfin: uart: fix printf warning
Blackfin: add init.elf helper code
Blackfin: dont reset SWRST on newer bf526 parts
Blackfin: adi boards: enable multi serial support by default
Blackfin: uart: add multiple serial support
Blackfin: uart: move debug buffers into local bss
Diffstat (limited to 'arch/blackfin/include/asm/portmux.h')
| -rw-r--r-- | arch/blackfin/include/asm/portmux.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/blackfin/include/asm/portmux.h b/arch/blackfin/include/asm/portmux.h index b17207fbd4..300ef44fd1 100644 --- a/arch/blackfin/include/asm/portmux.h +++ b/arch/blackfin/include/asm/portmux.h @@ -22,11 +22,15 @@ #define peripheral_request_list(per, label) peripheral_request_list(per) #endif +#ifndef __ASSEMBLY__ + int peripheral_request(unsigned short per, const char *label); void peripheral_free(unsigned short per); int peripheral_request_list(const unsigned short per[], const char *label); void peripheral_free_list(const unsigned short per[]); +#endif + #include <asm/blackfin.h> #ifndef P_SPORT2_TFS |