patch-2.4.19 linux-2.4.19/arch/mips/philips/nino/power.c

• Lines: 35
• Date: Fri Aug 2 17:39:43 2002
• Orig file: linux-2.4.18/arch/mips/philips/nino/power.c
• Orig date: Sun Sep 9 10:43:02 2001

diff -urN linux-2.4.18/arch/mips/philips/nino/power.c linux-2.4.19/arch/mips/philips/nino/power.c
@@ -1,5 +1,5 @@
 /*
- *  linux/arch/mips/philips/nino/power.c
+ *  arch/mips/philips/nino/power.c
  *
  *  Copyright (C) 2000 Jim Pick <jim@jimpick.com>
  *  Copyright (C) 2001 Steven J. Hill (sjhill@realitydiluted.com)
@@ -8,21 +8,24 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  *
- *  Power management routines on the Philips Nino.
+ *  Power management routines for the Philips Nino
  */
+#include <asm/io.h>
 #include <asm/tx3912.h>
 
 void nino_wait(void)
 {
 	/* We stop the CPU to conserve power */
-	PowerControl |= PWR_STOPCPU;
+	outl(inl(TX3912_POWER_CTRL) | TX3912_POWER_CTRL_STOPCPU,
+		 TX3912_POWER_CTRL);
 
 	/* 
 	 * We wait until an interrupt happens...
 	 */
 
 	/* We resume here */
-	PowerControl &= ~PWR_STOPCPU;
+	outl(inl(TX3912_POWER_CTRL) & ~TX3912_POWER_CTRL_STOPCPU,
+		 TX3912_POWER_CTRL);
 
 	/* Give ourselves a little delay */
 	__asm__ __volatile__(