aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Frysinger <michael.frysinger@analog.com>2007-05-21 06:09:23 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-21 12:50:22 -0400
commit30870b93cd76bdfa7385f8d471345f5f6269fb00 (patch)
treee777e79962dbf78b842ca798cd3dc1245bf7cf13
parenteb8d5f6c0322e641ec32ed632dd3b02586205673 (diff)
Blackfin arch: dont clear status register bits in SWRST so we can actually use it
Signed-off-by: Mike Frysinger <michael.frysinger@analog.com> Signed-off-by: Bryan Wu <bryan.wu@analog.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--arch/blackfin/mach-bf533/head.S6
-rw-r--r--arch/blackfin/mach-bf537/head.S6
-rw-r--r--arch/blackfin/mach-bf561/head.S6
3 files changed, 0 insertions, 18 deletions
diff --git a/arch/blackfin/mach-bf533/head.S b/arch/blackfin/mach-bf533/head.S
index 4808edb0680f..7cb8258841d4 100644
--- a/arch/blackfin/mach-bf533/head.S
+++ b/arch/blackfin/mach-bf533/head.S
@@ -468,12 +468,6 @@ ENTRY(_bfin_reset)
468 w[p0] = r0.l; 468 w[p0] = r0.l;
469#endif 469#endif
470 470
471 /* Clear the bits 13-15 in SWRST if they werent cleared */
472 p0.h = hi(SWRST);
473 p0.l = lo(SWRST);
474 csync;
475 r0.l = w[p0];
476
477 /* Clear the IMASK register */ 471 /* Clear the IMASK register */
478 p0.h = hi(IMASK); 472 p0.h = hi(IMASK);
479 p0.l = lo(IMASK); 473 p0.l = lo(IMASK);
diff --git a/arch/blackfin/mach-bf537/head.S b/arch/blackfin/mach-bf537/head.S
index d104e1d8e07a..de78e4281aef 100644
--- a/arch/blackfin/mach-bf537/head.S
+++ b/arch/blackfin/mach-bf537/head.S
@@ -504,12 +504,6 @@ _delay_lab1_end:
504 nop; 504 nop;
505#endif 505#endif
506 506
507 /* Clear the bits 13-15 in SWRST if they werent cleared */
508 p0.h = hi(SWRST);
509 p0.l = lo(SWRST);
510 csync;
511 r0.l = w[p0];
512
513 /* Clear the IMASK register */ 507 /* Clear the IMASK register */
514 p0.h = hi(IMASK); 508 p0.h = hi(IMASK);
515 p0.l = lo(IMASK); 509 p0.l = lo(IMASK);
diff --git a/arch/blackfin/mach-bf561/head.S b/arch/blackfin/mach-bf561/head.S
index 7bca478526b9..462c39ed8ec5 100644
--- a/arch/blackfin/mach-bf561/head.S
+++ b/arch/blackfin/mach-bf561/head.S
@@ -414,12 +414,6 @@ ENTRY(_bfin_reset)
414 w[p0] = r0.l; 414 w[p0] = r0.l;
415#endif 415#endif
416 416
417 /* Clear the bits 13-15 in SWRST if they werent cleared */
418 p0.h = hi(SICA_SWRST);
419 p0.l = lo(SICA_SWRST);
420 csync;
421 r0.l = w[p0];
422
423 /* Clear the IMASK register */ 417 /* Clear the IMASK register */
424 p0.h = hi(IMASK); 418 p0.h = hi(IMASK);
425 p0.l = lo(IMASK); 419 p0.l = lo(IMASK);