Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6] / arch / powerpc / platforms / 44x / misc_44x.S

diff --git a/arch/powerpc/platforms/44x/misc_44x.S b/arch/powerpc/platforms/44x/misc_44x.S
index 52bde71485bdc100c378ccd18756c88ed77c4031..dc12b8009e48f49e7f6114bfeacaba4533fc4a99 100644 (file)
--- a/arch/powerpc/platforms/44x/misc_44x.S
+++ b/arch/powerpc/platforms/44x/misc_44x.S
@@ -15,12 +15,32 @@
        .text
 
 /*
- * void ppc44x_reset_system(char *cmd)
- *
- * At present, this routine just applies a system reset.
+ * Do an IO access in AS1
  */
-_GLOBAL(ppc44x_reset_system)
-       mfspr   r13,SPRN_DBCR0
-       oris    r13,r13,DBCR0_RST_SYSTEM@h
-       mtspr   SPRN_DBCR0,r13
-       b       .                       /* Just in case the reset doesn't work */
+_GLOBAL(as1_readb)
+       mfmsr   r7
+       ori     r0,r7,MSR_DS
+       sync
+       mtmsr   r0
+       sync
+       isync
+       lbz     r3,0(r3)
+       sync
+       mtmsr   r7
+       sync
+       isync
+       blr
+
+_GLOBAL(as1_writeb)
+       mfmsr   r7
+       ori     r0,r7,MSR_DS
+       sync
+       mtmsr   r0
+       sync
+       isync
+       stb     r3,0(r4)
+       sync
+       mtmsr   r7
+       sync
+       isync
+       blr