Skip to content

Commit

Permalink
cs5535: move the DIVIL MSR definition into linux/cs5535.h
Browse files Browse the repository at this point in the history 
The only thing that uses this is the reboot_fixups code.

Signed-off-by: Andres Salomon <dilinger@collabora.co.uk>
Cc: Jordan Crouse <jordan@cosmicpenguin.net>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: john stultz <johnstul@us.ibm.com>
Cc: Chris Ball <cjb@laptop.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Andres Salomon authored and Linus Torvalds committed Dec 15, 2009
1 parent c30d7d2 commit 2e8c124
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 0 additions & 2 deletions arch/x86/include/asm/geode.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion arch/x86/kernel/reboot_fixups_32.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
2 changes: 2 additions & 0 deletions include/linux/cs5535.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 2e8c124

Please sign in to comment.