update wlcompat for new ioctl interface (fixes #1357)

[openwrt.git] / target / linux / adm5120-2.6 / patches / 001-adm5120.patch

diff --git a/target/linux/adm5120-2.6/patches/001-adm5120.patch b/target/linux/adm5120-2.6/patches/001-adm5120.patch
index cc8739e..da601b9 100644 (file)
--- a/target/linux/adm5120-2.6/patches/001-adm5120.patch
+++ b/target/linux/adm5120-2.6/patches/001-adm5120.patch
@@ -1,33 +1,40 @@
-diff -urN linux-2.6.19.2/arch/mips/Kconfig linux-2.6.19.2.new/arch/mips/Kconfig
---- linux-2.6.19.2/arch/mips/Kconfig   2007-01-10 20:10:37.000000000 +0100
-+++ linux-2.6.19.2.new/arch/mips/Kconfig       2007-01-23 14:49:38.000000000 +0100
-@@ -12,6 +12,20 @@
+Index: linux-2.6.22-rc6/arch/mips/Kconfig
+===================================================================
+--- linux-2.6.22-rc6.orig/arch/mips/Kconfig
++++ linux-2.6.22-rc6/arch/mips/Kconfig
+@@ -15,6 +15,17 @@ choice
        prompt "System type"
        default SGI_IP22
-
+ 
 +config MIPS_ADM5120
 +      bool "Support for ADM5120 SoC"
 +      select SYS_HAS_CPU_MIPS32_R1
 +      select DMA_NONCOHERENT
 +      select HW_HAS_PCI
++      select IRQ_CPU
 +      select SYS_SUPPORTS_LITTLE_ENDIAN
 +      select SYS_SUPPORTS_BIG_ENDIAN
 +      select SYS_SUPPORTS_32BIT_KERNEL
 +      select GENERIC_GPIO
 +
-+config PCI_ADM5120
-+      bool "Add PCI control support for ADM5120"
-+      depends on MIPS_ADM5120 && PCI
-+
- config MIPS_MTX1
-       bool "4G Systems MTX-1 board"
-       select DMA_NONCOHERENT
-diff -urN linux-2.6.19.2/arch/mips/Makefile linux-2.6.19.2.new/arch/mips/Makefile
---- linux-2.6.19.2/arch/mips/Makefile  2007-01-23 14:02:57.000000000 +0100
-+++ linux-2.6.19.2.new/arch/mips/Makefile      2007-01-23 14:49:39.000000000 +0100
-@@ -165,6 +165,14 @@
+ config MACH_ALCHEMY
+       bool "Alchemy processor based machines"
+ 
+@@ -658,6 +669,7 @@ config TOSHIBA_RBTX4938
+ 
+ endchoice
+ 
++source "arch/mips/adm5120/Kconfig"
+ source "arch/mips/au1000/Kconfig"
+ source "arch/mips/ddb5xxx/Kconfig"
+ source "arch/mips/gt64120/ev64120/Kconfig"
+Index: linux-2.6.22-rc6/arch/mips/Makefile
+===================================================================
+--- linux-2.6.22-rc6.orig/arch/mips/Makefile
++++ linux-2.6.22-rc6/arch/mips/Makefile
+@@ -165,6 +165,14 @@ cflags-$(CONFIG_MACH_JAZZ)        += -Iinclude/
  load-$(CONFIG_MACH_JAZZ)      += 0xffffffff80080000
-
+ 
  #
 +# ADMtek 5120
 +#
@@ -40,25 +47,18 @@ diff -urN linux-2.6.19.2/arch/mips/Makefile linux-2.6.19.2.new/arch/mips/Makefil
  # Common Alchemy Au1x00 stuff
  #
  core-$(CONFIG_SOC_AU1X00)     += arch/mips/au1000/common/
-diff -urN linux-2.6.19.2/arch/mips/pci/Makefile linux-2.6.19.2.new/arch/mips/pci/Makefile
---- linux-2.6.19.2/arch/mips/pci/Makefile      2007-01-10 20:10:37.000000000 +0100
-+++ linux-2.6.19.2.new/arch/mips/pci/Makefile  2007-01-23 14:49:40.000000000 +0100
-@@ -53,3 +53,4 @@
- obj-$(CONFIG_VICTOR_MPC30X)   += fixup-mpc30x.o
- obj-$(CONFIG_ZAO_CAPCELLA)    += fixup-capcella.o
- obj-$(CONFIG_WR_PPMC)         += fixup-wrppmc.o
-+obj-$(CONFIG_PCI_ADM5120)     += ops-adm5120.o pci-adm5120.o
-diff -urN linux-2.6.19.2/include/asm-mips/bootinfo.h linux-2.6.19.2.new/include/asm-mips/bootinfo.h
---- linux-2.6.19.2/include/asm-mips/bootinfo.h 2007-01-10 20:10:37.000000000 +0100
-+++ linux-2.6.19.2.new/include/asm-mips/bootinfo.h     2007-01-23 14:49:40.000000000 +0100
-@@ -212,6 +212,42 @@
+Index: linux-2.6.22-rc6/include/asm-mips/bootinfo.h
+===================================================================
+--- linux-2.6.22-rc6.orig/include/asm-mips/bootinfo.h
++++ linux-2.6.22-rc6/include/asm-mips/bootinfo.h
+@@ -213,6 +213,57 @@
  #define MACH_GROUP_NEC_EMMA2RH 25     /* NEC EMMA2RH (was 23)         */
  #define  MACH_NEC_MARKEINS    0       /* NEC EMMA2RH Mark-eins        */
-
+ 
 +/*
 + * Valid machtype for group ADMtek ADM5120
 + */
-+#define MACH_GROUP_ADM5120    23
++#define MACH_GROUP_ADM5120    26
 +#define MACH_ADM5120_UNKNOWN  0       /* Unknown board */
 +#define MACH_ADM5120_WP54G_WRT        1       /* Compex WP54G-WRT */
 +#define MACH_ADM5120_WP54G    2       /* Compex WP54G */
@@ -90,7 +90,22 @@ diff -urN linux-2.6.19.2/include/asm-mips/bootinfo.h linux-2.6.19.2.new/include/
 +#define MACH_ADM5120_ES2108G  28      /* ZyXEL Ethernet Switch 2108-G */
 +#define MACH_ADM5120_ES2108LC 29      /* ZyXEL Ethernet Switch 2108-LC */
 +#define MACH_ADM5120_ES2108PWR        30      /* ZyXEL Ethernet Switch 2108-PWR */
++#define MACH_ADM5120_ES2024A  31      /* ZyXEL Ethernet Switch 2024A */
++#define MACH_ADM5120_ES2024PWR        32      /* ZyXEL Ethernet Switch 2024PWR */
++#define MACH_ADM5120_CAS630   33      /* Cellvision CAS-630/630W */
++#define MACH_ADM5120_CAS670   34      /* Cellvision CAS-670/670W */
++#define MACH_ADM5120_CAS700   36      /* Cellvision CAS-700/700W */
++#define MACH_ADM5120_CAS771   37      /* Cellvision CAS-771/771W */
++#define MACH_ADM5120_CAS790   38      /* Cellvision CAS-790 */
++#define MACH_ADM5120_CAS861   39      /* Cellvision CAS-861/861W */
++#define MACH_ADM5120_NFS101U  40      /* Cellvision NFS-101U/101WU */
++#define MACH_ADM5120_NFS202U  41      /* Cellvision NFS-202U/202WU */
++#define MACH_ADM5120_EASY5120 43      /* Infineon EASY 5120 */
++#define MACH_ADM5120_EASY5120RT 44    /* Infineon EASY 5120-RT */
++#define MACH_ADM5120_EASY5120PATA 45  /* Infineon EASY 5120P-ATA */
++#define MACH_ADM5120_EASY83000        46      /* Infineon EASY-83000 */
++#define MACH_ADM5120_BR6104K  47      /* Edimax BR-6104K */
 +
  #define CL_SIZE                       COMMAND_LINE_SIZE
-
+ 
  const char *get_system_type(void);