]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
GEODE: use symbolic constant in cs5536 reboot fixup
authorAndres Salomon <dilinger@queued.net>
Thu, 18 Oct 2007 19:26:51 +0000 (15:26 -0400)
committerThomas Gleixner <tglx@linutronix.de>
Fri, 19 Oct 2007 18:35:02 +0000 (20:35 +0200)
Simple cosmetic update for the cs5536 reboot fixup; define the MSR that's used
for rebooting in geode.h, and use the define.

Signed-off-by: Andres Salomon <dilinger@debian.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/kernel/reboot_fixups_32.c
include/asm-x86/geode.h

index 8b30b26ad0698161276c2b87c4c64594887aa4ad..1a07bbea7be36eadcea68843d7b727eaa03ee9a4 100644 (file)
@@ -12,6 +12,7 @@
 #include <linux/interrupt.h>
 #include <asm/reboot_fixups.h>
 #include <asm/msr.h>
+#include <asm/geode.h>
 
 static void cs5530a_warm_reset(struct pci_dev *dev)
 {
@@ -24,11 +25,8 @@ static void cs5530a_warm_reset(struct pci_dev *dev)
 
 static void cs5536_warm_reset(struct pci_dev *dev)
 {
-       /*
-        * 6.6.2.12 Soft Reset (DIVIL_SOFT_RESET)
-        * writing 1 to the LSB of this MSR causes a hard reset.
-        */
-       wrmsrl(0x51400017, 1ULL);
+       /* writing 1 to the LSB of this MSR causes a hard reset */
+       wrmsrl(MSR_DIVIL_SOFT_RESET, 1ULL);
        udelay(50); /* shouldn't get here but be safe and spin a while */
 }
 
index d94898831bac6d2e66ecaaa75972789841048bd5..771af336734fc73aab39d03a8414f54cfadaad71 100644 (file)
@@ -38,6 +38,8 @@ extern int geode_get_dev_base(unsigned int dev);
 #define MSR_LBAR_ACPI          0x5140000E
 #define MSR_LBAR_PMS           0x5140000F
 
+#define MSR_DIVIL_SOFT_RESET   0x51400017
+
 #define MSR_PIC_YSEL_LOW       0x51400020
 #define MSR_PIC_YSEL_HIGH      0x51400021
 #define MSR_PIC_ZSEL_LOW       0x51400022