[PATCH 3/6] CS5535: move the DIVIL MSR definition into linux/cs5535.h

Andres Salomon dilinger at collabora.co.uk
Sun Nov 8 01:00:51 EST 2009


The only thing that uses this is the reboot_fixups code.

Signed-off-by: Andres Salomon <dilinger at collabora.co.uk>
---
 arch/x86/include/asm/geode.h       |    2 --
 arch/x86/kernel/reboot_fixups_32.c |    2 +-
 include/linux/cs5535.h             |    2 ++
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/x86/include/asm/geode.h b/arch/x86/include/asm/geode.h
index 547e964..976b3f1 100644
--- a/arch/x86/include/asm/geode.h
+++ b/arch/x86/include/asm/geode.h
@@ -45,8 +45,6 @@ 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_LX_SPARE_MSR	0x80000011	/* DC-specific */
 
 #define MSR_GX_GLD_MSR_CONFIG	0xC0002001
diff --git a/arch/x86/kernel/reboot_fixups_32.c b/arch/x86/kernel/reboot_fixups_32.c
index 61a8377..3894e43 100644
--- a/arch/x86/kernel/reboot_fixups_32.c
+++ b/arch/x86/kernel/reboot_fixups_32.c
@@ -12,7 +12,7 @@
 #include <linux/interrupt.h>
 #include <asm/reboot_fixups.h>
 #include <asm/msr.h>
-#include <asm/geode.h>
+#include <linux/cs5535.h>
 
 static void cs5530a_warm_reset(struct pci_dev *dev)
 {
diff --git a/include/linux/cs5535.h b/include/linux/cs5535.h
index 30ecb04..39e93e8 100644
--- a/include/linux/cs5535.h
+++ b/include/linux/cs5535.h
@@ -18,6 +18,8 @@
 #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
-- 
1.5.6.5




More information about the Linux-geode mailing list