parent
d1b986bd54
commit
8128c624bc
@ -0,0 +1,20 @@ |
||||
--- linux-2.6.24.7.orig/drivers/pcmcia/yenta_socket.c 2008-10-26 08:30:07.000000000 -0700
|
||||
+++ linux-2.6.24.7/drivers/pcmcia/yenta_socket.c 2008-10-26 08:54:27.000000000 -0700
|
||||
@@ -1171,6 +1171,17 @@
|
||||
|
||||
/* We must finish initialization here */
|
||||
|
||||
+#ifdef CONFIG_X86_RDC
|
||||
+/* #define YO_TI1510_DATASHEET_GUY_EXPLAIN_THIS_JUNK 0x0044f044 */
|
||||
+#define YO_TI1510_DATASHEET_GUY_EXPLAIN_THIS_JUNK 0x0844b060
|
||||
+/* #define YO_TI1510_DATASHEET_GUY_EXPLAIN_THIS_JUNK 0x0044d044 */
|
||||
+
|
||||
+ config_writel(socket, 32*4, YO_TI1510_DATASHEET_GUY_EXPLAIN_THIS_JUNK);
|
||||
+ config_writel(socket, 35*4, 0x00000022);
|
||||
+ config_writel(socket, 36*4, 0x60200000);
|
||||
+ config_writel(socket, 40*4, 0x7e020000);
|
||||
+#endif
|
||||
+
|
||||
if (!socket->cb_irq || request_irq(socket->cb_irq, yenta_interrupt, IRQF_SHARED, "yenta", socket)) {
|
||||
/* No IRQ or request_irq failed. Poll */
|
||||
socket->cb_irq = 0; /* But zero is a valid IRQ number. */
|
@ -0,0 +1,42 @@ |
||||
diff -ru linux-2.6.24.7.orig/arch/x86/boot/boot.h linux-2.6.24.7/arch/x86/boot/boot.h
|
||||
--- linux-2.6.24.7.orig/arch/x86/boot/boot.h 2008-10-26 20:18:14.000000000 -0700
|
||||
+++ linux-2.6.24.7/arch/x86/boot/boot.h 2008-10-26 20:18:36.000000000 -0700
|
||||
@@ -60,7 +60,7 @@
|
||||
{
|
||||
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));
|
||||
diff -ru linux-2.6.24.7.orig/arch/x86/boot/pm.c linux-2.6.24.7/arch/x86/boot/pm.c
|
||||
--- linux-2.6.24.7.orig/arch/x86/boot/pm.c 2008-10-26 19:55:50.000000000 -0700
|
||||
+++ linux-2.6.24.7/arch/x86/boot/pm.c 2008-10-26 21:38:12.000000000 -0700
|
||||
@@ -16,6 +16,9 @@
|
||||
|
||||
#include "boot.h"
|
||||
#include <asm/segment.h>
|
||||
+#ifdef CONFIG_X86_RDC
|
||||
+#include <asm/mach-rdc/rdc321x_defs.h>
|
||||
+#endif
|
||||
|
||||
/*
|
||||
* Invoke the realmode switch hook if present; otherwise
|
||||
@@ -160,6 +163,16 @@
|
||||
die();
|
||||
}
|
||||
|
||||
+#ifdef CONFIG_X86_RDC
|
||||
+ {
|
||||
+ u32 bootctl;
|
||||
+
|
||||
+ outl(0x80003840, RDC3210_CFGREG_ADDR);
|
||||
+ bootctl = inl(RDC3210_CFGREG_DATA) | 0x07ff0000;
|
||||
+ outl(bootctl, RDC3210_CFGREG_DATA);
|
||||
+ }
|
||||
+#endif
|
||||
+
|
||||
/* Reset coprocessor (IGNNE#) */
|
||||
reset_coprocessor();
|
||||
|
@ -0,0 +1,20 @@ |
||||
--- linux-2.6.24.7.orig/drivers/pcmcia/yenta_socket.c 2008-10-26 08:30:07.000000000 -0700
|
||||
+++ linux-2.6.24.7/drivers/pcmcia/yenta_socket.c 2008-10-26 08:54:27.000000000 -0700
|
||||
@@ -1171,6 +1171,17 @@
|
||||
|
||||
/* We must finish initialization here */
|
||||
|
||||
+#ifdef CONFIG_X86_RDC
|
||||
+/* #define YO_TI1510_DATASHEET_GUY_EXPLAIN_THIS_JUNK 0x0044f044 */
|
||||
+#define YO_TI1510_DATASHEET_GUY_EXPLAIN_THIS_JUNK 0x0844b060
|
||||
+/* #define YO_TI1510_DATASHEET_GUY_EXPLAIN_THIS_JUNK 0x0044d044 */
|
||||
+
|
||||
+ config_writel(socket, 32*4, YO_TI1510_DATASHEET_GUY_EXPLAIN_THIS_JUNK);
|
||||
+ config_writel(socket, 35*4, 0x00000022);
|
||||
+ config_writel(socket, 36*4, 0x60200000);
|
||||
+ config_writel(socket, 40*4, 0x7e020000);
|
||||
+#endif
|
||||
+
|
||||
if (!socket->cb_irq || request_irq(socket->cb_irq, yenta_interrupt, IRQF_SHARED, "yenta", socket)) {
|
||||
/* No IRQ or request_irq failed. Poll */
|
||||
socket->cb_irq = 0; /* But zero is a valid IRQ number. */
|
@ -0,0 +1,42 @@ |
||||
diff -ru linux-2.6.24.7.orig/arch/x86/boot/boot.h linux-2.6.24.7/arch/x86/boot/boot.h
|
||||
--- linux-2.6.24.7.orig/arch/x86/boot/boot.h 2008-10-26 20:18:14.000000000 -0700
|
||||
+++ linux-2.6.24.7/arch/x86/boot/boot.h 2008-10-26 20:18:36.000000000 -0700
|
||||
@@ -60,7 +60,7 @@
|
||||
{
|
||||
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));
|
||||
diff -ru linux-2.6.24.7.orig/arch/x86/boot/pm.c linux-2.6.24.7/arch/x86/boot/pm.c
|
||||
--- linux-2.6.24.7.orig/arch/x86/boot/pm.c 2008-10-26 19:55:50.000000000 -0700
|
||||
+++ linux-2.6.24.7/arch/x86/boot/pm.c 2008-10-26 21:38:12.000000000 -0700
|
||||
@@ -16,6 +16,9 @@
|
||||
|
||||
#include "boot.h"
|
||||
#include <asm/segment.h>
|
||||
+#ifdef CONFIG_X86_RDC
|
||||
+#include <asm/mach-rdc/rdc321x_defs.h>
|
||||
+#endif
|
||||
|
||||
/*
|
||||
* Invoke the realmode switch hook if present; otherwise
|
||||
@@ -160,6 +163,16 @@
|
||||
die();
|
||||
}
|
||||
|
||||
+#ifdef CONFIG_X86_RDC
|
||||
+ {
|
||||
+ u32 bootctl;
|
||||
+
|
||||
+ outl(0x80003840, RDC3210_CFGREG_ADDR);
|
||||
+ bootctl = inl(RDC3210_CFGREG_DATA) | 0x07ff0000;
|
||||
+ outl(bootctl, RDC3210_CFGREG_DATA);
|
||||
+ }
|
||||
+#endif
|
||||
+
|
||||
/* Reset coprocessor (IGNNE#) */
|
||||
reset_coprocessor();
|
||||
|
Loading…
Reference in new issue