The patch titled
cs5535: define lxfb/gxfb MSRs in linux/cs5535.h
has been added to the -mm tree. Its filename is
cs5535-define-lxfb-gxfb-msrs-in-linux-cs5535h.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: cs5535: define lxfb/gxfb MSRs in linux/cs5535.h
From: Andres Salomon <dilinger@xxxxxxxxxxxxxxx>
..and include them in the lxfb/gxfb drivers rather than asm/geode.h (where
possible).
Signed-off-by: Andres Salomon <dilinger@xxxxxxxxxxxxxxx>
Cc: Jordan Crouse <jordan@xxxxxxxxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: john stultz <johnstul@xxxxxxxxxx>
Cc: Chris Ball <cjb@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
diff -puN arch/x86/include/asm/geode.h~cs5535-define-lxfb-gxfb-msrs-in-linux-cs5535h arch/x86/include/asm/geode.h
--- a/arch/x86/include/asm/geode.h~cs5535-define-lxfb-gxfb-msrs-in-linux-cs5535h
+++ a/arch/x86/include/asm/geode.h
@@ -31,25 +31,12 @@ extern int geode_get_dev_base(unsigned i
/* 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
diff -puN drivers/video/geode/display_gx.c~cs5535-define-lxfb-gxfb-msrs-in-linux-cs5535h drivers/video/geode/display_gx.c
--- a/drivers/video/geode/display_gx.c~cs5535-define-lxfb-gxfb-msrs-in-linux-cs5535h
+++ a/drivers/video/geode/display_gx.c
@@ -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"
diff -puN drivers/video/geode/gxfb.h~cs5535-define-lxfb-gxfb-msrs-in-linux-cs5535h drivers/video/geode/gxfb.h
--- a/drivers/video/geode/gxfb.h~cs5535-define-lxfb-gxfb-msrs-in-linux-cs5535h
+++ a/drivers/video/geode/gxfb.h
@@ -340,7 +340,7 @@ static inline void write_fp(struct gxfb_
}
-/* 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)
diff -puN drivers/video/geode/gxfb_core.c~cs5535-define-lxfb-gxfb-msrs-in-linux-cs5535h drivers/video/geode/gxfb_core.c
--- a/drivers/video/geode/gxfb_core.c~cs5535-define-lxfb-gxfb-msrs-in-linux-cs5535h
+++ a/drivers/video/geode/gxfb_core.c
@@ -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"
diff -puN drivers/video/geode/lxfb.h~cs5535-define-lxfb-gxfb-msrs-in-linux-cs5535h drivers/video/geode/lxfb.h
--- a/drivers/video/geode/lxfb.h~cs5535-define-lxfb-gxfb-msrs-in-linux-cs5535h
+++ a/drivers/video/geode/lxfb.h
@@ -409,7 +409,7 @@ static inline void write_fp(struct lxfb_
}
-/* 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)
diff -puN drivers/video/geode/lxfb_ops.c~cs5535-define-lxfb-gxfb-msrs-in-linux-cs5535h drivers/video/geode/lxfb_ops.c
--- a/drivers/video/geode/lxfb_ops.c~cs5535-define-lxfb-gxfb-msrs-in-linux-cs5535h
+++ a/drivers/video/geode/lxfb_ops.c
@@ -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"
diff -puN drivers/video/geode/suspend_gx.c~cs5535-define-lxfb-gxfb-msrs-in-linux-cs5535h drivers/video/geode/suspend_gx.c
--- a/drivers/video/geode/suspend_gx.c~cs5535-define-lxfb-gxfb-msrs-in-linux-cs5535h
+++ a/drivers/video/geode/suspend_gx.c
@@ -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"
diff -puN drivers/video/geode/video_gx.c~cs5535-define-lxfb-gxfb-msrs-in-linux-cs5535h drivers/video/geode/video_gx.c
--- a/drivers/video/geode/video_gx.c~cs5535-define-lxfb-gxfb-msrs-in-linux-cs5535h
+++ a/drivers/video/geode/video_gx.c
@@ -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"
diff -puN include/linux/cs5535.h~cs5535-define-lxfb-gxfb-msrs-in-linux-cs5535h include/linux/cs5535.h
--- a/include/linux/cs5535.h~cs5535-define-lxfb-gxfb-msrs-in-linux-cs5535h
+++ a/include/linux/cs5535.h
@@ -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
_
Patches currently in -mm which might be from dilinger@xxxxxxxxxxxxxxx are
linux-next.patch
drm-kill-some-unused-drm_proc-macros-from-drmph.patch
drm-kill-more-unused-drm-macros.patch
drm-replace-drm_copy-macro-w-a-function.patch
drm-check-return-values-in-drm_version.patch
cs5535-gpio-add-amd-cs5535-cs5536-gpio-driver-support.patch
cs5535-gpio-request-function-mask-names-added.patch
alsa-cs5535audio-free-olpc-quirks-from-reliance-on-mgeode_lx-cpu-optimization.patch
cs5535-add-a-generic-mfgpt-driver.patch
cs5535-add-a-generic-clock-event-mfgpt-driver.patch
cs5535-move-the-divil-msr-definition-into-linux-cs5535h.patch
cs5535-move-vsa2-checks-into-linux-cs5535h.patch
cs5535-define-lxfb-gxfb-msrs-in-linux-cs5535h.patch
cs5535-drop-the-geode-specific-mfgpt-gpio-code.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
