backport acx100 2.6.24 fixes from SVN

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

diff --git a/target/linux/adm5120/patches-2.6.23/001-adm5120.patch b/target/linux/adm5120/patches-2.6.23/001-adm5120.patch
index b197b3f..5cf66ec 100644 (file)
--- a/target/linux/adm5120/patches-2.6.23/001-adm5120.patch
+++ b/target/linux/adm5120/patches-2.6.23/001-adm5120.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.23/arch/mips/Kconfig
+Index: linux-2.6.23.14/arch/mips/Kconfig

 ===================================================================
 ===================================================================

---- linux-2.6.23.orig/arch/mips/Kconfig
-+++ linux-2.6.23/arch/mips/Kconfig
+--- linux-2.6.23.14.orig/arch/mips/Kconfig
++++ linux-2.6.23.14/arch/mips/Kconfig

 @@ -15,6 +15,18 @@ choice
        prompt "System type"
        default SGI_IP22
 @@ -15,6 +15,18 @@ choice
        prompt "System type"
        default SGI_IP22


@@ -29,10 +29,10 @@ Index: linux-2.6.23/arch/mips/Kconfig
  source "arch/mips/au1000/Kconfig"
  source "arch/mips/jazz/Kconfig"
  source "arch/mips/pmc-sierra/Kconfig"
  source "arch/mips/au1000/Kconfig"
  source "arch/mips/jazz/Kconfig"
  source "arch/mips/pmc-sierra/Kconfig"

-Index: linux-2.6.23/arch/mips/Makefile
+Index: linux-2.6.23.14/arch/mips/Makefile

 ===================================================================
 ===================================================================

---- linux-2.6.23.orig/arch/mips/Makefile
-+++ linux-2.6.23/arch/mips/Makefile
+--- linux-2.6.23.14.orig/arch/mips/Makefile
++++ linux-2.6.23.14/arch/mips/Makefile

 @@ -168,6 +168,16 @@ cflags-$(CONFIG_MACH_JAZZ)        += -Iinclude/
  load-$(CONFIG_MACH_JAZZ)      += 0xffffffff80080000
  
 @@ -168,6 +168,16 @@ cflags-$(CONFIG_MACH_JAZZ)        += -Iinclude/
  load-$(CONFIG_MACH_JAZZ)      += 0xffffffff80080000
  


@@ -50,10 +50,10 @@ Index: linux-2.6.23/arch/mips/Makefile
  # Common Alchemy Au1x00 stuff
  #
  core-$(CONFIG_SOC_AU1X00)     += arch/mips/au1000/common/
  # Common Alchemy Au1x00 stuff
  #
  core-$(CONFIG_SOC_AU1X00)     += arch/mips/au1000/common/

-Index: linux-2.6.23/include/asm-mips/bootinfo.h
+Index: linux-2.6.23.14/include/asm-mips/bootinfo.h

 ===================================================================
 ===================================================================

---- linux-2.6.23.orig/include/asm-mips/bootinfo.h
-+++ linux-2.6.23/include/asm-mips/bootinfo.h
+--- linux-2.6.23.14.orig/include/asm-mips/bootinfo.h
++++ linux-2.6.23.14/include/asm-mips/bootinfo.h

 @@ -208,6 +208,58 @@
  #define MACH_GROUP_WINDRIVER   28     /* Windriver boards */
  #define MACH_WRPPMC             1
 @@ -208,6 +208,58 @@
  #define MACH_GROUP_WINDRIVER   28     /* Windriver boards */
  #define MACH_WRPPMC             1


@@ -61,7 +61,6 @@ Index: linux-2.6.23/include/asm-mips/bootinfo.h
 +/*
 + * Valid machtype for group ADMtek ADM5120
 + */
 +/*
 + * Valid machtype for group ADMtek ADM5120
 + */

-+#define MACH_GROUP_ADM5120    26

 +#define MACH_ADM5120_GENERIC  0       /* Generic board */
 +#define MACH_ADM5120_WP54G_WRT        1       /* Compex WP54G-WRT */
 +#define MACH_ADM5120_WP54G    2       /* Compex WP54G */
 +#define MACH_ADM5120_GENERIC  0       /* Generic board */
 +#define MACH_ADM5120_WP54G_WRT        1       /* Compex WP54G-WRT */
 +#define MACH_ADM5120_WP54G    2       /* Compex WP54G */


@@ -107,8 +106,9 @@ Index: linux-2.6.23/include/asm-mips/bootinfo.h
 +#define MACH_ADM5120_EASY5120RT 43    /* Infineon EASY 5120-RT */
 +#define MACH_ADM5120_EASY5120WVOIP 44 /* Infineon EASY 5120-WVoIP */
 +#define MACH_ADM5120_EASY83000        45      /* Infineon EASY-83000 */
 +#define MACH_ADM5120_EASY5120RT 43    /* Infineon EASY 5120-RT */
 +#define MACH_ADM5120_EASY5120WVOIP 44 /* Infineon EASY 5120-WVoIP */
 +#define MACH_ADM5120_EASY83000        45      /* Infineon EASY-83000 */

-+#define MACH_ADM5120_BR6104K  46      /* Edimax BR-6104K */
++#define MACH_ADM5120_BR6104K  46      /* Edimax BR-6104K/BR-6104KP */

 +#define MACH_ADM5120_RB_192   47      /* Mikrotik RouterBOARD 192 */
 +#define MACH_ADM5120_RB_192   47      /* Mikrotik RouterBOARD 192 */

++#define MACH_ADM5120_BR61x4WG 48      /* Edimax BR-6104Wg/BR-6114WG */

 +
  #define CL_SIZE                       COMMAND_LINE_SIZE
  
 +
  #define CL_SIZE                       COMMAND_LINE_SIZE