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: (60 commits)
  Blackfin arch: make sure we include the fix for SPORT hysteresis when reprogramming clocks
  Blackfin arch: Fix bogus str_ident check in gpio code
  Blackfin arch: AD7879 Touchscreen driver
  Blackfin arch: introducing bfin_addr_dcachable
  Blackfin arch: fix a typo in comments
  Blackfin arch: Remove useless head file
  Blackfin arch: make sure L2 start and length are always defined (fixes building on BF542)
  Blackfin arch: use the Blackfin on-chip ROM to do software reset when possible
  Blackfin arch: update anomaly headers to match the latest sheet
  Blackfin arch: bfin_reset() is an internal reboot function ... everyone should go through machine_restart()
  Blackfin arch: print out error/warning if you are running on the incorrect CPU type
  Blackfin arch: remove non-bf54x ifdef logic since this file is only compiled on bf54x parts
  Blackfin arch: update board defconfigs
  Blackfin arch: Add optional verbose debug
  Blackfin arch: emulate a TTY over the EMUDAT/JTAG interface
  Blackfin arch: have is_user_addr_valid() check for overflows (like when address is -1)
  Blackfin arch: ptrace - fix off-by-one check on end of memory regions
  Blackfin arch: Enable framebuffer support for the BF526-EZkit TFT LCD display
  Blackfin arch: flash memory map and dm9000 resources updating
  Blackfin arch: early prink code still use uart core console functions to parse and set configure option string
  ...

1 files changed, 48 insertions, 4 deletions

diff --git a/arch/blackfin/mach-common/head.S b/arch/blackfin/mach-common/head.S
index 191b4e974c4b..3069df580729 100644
--- a/arch/blackfin/mach-common/head.S
+++ b/arch/blackfin/mach-common/head.S
@@ -68,6 +68,16 @@ ENTRY(__start)
         M2 = r0;
         M3 = r0;
 
+        /*
+         * Clear ITEST_COMMAND and DTEST_COMMAND registers,
+         * Leaving these as non-zero can confuse the emulator
+         */
+        p0.L = LO(DTEST_COMMAND);
+        p0.H = HI(DTEST_COMMAND);
+        [p0] = R0;
+        [p0 + (ITEST_COMMAND - DTEST_COMMAND)] = R0;
+        CSYNC;
+
         trace_buffer_init(p0,r0);
         P0 = R1;
         R0 = R1;
@@ -90,12 +100,46 @@ ENTRY(__start)
         [p0] = R0;
         SSYNC;
 
-        /* Save RETX, in case of doublefault */
-        p0.l = ___retx;
-        p0.h = ___retx;
+        /* in case of double faults, save a few things */
+        p0.l = _init_retx;
+        p0.h = _init_retx;
         R0 = RETX;
         [P0] = R0;
 
+#ifdef CONFIG_DEBUG_DOUBLEFAULT
+        /* Only save these if we are storing them,
+         * This happens here, since L1 gets clobbered
+         * below
+         */
+        p0.l = _saved_retx;
+        p0.h = _saved_retx;
+        p1.l = _init_saved_retx;
+        p1.h = _init_saved_retx;
+        r0 = [p0];
+        [p1] = r0;
+
+        p0.l = _saved_dcplb_fault_addr;
+        p0.h = _saved_dcplb_fault_addr;
+        p1.l = _init_saved_dcplb_fault_addr;
+        p1.h = _init_saved_dcplb_fault_addr;
+        r0 = [p0];
+        [p1] = r0;
+
+        p0.l = _saved_icplb_fault_addr;
+        p0.h = _saved_icplb_fault_addr;
+        p1.l = _init_saved_icplb_fault_addr;
+        p1.h = _init_saved_icplb_fault_addr;
+        r0 = [p0];
+        [p1] = r0;
+
+        p0.l = _saved_seqstat;
+        p0.h = _saved_seqstat;
+        p1.l = _init_saved_seqstat;
+        p1.h = _init_saved_seqstat;
+        r0 = [p0];
+        [p1] = r0;
+#endif
+
         /* Initialize stack pointer */
         sp.l = lo(INITIAL_STACK);
         sp.h = hi(INITIAL_STACK);
@@ -107,7 +151,7 @@ ENTRY(__start)
 #endif
 
         /* Put The Code for PLL Programming and SDRAM Programming in L1 ISRAM */
-        call _bf53x_relocate_l1_mem;
+        call _bfin_relocate_l1_mem;
 #ifdef CONFIG_BFIN_KERNEL_CLOCK
         call _start_dma_code;
 #endif