aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/rdc/patches-2.6.32/005-fix_amit_breakage.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2010-02-23 21:09:51 +0000
committerFlorian Fainelli <florian@openwrt.org>2010-02-23 21:09:51 +0000
commitb57690432c90c356d3f2d6edd3bbc565dc72a61c (patch)
tree9203a7ccef0119d0922f343766a8ac7a323b9d16 /target/linux/rdc/patches-2.6.32/005-fix_amit_breakage.patch
parent3e139467ce44c9522592aad80b8989f6a923c79c (diff)
downloadupstream-b57690432c90c356d3f2d6edd3bbc565dc72a61c.tar.gz
upstream-b57690432c90c356d3f2d6edd3bbc565dc72a61c.tar.bz2
upstream-b57690432c90c356d3f2d6edd3bbc565dc72a61c.zip
add preliminary 2.6.32 support
SVN-Revision: 19826
Diffstat (limited to 'target/linux/rdc/patches-2.6.32/005-fix_amit_breakage.patch')
-rw-r--r--target/linux/rdc/patches-2.6.32/005-fix_amit_breakage.patch40
1 files changed, 40 insertions, 0 deletions
diff --git a/target/linux/rdc/patches-2.6.32/005-fix_amit_breakage.patch b/target/linux/rdc/patches-2.6.32/005-fix_amit_breakage.patch
new file mode 100644
index 0000000000..decaf8c44f
--- /dev/null
+++ b/target/linux/rdc/patches-2.6.32/005-fix_amit_breakage.patch
@@ -0,0 +1,40 @@
+--- a/arch/x86/boot/boot.h
++++ b/arch/x86/boot/boot.h
+@@ -64,7 +64,7 @@ static inline void outl(u32 v, u16 port)
+ {
+ asm volatile("outl %0,%1" : : "a" (v), "dN" (port));
+ }
+-static inline u32 inl(u32 port)
++static inline u32 inl(u16 port)
+ {
+ u32 v;
+ asm volatile("inl %1,%0" : "=a" (v) : "dN" (port));
+--- a/arch/x86/boot/pm.c
++++ b/arch/x86/boot/pm.c
+@@ -14,6 +14,9 @@
+
+ #include "boot.h"
+ #include <asm/segment.h>
++#ifdef CONFIG_X86_RDC321X
++#include <asm/rdc321x_defs.h>
++#endif
+
+ /*
+ * Invoke the realmode switch hook if present; otherwise
+@@ -112,6 +115,16 @@ void go_to_protected_mode(void)
+ die();
+ }
+
++#ifdef CONFIG_X86_RDC321X
++ {
++ u32 bootctl;
++
++ outl(0x80003840, RDC3210_CFGREG_ADDR);
++ bootctl = inl(RDC3210_CFGREG_DATA) | 0x07ff0000;
++ outl(bootctl, RDC3210_CFGREG_DATA);
++ }
++#endif
++
+ /* Reset coprocessor (IGNNE#) */
+ reset_coprocessor();
+