diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-07 15:00:25 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-07 15:00:25 -0500 |
| commit | 5bb47b9ff3d16d40f8d45380b373497a545fa280 (patch) | |
| tree | e13dd34395473342dc75eff5cbaf5b1ea753631c /arch/blackfin/include/asm/bfin-global.h | |
| parent | 2f2408a88cf8fa43febfd7fb5783e61b2937b0f9 (diff) | |
| parent | 06af15e086e39a5a2a2413973a64af8e10122f28 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6: (171 commits)
Blackfin arch: fix bug - BF527 0.2 silicon has different CPUID (DSPID) value
Blackfin arch: Enlarge flash partition for kenel for bf533/bf537 boards
Blackfin arch: fix bug: kernel crash when enable SDIO host driver
Blackfin arch: Print FP at level KERN_NOTICE
Blackfin arch: drop ad73311 test code
Blackfin arch: update board default configs
Blackfin arch: Set PB4 as the default irq for bf548 board v1.4+.
Blackfin arch: fix typo in early printk bit size processing
Blackfin arch: enable reprogram cclk and sclk for bf518f-ezbrd
Blackfin arch: add SDIO host driver platform data
Blackfin arch: fix bug - kernel stops at initial console
Blackfin arch: fix bug - kernel crash after config IP for ethernet port
Blackfin arch: add sdh support for bf518f-ezbrd
Blackfin arch: fix bug - kernel detects BF532 incorrectly
Blackfin arch: add () to avoid warnings from gcc
Blackfin arch: change HWTRACE Kconfig and set it on default
Blackfin arch: Clean oprofile build path for blackfin
Blackfin arch: remove hardware PM code, oprofile not use it
Blackfin arch: rewrite get_sclk()/get_vco()
Blackfin arch: cleanup and unify the ins functions
...
Diffstat (limited to 'arch/blackfin/include/asm/bfin-global.h')
| -rw-r--r-- | arch/blackfin/include/asm/bfin-global.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/blackfin/include/asm/bfin-global.h b/arch/blackfin/include/asm/bfin-global.h index 77295666c34b..daffc0684e75 100644 --- a/arch/blackfin/include/asm/bfin-global.h +++ b/arch/blackfin/include/asm/bfin-global.h | |||
| @@ -47,6 +47,9 @@ | |||
| 47 | # define DMA_UNCACHED_REGION (0) | 47 | # define DMA_UNCACHED_REGION (0) |
| 48 | #endif | 48 | #endif |
| 49 | 49 | ||
| 50 | extern void bfin_setup_caches(unsigned int cpu); | ||
| 51 | extern void bfin_setup_cpudata(unsigned int cpu); | ||
| 52 | |||
| 50 | extern unsigned long get_cclk(void); | 53 | extern unsigned long get_cclk(void); |
| 51 | extern unsigned long get_sclk(void); | 54 | extern unsigned long get_sclk(void); |
| 52 | extern unsigned long sclk_to_usecs(unsigned long sclk); | 55 | extern unsigned long sclk_to_usecs(unsigned long sclk); |
| @@ -58,8 +61,6 @@ extern void dump_bfin_trace_buffer(void); | |||
| 58 | 61 | ||
| 59 | /* init functions only */ | 62 | /* init functions only */ |
| 60 | extern int init_arch_irq(void); | 63 | extern int init_arch_irq(void); |
| 61 | extern void bfin_icache_init(void); | ||
| 62 | extern void bfin_dcache_init(void); | ||
| 63 | extern void init_exception_vectors(void); | 64 | extern void init_exception_vectors(void); |
| 64 | extern void program_IAR(void); | 65 | extern void program_IAR(void); |
| 65 | 66 | ||
| @@ -110,7 +111,7 @@ extern unsigned long memory_mtd_start, memory_mtd_end, mtd_size; | |||
| 110 | 111 | ||
| 111 | #ifdef CONFIG_BFIN_ICACHE_LOCK | 112 | #ifdef CONFIG_BFIN_ICACHE_LOCK |
| 112 | extern void cache_grab_lock(int way); | 113 | extern void cache_grab_lock(int way); |
| 113 | extern void cache_lock(int way); | 114 | extern void bfin_cache_lock(int way); |
| 114 | #endif | 115 | #endif |
| 115 | 116 | ||
| 116 | #endif | 117 | #endif |