[backfire] merge r27449

[openwrt-10.03/.git] / target / linux / ifxmips / files / arch / mips / ifxmips / pmu.c

diff --git a/target/linux/ifxmips/files/arch/mips/ifxmips/pmu.c b/target/linux/ifxmips/files/arch/mips/ifxmips/pmu.c
index 080656fd8a63a62256c524cdf5ff6671f8d38ab3..29d710451b1c272424a0f9e6c7f9d10a07618989 100644 (file)
--- a/target/linux/ifxmips/files/arch/mips/ifxmips/pmu.c
+++ b/target/linux/ifxmips/files/arch/mips/ifxmips/pmu.c
@@ -1,6 +1,4 @@
 /*
- *   arch/mips/ifxmips/pmu.c
- *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
  *   the Free Software Foundation; either version 2 of the License, or
@@ -15,30 +13,33 @@
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
  *
- *   Copyright (C) 2007 John Crispin <blogic@openwrt.org> 
+ *   Copyright (C) 2007 John Crispin <blogic@openwrt.org>
  *
+ *      code used for handling the power management unit of the danube. using
+ *      the pmu we can turn the power of the seperate ip cores on/off.
  */
 
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/version.h>
-#include <asm/ifxmips/ifxmips.h>
 
-void
-ifxmips_pmu_enable (unsigned int module)
+#include <ifxmips.h>
+
+void ifxmips_pmu_enable(unsigned int module)
 {
        int err = 1000000;
 
-       ifxmips_w32(ifxmips_r32(IFXMIPS_PMU_PWDCR) & ~module, IFXMIPS_PMU_PWDCR);
-       while (--err && (ifxmips_r32(IFXMIPS_PMU_PWDSR) & module)) {}
+       ifxmips_w32(ifxmips_r32(IFXMIPS_PMU_PWDCR) & ~module,
+               IFXMIPS_PMU_PWDCR);
+       while (--err && (ifxmips_r32(IFXMIPS_PMU_PWDSR) & module))
+               ;
 
        if (!err)
                panic("activating PMU module failed!");
 }
 EXPORT_SYMBOL(ifxmips_pmu_enable);
 
-void
-ifxmips_pmu_disable (unsigned int module)
+void ifxmips_pmu_disable(unsigned int module)
 {
        ifxmips_w32(ifxmips_r32(IFXMIPS_PMU_PWDCR) | module, IFXMIPS_PMU_PWDCR);
 }