[kernel] refresh generic 2.6.23 patches

[openwrt.git] / target / linux / rdc / patches / 004-rdc_fixes.patch

diff --git a/target/linux/rdc/patches/004-rdc_fixes.patch b/target/linux/rdc/patches/004-rdc_fixes.patch
index 7b87773..47f8c08 100644 (file)
--- a/target/linux/rdc/patches/004-rdc_fixes.patch
+++ b/target/linux/rdc/patches/004-rdc_fixes.patch
@@ -1,73 +1,77 @@
-diff -urN linux-2.6.19/arch/i386/Kconfig linux-2.6.19.new/arch/i386/Kconfig
---- linux-2.6.19/arch/i386/Kconfig     2006-11-29 22:57:37.000000000 +0100
-+++ linux-2.6.19.new/arch/i386/Kconfig 2006-12-17 17:13:33.000000000 +0100
-@@ -180,6 +180,16 @@
-         Only choose this option if you have such a system, otherwise you
-         should say N here.
+diff -urN linux-2.6.24/arch/x86/Kconfig linux-2.6.24.new/arch/x86/Kconfig
+--- linux-2.6.24/arch/x86/Kconfig      2008-01-24 23:58:37.000000000 +0100
++++ linux-2.6.24.new/arch/x86/Kconfig  2008-02-11 18:24:27.000000000 +0100
+@@ -300,6 +300,17 @@
+         supposed to run on these EM64T-based machines.  Only choose this option
+         if you have one of these machines.

  
 +config X86_RDC
 +      bool "Support for RDC 3211 boards"
 +      select GENERIC_GPIO
 +      select LEDS_GPIO
  
 +config X86_RDC
 +      bool "Support for RDC 3211 boards"
 +      select GENERIC_GPIO
 +      select LEDS_GPIO

++      select LEDS_CLASS

 +      help
 +      help

-+        Support for RDC 3211 systems. Say 'Y' here if the kernel is 
-+        supposed to run on an IA-32 RDC R3211 system.
-+        Only choose this option if you have such as system, otherwise you
-+        should say N here.
++          Support for RDC 3211 systems. Say 'Y' here if the kernel is
++          supposed to run on an IA-32 RDC R3211 system.
++          Only choose this option if you have such as system, otherwise you
++          should say N here.

 +
  endchoice
  
 +
  endchoice
  

- config ACPI_SRAT
-diff -urN linux-2.6.19/arch/i386/Makefile linux-2.6.19.new/arch/i386/Makefile
---- linux-2.6.19/arch/i386/Makefile    2006-11-29 22:57:37.000000000 +0100
-+++ linux-2.6.19.new/arch/i386/Makefile        2006-12-17 17:13:33.000000000 +0100
-@@ -92,6 +92,10 @@
- mflags-$(CONFIG_X86_ES7000)   := -Iinclude/asm-i386/mach-es7000
- mcore-$(CONFIG_X86_ES7000)    := mach-default
- core-$(CONFIG_X86_ES7000)     := arch/i386/mach-es7000/
-+# RDC subarch support
-+mflags-$(CONFIG_X86_RDC)      := -Iinclude/asm-i386/mach-rdc
-+mcore-$(CONFIG_X86_RDC)               := mach-default
-+core-$(CONFIG_X86_RDC)                += arch/i386/mach-rdc/
- 
- # default subarch .h files
- mflags-y += -Iinclude/asm-i386/mach-default
---- timex.h    2007-08-07 10:44:03.816112250 -0700
-+++ linux/include/asm-i386/timex.h     2007-08-07 10:48:47.905866750 -0700
-@@ -11,6 +11,8 @@
+ config SCHED_NO_NO_OMIT_FRAME_POINTER
+diff -urN linux-2.6.24/arch/x86/kernel/reboot_fixups_32.c linux-2.6.24.new/arch/x86/kernel/reboot_fixups_32.c
+--- linux-2.6.24/arch/x86/kernel/reboot_fixups_32.c    2008-01-24 23:58:37.000000000 +0100
++++ linux-2.6.24.new/arch/x86/kernel/reboot_fixups_32.c        2008-02-11 18:26:18.000000000 +0100
+@@ -30,6 +30,17 @@
+       udelay(50); /* shouldn't get here but be safe and spin a while */
+ }

  
  

- #ifdef CONFIG_X86_ELAN
- #  define CLOCK_TICK_RATE 1189200 /* AMD Elan has different frequency! */
-+#elif defined(CONFIG_X86_RDC)
-+#  define CLOCK_TICK_RATE 1041667 /* Underlying HZ for R8610 */
- #else
- #  define CLOCK_TICK_RATE 1193182 /* Underlying HZ */
- #endif
---- reboot_fixups.c    2007-08-07 12:02:00.908412250 -0700
-+++ linux/arch/i386/kernel/reboot_fixups.c     2007-08-07 12:18:49.391438500 -0700
-@@ -13,6 +13,17 @@
- #include <linux/pci.h>
- #include <asm/reboot_fixups.h>
- #include <asm/msr.h>
-+

 +static void r8610_reset(struct pci_dev *dev)
 +{
 +static void r8610_reset(struct pci_dev *dev)
 +{

-+      int i;
++       int i;

 +
 +

-+      outl(0x80003840,0xCF8);
-+      i=inl(0xCFC);
-+      i |= 0x1600;
-+      outl(i,0xCFC);
-+      outb(1,0x92);
++       outl(0x80003840,0xCF8);
++       i=inl(0xCFC);
++       i |= 0x1600;
++       outl(i,0xCFC);
++       outb(1,0x92);

 +}
 +}

- 
- static void cs5530a_warm_reset(struct pci_dev *dev)
- {
-@@ -40,6 +53,7 @@
- };
- 
- static struct device_fixup fixups_table[] = {
-+{ PCI_VENDOR_ID_RDC, PCI_DEVICE_ID_RDC_R6030, r8610_reset },
++
+ struct device_fixup {
+       unsigned int vendor;
+       unsigned int device;
+@@ -40,6 +51,7 @@

  { PCI_VENDOR_ID_CYRIX, PCI_DEVICE_ID_CYRIX_5530_LEGACY, cs5530a_warm_reset },
  { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_ISA, cs5536_warm_reset },
  { PCI_VENDOR_ID_CYRIX, PCI_DEVICE_ID_CYRIX_5530_LEGACY, cs5530a_warm_reset },
  { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_ISA, cs5536_warm_reset },

+ { PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_SC1100_BRIDGE, cs5530a_warm_reset },
++{ PCI_VENDOR_ID_RDC, PCI_DEVICE_ID_RDC_R6030, r8610_reset },

  };
  };

+ 
+ /*
+diff -urN linux-2.6.24/arch/x86/Makefile_32 linux-2.6.24.new/arch/x86/Makefile_32
+--- linux-2.6.24/arch/x86/Makefile_32  2008-01-24 23:58:37.000000000 +0100
++++ linux-2.6.24.new/arch/x86/Makefile_32      2008-02-11 18:25:12.000000000 +0100
+@@ -99,6 +99,11 @@
+ mcore-$(CONFIG_X86_ES7000)    := arch/x86/mach-default
+ core-$(CONFIG_X86_ES7000)     := arch/x86/mach-es7000/
+ 
++# RDC subarch support
++mflags-$(CONFIG_X86_RDC)       := -Iinclude/asm-x86/mach-rdc
++mcore-$(CONFIG_X86_RDC)        := arch/x86/mach-default
++core-$(CONFIG_X86_RDC)         += arch/x86/mach-rdc/
++
+ # Xen paravirtualization support
+ core-$(CONFIG_XEN)            += arch/x86/xen/
+ 
+diff -urN linux-2.6.24/include/asm-x86/timex.h linux-2.6.24.new/include/asm-x86/timex.h
+--- linux-2.6.24/include/asm-x86/timex.h       2008-01-24 23:58:37.000000000 +0100
++++ linux-2.6.24.new/include/asm-x86/timex.h   2008-02-11 18:25:43.000000000 +0100
+@@ -7,6 +7,8 @@
+ 
+ #ifdef CONFIG_X86_ELAN
+ #  define PIT_TICK_RATE 1189200 /* AMD Elan has different frequency! */
++#elif defined(CONFIG_X86_RDC)
++#  define PIT_TICK_RATE 1041667 /* Underlying HZ for R8610 */
+ #else
+ #  define PIT_TICK_RATE 1193182 /* Underlying HZ */
+ #endif