diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2008-08-07 13:50:02 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2008-08-07 13:50:02 +0000 |
| commit | db4d23b4577ebf718406129a59c87beb20594c68 (patch) | |
| tree | a5ba9b630f965637a010cee2088af4d57efc7f29 /target/linux/adm5120/patches-2.6.26 | |
| parent | 34a16898a1874c3e319a145477b15e1a244efa55 (diff) | |
| download | upstream-db4d23b4577ebf718406129a59c87beb20594c68.tar.gz upstream-db4d23b4577ebf718406129a59c87beb20594c68.tar.bz2 upstream-db4d23b4577ebf718406129a59c87beb20594c68.zip | |
add 2.6.26 specific files
SVN-Revision: 12239
Diffstat (limited to 'target/linux/adm5120/patches-2.6.26')
10 files changed, 75 insertions, 110 deletions
diff --git a/target/linux/adm5120/patches-2.6.26/001-adm5120.patch b/target/linux/adm5120/patches-2.6.26/001-adm5120.patch index 537c2f551f..334362c21a 100644 --- a/target/linux/adm5120/patches-2.6.26/001-adm5120.patch +++ b/target/linux/adm5120/patches-2.6.26/001-adm5120.patch @@ -1,17 +1,16 @@ --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -18,6 +18,21 @@ +@@ -18,6 +18,20 @@ prompt "System type" default SGI_IP22 -+config MIPS_ADM5120 -+ bool "ADM5120 SoC based machines" ++config ADM5120 ++ bool "Infineon/ADMtek ADM5120 SoC based machines" + select CEVT_R4K + select CSRC_R4K + select SYS_HAS_CPU_MIPS32_R1 + select SYS_HAS_EARLY_PRINTK + select DMA_NONCOHERENT -+ select HW_HAS_PCI + select IRQ_CPU + select SYS_SUPPORTS_LITTLE_ENDIAN + select SYS_SUPPORTS_BIG_ENDIAN @@ -22,7 +21,7 @@ config MACH_ALCHEMY bool "Alchemy processor based machines" -@@ -687,6 +702,7 @@ +@@ -687,6 +701,7 @@ endchoice @@ -32,18 +31,22 @@ source "arch/mips/jazz/Kconfig" --- a/arch/mips/Makefile +++ b/arch/mips/Makefile -@@ -174,6 +174,16 @@ +@@ -174,6 +174,20 @@ load-$(CONFIG_MACH_JAZZ) += 0xffffffff80080000 # -+# ADMtek 5120 ++# Infineon/ADMtek ADM5120 +# -+ -+libs-$(CONFIG_MIPS_ADM5120) += arch/mips/adm5120/prom/ -+core-$(CONFIG_MIPS_ADM5120) += arch/mips/adm5120/ -+core-$(CONFIG_MIPS_ADM5120) += arch/mips/adm5120/boards/ -+cflags-$(CONFIG_MIPS_ADM5120) += -Iinclude/asm-mips/mach-adm5120 -+load-$(CONFIG_MIPS_ADM5120) += 0xffffffff80001000 ++libs-$(CONFIG_ADM5120) += arch/mips/adm5120/prom/ ++core-$(CONFIG_ADM5120) += arch/mips/adm5120/common/ ++core-$(CONFIG_ADM5120_OEM_CELLVISION) += arch/mips/adm5120/cellvision/ ++core-$(CONFIG_ADM5120_OEM_COMPEX) += arch/mips/adm5120/compex/ ++core-$(CONFIG_ADM5120_OEM_EDIMAX) += arch/mips/adm5120/edimax/ ++core-$(CONFIG_ADM5120_OEM_INFINEON) += arch/mips/adm5120/infineon/ ++core-$(CONFIG_ADM5120_OEM_MIKROTIK) += arch/mips/adm5120/mikrotik/ ++core-$(CONFIG_ADM5120_OEM_ZYXEL) += arch/mips/adm5120/zyxel/ ++cflags-$(CONFIG_ADM5120) += -Iinclude/asm-mips/mach-adm5120 ++load-$(CONFIG_ADM5120) += 0xffffffff80001000 + +# # Common Alchemy Au1x00 stuff @@ -51,61 +54,57 @@ core-$(CONFIG_SOC_AU1X00) += arch/mips/au1000/common/ --- a/include/asm-mips/bootinfo.h +++ b/include/asm-mips/bootinfo.h -@@ -94,6 +94,58 @@ +@@ -94,6 +94,54 @@ #define MACH_MSP7120_FPGA 5 /* PMC-Sierra MSP7120 Emulation */ #define MACH_MSP_OTHER 255 /* PMC-Sierra unknown board type */ +/* -+ * Valid machtype for group ADMtek ADM5120 ++ * Valid machtype for group ADM5120 + */ +#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_WP54AG 3 /* Compex WP54AG */ -+#define MACH_ADM5120_WPP54G 4 /* Compex WPP54G */ -+#define MACH_ADM5120_WPP54AG 5 /* Compex WPP54AG */ -+#define MACH_ADM5120_NP28G 6 /* Compex NP28G */ -+#define MACH_ADM5120_NP28GHS 7 /* Compex NP28G HotSpot */ -+#define MACH_ADM5120_NP27G 8 /* Compex NP27G */ -+#define MACH_ADM5120_WP54Gv1C 9 /* Compex WP54G version 1C */ -+#define MACH_ADM5120_RB_111 10 /* Mikrotik RouterBOARD 111 */ -+#define MACH_ADM5120_RB_112 11 /* Mikrotik RouterBOARD 112 */ -+#define MACH_ADM5120_RB_133 12 /* Mikrotik RouterBOARD 133 */ -+#define MACH_ADM5120_RB_133C 13 /* Mikrotik RouterBOARD 133c */ -+#define MACH_ADM5120_RB_150 14 /* Mikrotik RouterBOARD 150 */ -+#define MACH_ADM5120_RB_153 15 /* Mikrotik RouterBOARD 153 */ -+#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 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 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_EASY5120PATA 42 /* Infineon EASY 5120P-ATA */ -+#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/BR-6104KP */ -+#define MACH_ADM5120_RB_192 47 /* Mikrotik RouterBOARD 192 */ -+#define MACH_ADM5120_BR61x4WG 48 /* Edimax BR-6104Wg/BR-6114WG */ ++#define MACH_ADM5120_WP54 2 /* Compex WP54G/WP54AG/WPP54G/WPP54AG */ ++#define MACH_ADM5120_NP28G 3 /* Compex NP28G */ ++#define MACH_ADM5120_NP28GHS 4 /* Compex NP28G HotSpot */ ++#define MACH_ADM5120_NP27G 5 /* Compex NP27G */ ++#define MACH_ADM5120_WP54Gv1C 6 /* Compex WP54G version 1C */ ++#define MACH_ADM5120_RB_11X 7 /* Mikrotik RouterBOARD 111/112 */ ++#define MACH_ADM5120_RB_133 8 /* Mikrotik RouterBOARD 133 */ ++#define MACH_ADM5120_RB_133C 9 /* Mikrotik RouterBOARD 133c */ ++#define MACH_ADM5120_RB_150 10 /* Mikrotik RouterBOARD 150 */ ++#define MACH_ADM5120_RB_153 11 /* Mikrotik RouterBOARD 153 */ ++#define MACH_ADM5120_RB_192 12 /* Mikrotik RouterBOARD 192 */ ++#define MACH_ADM5120_HS100 13 /* ZyXEL HomeSafe 100/100W */ ++#define MACH_ADM5120_P334U 14 /* ZyXEL Prestige 334U */ ++#define MACH_ADM5120_P334W 15 /* ZyXEL Prestige 334W */ ++#define MACH_ADM5120_P334WH 16 /* ZyXEL Prestige 334WH */ ++#define MACH_ADM5120_P334WHD 17 /* ZyXEL Prestige 334WHD */ ++#define MACH_ADM5120_P334WT 18 /* ZyXEL Prestige 334WT */ ++#define MACH_ADM5120_P335 19 /* ZyXEL Prestige 335/335WT */ ++#define MACH_ADM5120_P335PLUS 20 /* ZyXEL Prestige 335Plus */ ++#define MACH_ADM5120_P335U 21 /* ZyXEL Prestige 335U */ ++#define MACH_ADM5120_ES2108 22 /* ZyXEL Ethernet Switch 2108 */ ++#define MACH_ADM5120_ES2108F 23 /* ZyXEL Ethernet Switch 2108-F */ ++#define MACH_ADM5120_ES2108G 24 /* ZyXEL Ethernet Switch 2108-G */ ++#define MACH_ADM5120_ES2108LC 25 /* ZyXEL Ethernet Switch 2108-LC */ ++#define MACH_ADM5120_ES2108PWR 26 /* ZyXEL Ethernet Switch 2108-PWR */ ++#define MACH_ADM5120_ES2024A 27 /* ZyXEL Ethernet Switch 2024A */ ++#define MACH_ADM5120_ES2024PWR 28 /* ZyXEL Ethernet Switch 2024PWR */ ++#define MACH_ADM5120_CAS630 29 /* Cellvision CAS-630/630W */ ++#define MACH_ADM5120_CAS670 30 /* Cellvision CAS-670/670W */ ++#define MACH_ADM5120_CAS700 31 /* Cellvision CAS-700/700W */ ++#define MACH_ADM5120_CAS771 32 /* Cellvision CAS-771/771W */ ++#define MACH_ADM5120_CAS790 33 /* Cellvision CAS-790 */ ++#define MACH_ADM5120_CAS861 34 /* Cellvision CAS-861/861W */ ++#define MACH_ADM5120_NFS101U 35 /* Cellvision NFS-101U/101WU */ ++#define MACH_ADM5120_NFS202U 36 /* Cellvision NFS-202U/202WU */ ++#define MACH_ADM5120_EASY5120PATA 37 /* Infineon EASY 5120P-ATA */ ++#define MACH_ADM5120_EASY5120RT 38 /* Infineon EASY 5120-RT */ ++#define MACH_ADM5120_EASY5120WVOIP 39 /* Infineon EASY 5120-WVoIP */ ++#define MACH_ADM5120_EASY83000 40 /* Infineon EASY-83000 */ ++#define MACH_ADM5120_BR6104K 41 /* Edimax BR-6104K */ ++#define MACH_ADM5120_BR6104KP 42 /* Edimax BR-6104KP */ ++#define MACH_ADM5120_BR61X4WG 43 /* Edimax BR-6104Wg/BR-6114WG */ + #define CL_SIZE COMMAND_LINE_SIZE diff --git a/target/linux/adm5120/patches-2.6.26/002-adm5120_flash.patch b/target/linux/adm5120/patches-2.6.26/002-adm5120_flash.patch index f3cca182b9..c6559f2448 100644 --- a/target/linux/adm5120/patches-2.6.26/002-adm5120_flash.patch +++ b/target/linux/adm5120/patches-2.6.26/002-adm5120_flash.patch @@ -6,7 +6,7 @@ +config MTD_ADM5120 + tristate "Map driver for ADM5120 based boards" -+ depends on MIPS_ADM5120 ++ depends on ADM5120 + endmenu diff --git a/target/linux/adm5120/patches-2.6.26/003-adm5120_switch.patch b/target/linux/adm5120/patches-2.6.26/003-adm5120_switch.patch index b732b013cc..38619a4da5 100644 --- a/target/linux/adm5120/patches-2.6.26/003-adm5120_switch.patch +++ b/target/linux/adm5120/patches-2.6.26/003-adm5120_switch.patch @@ -4,9 +4,9 @@ If you have an Alchemy Semi AU1X00 based system say Y. Otherwise, say N. -+config MIPS_ADM5120_ENET -+ tristate "MIPS ADM5120 Ethernet switch support" -+ depends on MIPS_ADM5120 ++config ADM5120_ENET ++ tristate "ADM5120 Ethernet switch support" ++ depends on ADM5120 + config SGI_IOC3_ETH bool "SGI IOC3 Ethernet" @@ -17,7 +17,7 @@ # This is also a 82596 and should probably be merged obj-$(CONFIG_LP486E) += lp486e.o -+obj-$(CONFIG_MIPS_ADM5120_ENET) += adm5120sw.o ++obj-$(CONFIG_ADM5120_ENET) += adm5120sw.o obj-$(CONFIG_ETH16I) += eth16i.o obj-$(CONFIG_ZORRO8390) += zorro8390.o obj-$(CONFIG_HPLANCE) += hplance.o 7990.o diff --git a/target/linux/adm5120/patches-2.6.26/005-adm5120_usb.patch b/target/linux/adm5120/patches-2.6.26/005-adm5120_usb.patch index 5c54bb2f79..ae85e6468d 100644 --- a/target/linux/adm5120/patches-2.6.26/005-adm5120_usb.patch +++ b/target/linux/adm5120/patches-2.6.26/005-adm5120_usb.patch @@ -6,7 +6,7 @@ +config USB_ADM5120_HCD + tristate "ADM5120 HCD support (EXPERIMENTAL)" -+ depends on USB && MIPS_ADM5120 && EXPERIMENTAL ++ depends on USB && ADM5120 && EXPERIMENTAL + config USB_C67X00_HCD tristate "Cypress C67x00 HCD support" diff --git a/target/linux/adm5120/patches-2.6.26/006-adm5120_leds.patch b/target/linux/adm5120/patches-2.6.26/006-adm5120_leds.patch deleted file mode 100644 index 7748b0b411..0000000000 --- a/target/linux/adm5120/patches-2.6.26/006-adm5120_leds.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- a/drivers/leds/Kconfig -+++ b/drivers/leds/Kconfig -@@ -24,6 +24,21 @@ - This option enables support for LEDs driven using outputs - of the dedicated PWM controller found on newer Atmel SOCs. - -+config LEDS_ADM5120 -+ tristate "LED Support for ADM5120 GPIO LEDs" -+ depends on LEDS_GPIO && MIPS_ADM5120 -+ help -+ This option enables support for LEDs connected to GPIO lines -+ on ADM5120 SoC based platforms. -+ -+config LEDS_ADM5120_EXPERIMENTAL -+ bool "Enable ADM5120 LEDs experimental code" -+ depends on LEDS_ADM5120 -+ -+config LEDS_ADM5120_DIAG -+ bool "Enable ADM5120 LEDs diagnostic mode" -+ depends on LEDS_ADM5120 -+ - config LEDS_CORGI - tristate "LED Support for the Sharp SL-C7x0 series" - depends on LEDS_CLASS && PXA_SHARP_C7xx ---- a/drivers/leds/Makefile -+++ b/drivers/leds/Makefile -@@ -5,6 +5,7 @@ - obj-$(CONFIG_LEDS_TRIGGERS) += led-triggers.o - - # LED Platform Drivers -+obj-$(CONFIG_LEDS_ADM5120) += leds-adm5120.o - obj-$(CONFIG_LEDS_ATMEL_PWM) += leds-atmel-pwm.o - obj-$(CONFIG_LEDS_CORGI) += leds-corgi.o - obj-$(CONFIG_LEDS_LOCOMO) += leds-locomo.o diff --git a/target/linux/adm5120/patches-2.6.26/007-adm5120_pci.patch b/target/linux/adm5120/patches-2.6.26/007-adm5120_pci.patch index 6ba3669e89..cb46375abb 100644 --- a/target/linux/adm5120/patches-2.6.26/007-adm5120_pci.patch +++ b/target/linux/adm5120/patches-2.6.26/007-adm5120_pci.patch @@ -4,7 +4,7 @@ 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) += pci-adm5120.o ++obj-$(CONFIG_ADM5120) += pci-adm5120.o --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -1707,6 +1707,9 @@ diff --git a/target/linux/adm5120/patches-2.6.26/009-adm5120_leds_switch_trigger.patch b/target/linux/adm5120/patches-2.6.26/009-adm5120_leds_switch_trigger.patch index 341d8020e8..a0d363a9b1 100644 --- a/target/linux/adm5120/patches-2.6.26/009-adm5120_leds_switch_trigger.patch +++ b/target/linux/adm5120/patches-2.6.26/009-adm5120_leds_switch_trigger.patch @@ -1,12 +1,12 @@ --- a/drivers/leds/Kconfig +++ b/drivers/leds/Kconfig -@@ -215,4 +215,12 @@ - tristate "LED Morse Trigger" - depends on LEDS_TRIGGERS +@@ -207,4 +207,12 @@ + This allows LEDs to be controlled by network device activity. + If unsure, say Y. +config LEDS_TRIGGER_ADM5120_SWITCH + tristate "LED ADM5120 Switch Port Status Trigger" -+ depends on LEDS_TRIGGERS && LEDS_ADM5120 ++ depends on LEDS_TRIGGERS && ADM5120 + help + This allows LEDs to be controlled by the port states of + the ADM5120 built-in Ethernet Switch @@ -16,7 +16,7 @@ --- a/drivers/leds/Makefile +++ b/drivers/leds/Makefile @@ -30,3 +30,4 @@ - obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT) += ledtrig-heartbeat.o obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o obj-$(CONFIG_LEDS_TRIGGER_MORSE) += ledtrig-morse.o + obj-$(CONFIG_LEDS_TRIGGER_NETDEV) += ledtrig-netdev.o +obj-$(CONFIG_LEDS_TRIGGER_ADM5120_SWITCH) += ledtrig-adm5120-switch.o diff --git a/target/linux/adm5120/patches-2.6.26/100-mtd_myloder_partition_parser.patch b/target/linux/adm5120/patches-2.6.26/100-mtd_myloder_partition_parser.patch index 70f0857185..e34f7dc775 100644 --- a/target/linux/adm5120/patches-2.6.26/100-mtd_myloder_partition_parser.patch +++ b/target/linux/adm5120/patches-2.6.26/100-mtd_myloder_partition_parser.patch @@ -6,7 +6,7 @@ +config MTD_MYLOADER_PARTS + tristate "MyLoader partition parsing" -+ depends on MIPS_ADM5120 && MTD_PARTITIONS ++ depends on ADM5120 && MTD_PARTITIONS + ---help--- + MyLoader is a bootloader which allows the user to define partitions + in flash devices, by putting a table in the second erase block diff --git a/target/linux/adm5120/patches-2.6.26/120-rb153_cf_driver.patch b/target/linux/adm5120/patches-2.6.26/120-rb153_cf_driver.patch index 57db596b5d..242c6dd989 100644 --- a/target/linux/adm5120/patches-2.6.26/120-rb153_cf_driver.patch +++ b/target/linux/adm5120/patches-2.6.26/120-rb153_cf_driver.patch @@ -16,7 +16,7 @@ +config PATA_RB153_CF + tristate "RouterBOARD 153 Compact Flash support" -+ depends on MIPS_ADM5120 ++ depends on ADM5120_MACH_RB_153 + help + This option enables support for a Compact Flash connected on + the RouterBOARD 153. diff --git a/target/linux/adm5120/patches-2.6.26/310-adm5120_wdt.patch b/target/linux/adm5120/patches-2.6.26/310-adm5120_wdt.patch index 8fded6cd57..423b130cc3 100644 --- a/target/linux/adm5120/patches-2.6.26/310-adm5120_wdt.patch +++ b/target/linux/adm5120/patches-2.6.26/310-adm5120_wdt.patch @@ -6,7 +6,7 @@ +config ADM5120_WDT + tristate "Infineon ADM5120 SoC hardware watchdog" -+ depends on WATCHDOG && MIPS_ADM5120 ++ depends on WATCHDOG && ADM5120 + help + This is a driver for hardware watchdog integrated in Infineon + ADM5120 SoC. This watchdog simply watches your kernel to make sure |