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

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

cs5535: define lxfb/gxfb MSRs in linux/cs5535.h 



..and include them in the lxfb/gxfb drivers rather than asm/geode.h (where
possible).

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 f060f270

arch/x86/include/asm/geode.h

+0 −13
Original line number Diff line number Diff line
@@ -31,25 +31,12 @@ extern int geode_get_dev_base(unsigned int dev); 


/* MSRS */



#define MSR_GLIU_P2D_RO0	0x10000029



#define MSR_LX_GLD_MSR_CONFIG	0x48002001

#define MSR_LX_MSR_PADSEL	0x48002011	/* NOT 0x48000011; the data

						 * sheet has the wrong value */

#define MSR_GLCP_SYS_RSTPLL	0x4C000014

#define MSR_GLCP_DOTPLL		0x4C000015



#define MSR_LBAR_SMB		0x5140000B

#define MSR_LBAR_GPIO		0x5140000C

#define MSR_LBAR_MFGPT		0x5140000D

#define MSR_LBAR_ACPI		0x5140000E

#define MSR_LBAR_PMS		0x5140000F



#define MSR_LX_SPARE_MSR	0x80000011	/* DC-specific */



#define MSR_GX_GLD_MSR_CONFIG	0xC0002001

#define MSR_GX_MSR_PADSEL	0xC0002011



/* Resource Sizes */



#define LBAR_GPIO_SIZE		0xFF

drivers/video/geode/display_gx.c

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#include <asm/io.h>

#include <asm/div64.h>

#include <asm/delay.h>

#include <asm/geode.h>

#include <linux/cs5535.h>



#include "gxfb.h"

drivers/video/geode/gxfb.h

+1 −1
Original line number Diff line number Diff line
@@ -340,7 +340,7 @@ static inline void write_fp(struct gxfb_par *par, int reg, uint32_t val) 
}





/* MSRs are defined in asm/geode.h; their bitfields are here */

/* MSRs are defined in linux/cs5535.h; their bitfields are here */



#define MSR_GLCP_SYS_RSTPLL_DOTPOSTDIV3	(1 << 3)

#define MSR_GLCP_SYS_RSTPLL_DOTPREMULT2	(1 << 2)

drivers/video/geode/gxfb_core.c

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
#include <linux/suspend.h>

#include <linux/init.h>

#include <linux/pci.h>

#include <asm/geode.h>

#include <linux/cs5535.h>



#include "gxfb.h"

drivers/video/geode/lxfb.h

+1 −1
Original line number Diff line number Diff line
@@ -409,7 +409,7 @@ static inline void write_fp(struct lxfb_par *par, int reg, uint32_t val) 
}





/* MSRs are defined in asm/geode.h; their bitfields are here */

/* MSRs are defined in linux/cs5535.h; their bitfields are here */



#define MSR_GLCP_DOTPLL_LOCK		(1 << 25)	/* r/o */

#define MSR_GLCP_DOTPLL_HALFPIX		(1 << 24)