From 6ddec82f97677610a82261d7c22cf2dd82b407b5 Mon Sep 17 00:00:00 2001 From: blogic Date: Sat, 28 Jun 2008 16:56:04 +0000 Subject: lots of ifxmips cleanups git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11596 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/ifxmips/patches/100-board.patch | 22 ++--- target/linux/ifxmips/patches/110-drivers.patch | 111 ++++++++++++++++++++----- 2 files changed, 102 insertions(+), 31 deletions(-) (limited to 'target/linux/ifxmips/patches') diff --git a/target/linux/ifxmips/patches/100-board.patch b/target/linux/ifxmips/patches/100-board.patch index 79d18cadc3..38c8fd6b01 100644 --- a/target/linux/ifxmips/patches/100-board.patch +++ b/target/linux/ifxmips/patches/100-board.patch @@ -1,13 +1,13 @@ Index: linux-2.6.25.7/arch/mips/Kconfig =================================================================== ---- linux-2.6.25.7.orig/arch/mips/Kconfig 2008-06-18 00:28:54.000000000 +0200 -+++ linux-2.6.25.7/arch/mips/Kconfig 2008-06-18 00:35:50.000000000 +0200 +--- linux-2.6.25.7.orig/arch/mips/Kconfig 2008-06-26 10:42:44.000000000 +0200 ++++ linux-2.6.25.7/arch/mips/Kconfig 2008-06-26 22:05:19.000000000 +0200 @@ -78,6 +78,21 @@ select SYS_SUPPORTS_LITTLE_ENDIAN select GENERIC_HARDIRQS_NO__DO_IRQ +config IFXMIPS -+ bool "IFXMips support" ++ bool "Infineon Twinpass, Danube, Amazon-SE" + select DMA_NONCOHERENT + select IRQ_CPU + select CEVT_R4K @@ -34,8 +34,8 @@ Index: linux-2.6.25.7/arch/mips/Kconfig Index: linux-2.6.25.7/arch/mips/Makefile =================================================================== ---- linux-2.6.25.7.orig/arch/mips/Makefile 2008-06-18 00:29:07.000000000 +0200 -+++ linux-2.6.25.7/arch/mips/Makefile 2008-06-18 00:35:42.000000000 +0200 +--- linux-2.6.25.7.orig/arch/mips/Makefile 2008-06-26 10:42:55.000000000 +0200 ++++ linux-2.6.25.7/arch/mips/Makefile 2008-06-26 10:42:56.000000000 +0200 @@ -283,6 +283,13 @@ load-$(CONFIG_MIPS_COBALT) += 0xffffffff80080000 @@ -52,8 +52,8 @@ Index: linux-2.6.25.7/arch/mips/Makefile core-$(CONFIG_MACH_DECSTATION) += arch/mips/dec/ Index: linux-2.6.25.7/include/asm-mips/bootinfo.h =================================================================== ---- linux-2.6.25.7.orig/include/asm-mips/bootinfo.h 2008-06-18 00:28:54.000000000 +0200 -+++ linux-2.6.25.7/include/asm-mips/bootinfo.h 2008-06-18 00:29:08.000000000 +0200 +--- linux-2.6.25.7.orig/include/asm-mips/bootinfo.h 2008-06-26 10:42:44.000000000 +0200 ++++ linux-2.6.25.7/include/asm-mips/bootinfo.h 2008-06-26 10:42:56.000000000 +0200 @@ -94,6 +94,12 @@ #define MACH_MSP7120_FPGA 5 /* PMC-Sierra MSP7120 Emulation */ #define MACH_MSP_OTHER 255 /* PMC-Sierra unknown board type */ @@ -69,8 +69,8 @@ Index: linux-2.6.25.7/include/asm-mips/bootinfo.h extern char *system_type; Index: linux-2.6.25.7/arch/mips/kernel/traps.c =================================================================== ---- linux-2.6.25.7.orig/arch/mips/kernel/traps.c 2008-06-18 00:28:54.000000000 +0200 -+++ linux-2.6.25.7/arch/mips/kernel/traps.c 2008-06-18 00:29:08.000000000 +0200 +--- linux-2.6.25.7.orig/arch/mips/kernel/traps.c 2008-06-26 10:42:44.000000000 +0200 ++++ linux-2.6.25.7/arch/mips/kernel/traps.c 2008-06-26 10:42:56.000000000 +0200 @@ -1379,6 +1379,7 @@ */ if (cpu_has_mips_r2) { @@ -81,8 +81,8 @@ Index: linux-2.6.25.7/arch/mips/kernel/traps.c cp0_perfcount_irq = -1; Index: linux-2.6.25.7/arch/mips/pci/Makefile =================================================================== ---- linux-2.6.25.7.orig/arch/mips/pci/Makefile 2008-06-18 00:34:49.000000000 +0200 -+++ linux-2.6.25.7/arch/mips/pci/Makefile 2008-06-18 00:35:03.000000000 +0200 +--- linux-2.6.25.7.orig/arch/mips/pci/Makefile 2008-06-26 10:42:44.000000000 +0200 ++++ linux-2.6.25.7/arch/mips/pci/Makefile 2008-06-26 10:42:56.000000000 +0200 @@ -48,3 +48,4 @@ obj-$(CONFIG_VICTOR_MPC30X) += fixup-mpc30x.o obj-$(CONFIG_ZAO_CAPCELLA) += fixup-capcella.o diff --git a/target/linux/ifxmips/patches/110-drivers.patch b/target/linux/ifxmips/patches/110-drivers.patch index 709108124f..c4627972ca 100644 --- a/target/linux/ifxmips/patches/110-drivers.patch +++ b/target/linux/ifxmips/patches/110-drivers.patch @@ -1,12 +1,11 @@ Index: linux-2.6.25.7/drivers/char/Makefile =================================================================== ---- linux-2.6.25.7.orig/drivers/char/Makefile 2008-06-18 00:34:41.000000000 +0200 -+++ linux-2.6.25.7/drivers/char/Makefile 2008-06-18 00:36:56.000000000 +0200 -@@ -113,6 +113,11 @@ +--- linux-2.6.25.7.orig/drivers/char/Makefile 2008-06-26 09:53:43.000000000 +0200 ++++ linux-2.6.25.7/drivers/char/Makefile 2008-06-26 09:53:53.000000000 +0200 +@@ -113,6 +113,10 @@ obj-$(CONFIG_JS_RTC) += js-rtc.o js-rtc-y = rtc.o -+obj-$(CONFIG_IFXMIPS_LED) += ifxmips_led.o +obj-$(CONFIG_IFXMIPS_SSC) += ifxmips_ssc.o +obj-$(CONFIG_IFXMIPS_EEPROM) += ifxmips_eeprom.o +obj-$(CONFIG_IFXMIPS_MEI) += ifxmips_mei_core.o @@ -16,8 +15,8 @@ Index: linux-2.6.25.7/drivers/char/Makefile Index: linux-2.6.25.7/drivers/mtd/maps/Makefile =================================================================== ---- linux-2.6.25.7.orig/drivers/mtd/maps/Makefile 2008-06-18 00:34:41.000000000 +0200 -+++ linux-2.6.25.7/drivers/mtd/maps/Makefile 2008-06-18 00:36:56.000000000 +0200 +--- linux-2.6.25.7.orig/drivers/mtd/maps/Makefile 2008-06-26 09:53:43.000000000 +0200 ++++ linux-2.6.25.7/drivers/mtd/maps/Makefile 2008-06-26 09:53:53.000000000 +0200 @@ -68,3 +68,4 @@ obj-$(CONFIG_MTD_OMAP_NOR) += omap_nor.o obj-$(CONFIG_MTD_MTX1) += mtx-1_flash.o @@ -25,8 +24,8 @@ Index: linux-2.6.25.7/drivers/mtd/maps/Makefile +obj-$(CONFIG_MTD_IFXMIPS) += ifxmips.o Index: linux-2.6.25.7/drivers/net/Kconfig =================================================================== ---- linux-2.6.25.7.orig/drivers/net/Kconfig 2008-06-18 00:34:41.000000000 +0200 -+++ linux-2.6.25.7/drivers/net/Kconfig 2008-06-18 00:36:56.000000000 +0200 +--- linux-2.6.25.7.orig/drivers/net/Kconfig 2008-06-26 09:53:43.000000000 +0200 ++++ linux-2.6.25.7/drivers/net/Kconfig 2008-06-26 09:53:53.000000000 +0200 @@ -351,6 +351,12 @@ source "drivers/net/arm/Kconfig" @@ -42,8 +41,8 @@ Index: linux-2.6.25.7/drivers/net/Kconfig depends on ARM || MIPS || SUPERH Index: linux-2.6.25.7/drivers/serial/Kconfig =================================================================== ---- linux-2.6.25.7.orig/drivers/serial/Kconfig 2008-06-18 00:34:41.000000000 +0200 -+++ linux-2.6.25.7/drivers/serial/Kconfig 2008-06-18 00:36:56.000000000 +0200 +--- linux-2.6.25.7.orig/drivers/serial/Kconfig 2008-06-26 09:53:43.000000000 +0200 ++++ linux-2.6.25.7/drivers/serial/Kconfig 2008-06-26 09:53:53.000000000 +0200 @@ -1327,6 +1327,14 @@ Currently, only 8250 compatible ports are supported, but others can easily be added. @@ -61,8 +60,8 @@ Index: linux-2.6.25.7/drivers/serial/Kconfig depends on QUICC_ENGINE Index: linux-2.6.25.7/drivers/serial/Makefile =================================================================== ---- linux-2.6.25.7.orig/drivers/serial/Makefile 2008-06-18 00:34:41.000000000 +0200 -+++ linux-2.6.25.7/drivers/serial/Makefile 2008-06-18 00:36:56.000000000 +0200 +--- linux-2.6.25.7.orig/drivers/serial/Makefile 2008-06-26 09:53:43.000000000 +0200 ++++ linux-2.6.25.7/drivers/serial/Makefile 2008-06-26 09:53:53.000000000 +0200 @@ -66,4 +66,5 @@ obj-$(CONFIG_SERIAL_NETX) += netx-serial.o obj-$(CONFIG_SERIAL_OF_PLATFORM) += of_serial.o @@ -71,8 +70,8 @@ Index: linux-2.6.25.7/drivers/serial/Makefile obj-$(CONFIG_SERIAL_QE) += ucc_uart.o Index: linux-2.6.25.7/drivers/watchdog/Makefile =================================================================== ---- linux-2.6.25.7.orig/drivers/watchdog/Makefile 2008-06-18 00:34:41.000000000 +0200 -+++ linux-2.6.25.7/drivers/watchdog/Makefile 2008-06-18 00:36:56.000000000 +0200 +--- linux-2.6.25.7.orig/drivers/watchdog/Makefile 2008-06-26 09:53:43.000000000 +0200 ++++ linux-2.6.25.7/drivers/watchdog/Makefile 2008-06-26 09:53:53.000000000 +0200 @@ -96,6 +96,7 @@ obj-$(CONFIG_SIBYTE_WDOG) += sb_wdog.o obj-$(CONFIG_AR7_WDT) += ar7_wdt.o @@ -83,8 +82,8 @@ Index: linux-2.6.25.7/drivers/watchdog/Makefile Index: linux-2.6.25.7/drivers/net/Makefile =================================================================== ---- linux-2.6.25.7.orig/drivers/net/Makefile 2008-06-18 00:34:41.000000000 +0200 -+++ linux-2.6.25.7/drivers/net/Makefile 2008-06-18 00:36:56.000000000 +0200 +--- linux-2.6.25.7.orig/drivers/net/Makefile 2008-06-26 09:53:43.000000000 +0200 ++++ linux-2.6.25.7/drivers/net/Makefile 2008-06-26 09:53:53.000000000 +0200 @@ -254,3 +254,4 @@ obj-$(CONFIG_NETXEN_NIC) += netxen/ obj-$(CONFIG_NIU) += niu.o @@ -92,8 +91,8 @@ Index: linux-2.6.25.7/drivers/net/Makefile +obj-$(CONFIG_IFXMIPS_MII0) += ifxmips_mii0.o Index: linux-2.6.25.7/drivers/crypto/Kconfig =================================================================== ---- linux-2.6.25.7.orig/drivers/crypto/Kconfig 2008-06-18 18:10:24.000000000 +0200 -+++ linux-2.6.25.7/drivers/crypto/Kconfig 2008-06-18 18:11:46.000000000 +0200 +--- linux-2.6.25.7.orig/drivers/crypto/Kconfig 2008-06-26 09:53:43.000000000 +0200 ++++ linux-2.6.25.7/drivers/crypto/Kconfig 2008-06-26 09:53:53.000000000 +0200 @@ -9,6 +9,9 @@ If you say N, all options in this submenu will be skipped and disabled. @@ -106,10 +105,82 @@ Index: linux-2.6.25.7/drivers/crypto/Kconfig tristate "Support for VIA PadLock ACE" Index: linux-2.6.25.7/drivers/crypto/Makefile =================================================================== ---- linux-2.6.25.7.orig/drivers/crypto/Makefile 2008-06-18 18:09:30.000000000 +0200 -+++ linux-2.6.25.7/drivers/crypto/Makefile 2008-06-18 18:10:18.000000000 +0200 +--- linux-2.6.25.7.orig/drivers/crypto/Makefile 2008-06-26 09:53:43.000000000 +0200 ++++ linux-2.6.25.7/drivers/crypto/Makefile 2008-06-26 09:53:53.000000000 +0200 @@ -2,3 +2,4 @@ obj-$(CONFIG_CRYPTO_DEV_PADLOCK_SHA) += padlock-sha.o obj-$(CONFIG_CRYPTO_DEV_GEODE) += geode-aes.o obj-$(CONFIG_CRYPTO_DEV_HIFN_795X) += hifn_795x.o +obj-$(CONFIG_CRYPTO_DEV_IFXMIPS) += ifxdeu-aes.o ifxdeu-des.o ifxdeu-dma.o ifxdeu-generic.o ifxdeu-md5.o ifxdeu-sha1.o +Index: linux-2.6.25.7/drivers/usb/host/Kconfig +=================================================================== +--- linux-2.6.25.7.orig/drivers/usb/host/Kconfig 2008-06-26 09:53:43.000000000 +0200 ++++ linux-2.6.25.7/drivers/usb/host/Kconfig 2008-06-26 09:53:53.000000000 +0200 +@@ -260,3 +260,9 @@ + To compile this driver as a module, choose M here: the + module will be called r8a66597-hcd. + ++config USB_DWC_HCD ++ tristate "IFXMIPS USB Host Controller Driver" ++ depends on USB && IFXMIPS ++ default y ++ help ++ Danube USB Host Controller +Index: linux-2.6.25.7/drivers/usb/host/Makefile +=================================================================== +--- linux-2.6.25.7.orig/drivers/usb/host/Makefile 2008-06-26 09:53:43.000000000 +0200 ++++ linux-2.6.25.7/drivers/usb/host/Makefile 2008-06-26 09:53:53.000000000 +0200 +@@ -16,4 +16,6 @@ + obj-$(CONFIG_USB_SL811_CS) += sl811_cs.o + obj-$(CONFIG_USB_U132_HCD) += u132-hcd.o + obj-$(CONFIG_USB_R8A66597_HCD) += r8a66597-hcd.o +- ++obj-$(CONFIG_USB_DWC_HCD) += dwc_otg_hcd.o dwc_otg_hcd_intr.o dwc_otg_hcd_queue.o \ ++ dwc_otg_attr.o dwc_otg_driver.o dwc_otg_cil.o \ ++ dwc_otg_cil_intr.o dwc_otg_proc.o dwc_otg_ifx.o +Index: linux-2.6.25.7/drivers/leds/Kconfig +=================================================================== +--- linux-2.6.25.7.orig/drivers/leds/Kconfig 2008-06-26 09:53:43.000000000 +0200 ++++ linux-2.6.25.7/drivers/leds/Kconfig 2008-06-26 09:53:53.000000000 +0200 +@@ -151,6 +151,12 @@ + To compile this driver as a module, choose M here: the + module will be called leds-clevo-mail. + ++config LEDS_IFXMIPS ++ tristate "LED Support for IFXMIPS LEDs" ++ depends on LEDS_CLASS && IFXMIPS ++ help ++ This option enables support for the CM-X270 LEDs. ++ + comment "LED Triggers" + + config LEDS_TRIGGERS +Index: linux-2.6.25.7/drivers/leds/Makefile +=================================================================== +--- linux-2.6.25.7.orig/drivers/leds/Makefile 2008-06-26 09:53:43.000000000 +0200 ++++ linux-2.6.25.7/drivers/leds/Makefile 2008-06-26 09:53:53.000000000 +0200 +@@ -22,6 +22,7 @@ + obj-$(CONFIG_LEDS_CM_X270) += leds-cm-x270.o + obj-$(CONFIG_LEDS_CLEVO_MAIL) += leds-clevo-mail.o + obj-$(CONFIG_LEDS_HP6XX) += leds-hp6xx.o ++obj-$(CONFIG_LEDS_IFXMIPS) += leds-ifxmips.o + + # LED Triggers + obj-$(CONFIG_LEDS_TRIGGER_TIMER) += ledtrig-timer.o +Index: linux-2.6.25.7/drivers/watchdog/Kconfig +=================================================================== +--- linux-2.6.25.7.orig/drivers/watchdog/Kconfig 2008-06-26 10:21:00.000000000 +0200 ++++ linux-2.6.25.7/drivers/watchdog/Kconfig 2008-06-26 10:22:13.000000000 +0200 +@@ -670,6 +670,12 @@ + help + Hardware driver for the built-in watchdog timer on TXx9 MIPS SoCs. + ++config IFXMIPS_WDT ++ bool "IFXMips watchdog" ++ depends on IFXMIPS ++ help ++ Hardware driver for the IFXMIPS Watchdog Timer. ++ + # PARISC Architecture + + # POWERPC Architecture -- cgit v1.2.3