Refresh patches with quilt, thanks Gabor !

[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 925ef3c..8cc6067 100644 (file)
--- a/target/linux/adm5120-2.6/patches/001-adm5120.patch
+++ b/target/linux/adm5120-2.6/patches/001-adm5120.patch
@@ -1,18 +1,21 @@
-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,19 @@
+Index: linux-2.6.21.1/arch/mips/Kconfig
+===================================================================
+--- linux-2.6.21.1.orig/arch/mips/Kconfig
++++ linux-2.6.21.1/arch/mips/Kconfig
+@@ -16,6 +16,21 @@ 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"
@@ -21,12 +24,13 @@ diff -urN linux-2.6.19.2/arch/mips/Kconfig linux-2.6.19.2.new/arch/mips/Kconfig
  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 @@
+Index: linux-2.6.21.1/arch/mips/Makefile
+===================================================================
+--- linux-2.6.21.1.orig/arch/mips/Makefile
++++ linux-2.6.21.1/arch/mips/Makefile
+@@ -165,6 +165,14 @@ cflags-$(CONFIG_MACH_JAZZ)        += -Iinclude/
  load-$(CONFIG_MACH_JAZZ)      += 0xffffffff80080000
-
+ 
  #
 +# ADMtek 5120
 +#
@@ -39,21 +43,14 @@ 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,37 @@
+Index: linux-2.6.21.1/include/asm-mips/bootinfo.h
+===================================================================
+--- linux-2.6.21.1.orig/include/asm-mips/bootinfo.h
++++ linux-2.6.21.1/include/asm-mips/bootinfo.h
+@@ -213,6 +213,42 @@
  #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
 + */
@@ -77,14 +74,19 @@ diff -urN linux-2.6.19.2/include/asm-mips/bootinfo.h linux-2.6.19.2.new/include/
 +#define MACH_ADM5120_HS100    16      /* ZyXEL HomeSafe 100/100W */
 +#define MACH_ADM5120_P334     17      /* ZyXEL Prestige 334 */
 +#define MACH_ADM5120_P334U    18      /* ZyXEL Prestige 334U */
-+#define MACH_ADM5120_P334W    18      /* ZyXEL Prestige 334W */
-+#define MACH_ADM5120_P334WH   19      /* ZyXEL Prestige 334WH */
-+#define MACH_ADM5120_P334WHD  20      /* ZyXEL Prestige 334WHD */
-+#define MACH_ADM5120_P334WT   21      /* ZyXEL Prestige 334WT */
-+#define MACH_ADM5120_P335     22      /* ZyXEL Prestige 335/335WT */
-+#define MACH_ADM5120_P335PLUS 23      /* ZyXEL Prestige 335Plus */
-+#define MACH_ADM5120_P335U    24      /* ZyXEL Prestige 335U */
++#define MACH_ADM5120_P334W    19      /* ZyXEL Prestige 334W */
++#define MACH_ADM5120_P334WH   20      /* ZyXEL Prestige 334WH */
++#define MACH_ADM5120_P334WHD  21      /* ZyXEL Prestige 334WHD */
++#define MACH_ADM5120_P334WT   22      /* ZyXEL Prestige 334WT */
++#define MACH_ADM5120_P335     23      /* ZyXEL Prestige 335/335WT */
++#define MACH_ADM5120_P335PLUS 24      /* ZyXEL Prestige 335Plus */
++#define MACH_ADM5120_P335U    25      /* ZyXEL Prestige 335U */
++#define MACH_ADM5120_ES2108   26      /* ZyXEL Ethernet Switch 2108 */
++#define MACH_ADM5120_ES2108F  27      /* ZyXEL Ethernet Switch 2108-F */
++#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 CL_SIZE                       COMMAND_LINE_SIZE
-
+ 
  const char *get_system_type(void);