diff options
| author | Florian Fainelli <florian@openwrt.org> | 2008-10-28 18:51:51 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2008-10-28 18:51:51 +0000 |
| commit | 3ab58731a8447650da76763f0129f0e54ed5570f (patch) | |
| tree | afabc852a3c6c1d1c048b2f7680edc0caa6ae927 | |
| parent | 7fc9c0b5e47caa3005802bdc823f26f25894f45d (diff) | |
| download | upstream-3ab58731a8447650da76763f0129f0e54ed5570f.tar.gz upstream-3ab58731a8447650da76763f0129f0e54ed5570f.tar.bz2 upstream-3ab58731a8447650da76763f0129f0e54ed5570f.zip | |
Add amit boards specific fixups
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13061 3c298f89-4303-0410-b956-a3cf2f4a3e73
4 files changed, 124 insertions, 0 deletions
diff --git a/target/linux/rdc/patches-2.6.24/004-yenta_mystery.patch b/target/linux/rdc/patches-2.6.24/004-yenta_mystery.patch new file mode 100644 index 0000000000..7faabdf7a3 --- /dev/null +++ b/target/linux/rdc/patches-2.6.24/004-yenta_mystery.patch @@ -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. */ diff --git a/target/linux/rdc/patches-2.6.24/005-fix_amit_breakage.patch b/target/linux/rdc/patches-2.6.24/005-fix_amit_breakage.patch new file mode 100644 index 0000000000..eabfd04ed3 --- /dev/null +++ b/target/linux/rdc/patches-2.6.24/005-fix_amit_breakage.patch @@ -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(); + diff --git a/target/linux/rdc/patches-2.6.25/004-yenta_mystery.patch b/target/linux/rdc/patches-2.6.25/004-yenta_mystery.patch new file mode 100644 index 0000000000..7faabdf7a3 --- /dev/null +++ b/target/linux/rdc/patches-2.6.25/004-yenta_mystery.patch @@ -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. */ diff --git a/target/linux/rdc/patches-2.6.25/005-fix_amit_breakage.patch b/target/linux/rdc/patches-2.6.25/005-fix_amit_breakage.patch new file mode 100644 index 0000000000..eabfd04ed3 --- /dev/null +++ b/target/linux/rdc/patches-2.6.25/005-fix_amit_breakage.patch @@ -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(); + |