CS5535: define lxfb/gxfb MSRs in linux/cs5535.h
Subsystems (3)
PATCH 5/6 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 Andres Salomon <[email protected]>
--- arch/x86/include/asm/geode.h | 13 ------------- drivers/video/geode/display_gx.c | 2 +- drivers/video/geode/gxfb.h | 2 +- drivers/video/geode/gxfb_core.c | 2 +- drivers/video/geode/lxfb.h | 2 +- drivers/video/geode/lxfb_ops.c | 2 +- drivers/video/geode/suspend_gx.c | 2 +- drivers/video/geode/video_gx.c | 2 +- include/linux/cs5535.h | 13 +++++++++++++ 9 files changed, 20 insertions(+), 20 deletions(-)
arch/x86/include/asm/geode.h +0 -13
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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)
drivers/video/geode/lxfb_ops.c +1 -1
@@ -13,7 +13,7 @@#include <linux/fb.h> #include <linux/uaccess.h> #include <linux/delay.h> -#include <asm/geode.h> +#include <linux/cs5535.h> #include "lxfb.h"
drivers/video/geode/suspend_gx.c +1 -1
@@ -10,7 +10,7 @@#include <linux/fb.h> #include <asm/io.h> #include <asm/msr.h> -#include <asm/geode.h> +#include <linux/cs5535.h> #include <asm/delay.h> #include "gxfb.h"
drivers/video/geode/video_gx.c +1 -1
@@ -16,7 +16,7 @@#include <asm/io.h> #include <asm/delay.h> #include <asm/msr.h> -#include <asm/geode.h> +#include <linux/cs5535.h> #include "gxfb.h"
include/linux/cs5535.h +13 -0
@@ -12,6 +12,14 @@#define _CS5535_H/* 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
@@ -30,6 +38,11 @@#define MSR_MFGPT_NR 0x51400029#define MSR_MFGPT_SETUP 0x5140002B +#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#define LBAR_MFGPT_SIZE 0x40
Signature · 1 line
1.5.6.5