diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-19 19:04:47 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-19 19:04:47 +0200 |
| commit | 3e10e879a8c334a5927d800a3663a24d562cfa31 (patch) | |
| tree | 5d18bc7e38c986a044e99aa0d0a4aff4931ec7d0 /arch/blackfin/mach-bf561/head.S | |
| parent | 98d9c66ab07471006fd7910cb16453581c41a3e7 (diff) | |
| parent | 0cfd81031a26717fe14380d18275f8e217571615 (diff) | |
Merge branch 'linus' into tracing-v28-for-linus-v3
Conflicts:
init/main.c
kernel/module.c
scripts/bootgraph.pl
Diffstat (limited to 'arch/blackfin/mach-bf561/head.S')
| -rw-r--r-- | arch/blackfin/mach-bf561/head.S | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/blackfin/mach-bf561/head.S b/arch/blackfin/mach-bf561/head.S index 75ea6a905829..31a777a9e699 100644 --- a/arch/blackfin/mach-bf561/head.S +++ b/arch/blackfin/mach-bf561/head.S @@ -77,6 +77,9 @@ ENTRY(_start_dma_code) r1 = PLL_BYPASS; /* Bypass the PLL? */ r1 = r1 << 8; /* Shift it over */ r0 = r1 | r0; /* add them all together */ +#ifdef ANOMALY_05000265 + BITSET(r0, 15); /* Add 250 mV of hysteresis to SPORT input pins */ +#endif p0.h = hi(PLL_CTL); p0.l = lo(PLL_CTL); /* Load the address */ |