Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e8c1243 authored by Andres Salomon's avatar Andres Salomon Committed by Linus Torvalds
Browse files

cs5535: move the DIVIL MSR definition into linux/cs5535.h 



The only thing that uses this is the reboot_fixups code.

Signed-off-by: default avatarAndres 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c30d7d2b

arch/x86/include/asm/geode.h

+0 −2
Original line number Diff line number Diff line
@@ -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

arch/x86/kernel/reboot_fixups_32.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

{

include/linux/cs5535.h

+2 −0
Original line number Diff line number Diff line
@@ -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