diff options
Diffstat (limited to 'target')
46 files changed, 497 insertions, 492 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.23/001-ssb-fix-gpio-api.patch b/target/linux/brcm47xx/patches-2.6.23/001-ssb-fix-gpio-api.patch index f8d454f5a4..93a29c09bc 100644 --- a/target/linux/brcm47xx/patches-2.6.23/001-ssb-fix-gpio-api.patch +++ b/target/linux/brcm47xx/patches-2.6.23/001-ssb-fix-gpio-api.patch @@ -1,7 +1,7 @@ -Index: linux-2.6.23.16/drivers/ssb/driver_chipcommon.c +Index: linux-2.6.23.17/drivers/ssb/driver_chipcommon.c =================================================================== ---- linux-2.6.23.16.orig/drivers/ssb/driver_chipcommon.c 2008-02-19 14:37:06.000000000 +0100 -+++ linux-2.6.23.16/drivers/ssb/driver_chipcommon.c 2008-02-19 14:37:08.000000000 +0100 +--- linux-2.6.23.17.orig/drivers/ssb/driver_chipcommon.c ++++ linux-2.6.23.17/drivers/ssb/driver_chipcommon.c @@ -39,12 +39,14 @@ static inline void chipco_write32(struct ssb_write32(cc->dev, offset, value); } @@ -61,10 +61,10 @@ Index: linux-2.6.23.16/drivers/ssb/driver_chipcommon.c #ifdef CONFIG_SSB_SERIAL int ssb_chipco_serial_init(struct ssb_chipcommon *cc, -Index: linux-2.6.23.16/drivers/ssb/driver_extif.c +Index: linux-2.6.23.17/drivers/ssb/driver_extif.c =================================================================== ---- linux-2.6.23.16.orig/drivers/ssb/driver_extif.c 2008-02-19 14:37:06.000000000 +0100 -+++ linux-2.6.23.16/drivers/ssb/driver_extif.c 2008-02-19 14:37:08.000000000 +0100 +--- linux-2.6.23.17.orig/drivers/ssb/driver_extif.c ++++ linux-2.6.23.17/drivers/ssb/driver_extif.c @@ -27,12 +27,14 @@ static inline void extif_write32(struct ssb_write32(extif->dev, offset, value); } @@ -115,10 +115,10 @@ Index: linux-2.6.23.16/drivers/ssb/driver_extif.c + return extif_write32_masked(extif, SSB_EXTIF_GPIO_INTMASK, mask, value); +} +EXPORT_SYMBOL(ssb_extif_gpio_intmask); -Index: linux-2.6.23.16/include/linux/ssb/ssb_driver_chipcommon.h +Index: linux-2.6.23.17/include/linux/ssb/ssb_driver_chipcommon.h =================================================================== ---- linux-2.6.23.16.orig/include/linux/ssb/ssb_driver_chipcommon.h 2008-02-19 14:37:06.000000000 +0100 -+++ linux-2.6.23.16/include/linux/ssb/ssb_driver_chipcommon.h 2008-02-19 14:37:08.000000000 +0100 +--- linux-2.6.23.17.orig/include/linux/ssb/ssb_driver_chipcommon.h ++++ linux-2.6.23.17/include/linux/ssb/ssb_driver_chipcommon.h @@ -382,11 +382,13 @@ extern void ssb_chipco_set_clockmode(str extern void ssb_chipco_watchdog_timer_set(struct ssb_chipcommon *cc, u32 ticks); @@ -137,10 +137,10 @@ Index: linux-2.6.23.16/include/linux/ssb/ssb_driver_chipcommon.h #ifdef CONFIG_SSB_SERIAL extern int ssb_chipco_serial_init(struct ssb_chipcommon *cc, -Index: linux-2.6.23.16/include/linux/ssb/ssb_driver_extif.h +Index: linux-2.6.23.17/include/linux/ssb/ssb_driver_extif.h =================================================================== ---- linux-2.6.23.16.orig/include/linux/ssb/ssb_driver_extif.h 2008-02-19 14:37:06.000000000 +0100 -+++ linux-2.6.23.16/include/linux/ssb/ssb_driver_extif.h 2008-02-19 14:37:08.000000000 +0100 +--- linux-2.6.23.17.orig/include/linux/ssb/ssb_driver_extif.h ++++ linux-2.6.23.17/include/linux/ssb/ssb_driver_extif.h @@ -171,11 +171,12 @@ extern void ssb_extif_get_clockcontrol(s extern void ssb_extif_timing_init(struct ssb_extif *extif, unsigned long ns); diff --git a/target/linux/brcm47xx/patches-2.6.23/100-board_support.patch b/target/linux/brcm47xx/patches-2.6.23/100-board_support.patch index 7f28f340fc..f55c3c57fe 100644 --- a/target/linux/brcm47xx/patches-2.6.23/100-board_support.patch +++ b/target/linux/brcm47xx/patches-2.6.23/100-board_support.patch @@ -1,8 +1,8 @@ -Index: linux-2.6.23/arch/mips/Kconfig +Index: linux-2.6.23.17/arch/mips/Kconfig =================================================================== ---- linux-2.6.23.orig/arch/mips/Kconfig 2007-10-13 02:23:06.662507926 +0200 -+++ linux-2.6.23/arch/mips/Kconfig 2007-10-13 02:23:41.484492317 +0200 -@@ -4,6 +4,10 @@ +--- linux-2.6.23.17.orig/arch/mips/Kconfig ++++ linux-2.6.23.17/arch/mips/Kconfig +@@ -4,6 +4,10 @@ config MIPS # Horrible source of confusion. Die, die, die ... select EMBEDDED @@ -13,7 +13,7 @@ Index: linux-2.6.23/arch/mips/Kconfig mainmenu "Linux/MIPS Kernel Configuration" menu "Machine selection" -@@ -44,6 +48,23 @@ +@@ -44,6 +48,23 @@ config BASLER_EXCITE_PROTOTYPE note that a kernel built with this option selected will not be able to run on normal units. @@ -37,11 +37,11 @@ Index: linux-2.6.23/arch/mips/Kconfig config MIPS_COBALT bool "Cobalt Server" select DMA_NONCOHERENT -Index: linux-2.6.23/arch/mips/kernel/cpu-probe.c +Index: linux-2.6.23.17/arch/mips/kernel/cpu-probe.c =================================================================== ---- linux-2.6.23.orig/arch/mips/kernel/cpu-probe.c 2007-10-13 02:23:06.666508151 +0200 -+++ linux-2.6.23/arch/mips/kernel/cpu-probe.c 2007-10-13 02:23:11.210767122 +0200 -@@ -793,6 +793,28 @@ +--- linux-2.6.23.17.orig/arch/mips/kernel/cpu-probe.c ++++ linux-2.6.23.17/arch/mips/kernel/cpu-probe.c +@@ -793,6 +793,28 @@ static inline void cpu_probe_philips(str } @@ -70,7 +70,7 @@ Index: linux-2.6.23/arch/mips/kernel/cpu-probe.c __init void cpu_probe(void) { struct cpuinfo_mips *c = ¤t_cpu_data; -@@ -815,6 +837,9 @@ +@@ -815,6 +837,9 @@ __init void cpu_probe(void) case PRID_COMP_SIBYTE: cpu_probe_sibyte(c); break; @@ -80,11 +80,11 @@ Index: linux-2.6.23/arch/mips/kernel/cpu-probe.c case PRID_COMP_SANDCRAFT: cpu_probe_sandcraft(c); break; -Index: linux-2.6.23/arch/mips/kernel/proc.c +Index: linux-2.6.23.17/arch/mips/kernel/proc.c =================================================================== ---- linux-2.6.23.orig/arch/mips/kernel/proc.c 2007-10-13 02:23:06.678508839 +0200 -+++ linux-2.6.23/arch/mips/kernel/proc.c 2007-10-13 02:23:11.210767122 +0200 -@@ -82,6 +82,8 @@ +--- linux-2.6.23.17.orig/arch/mips/kernel/proc.c ++++ linux-2.6.23.17/arch/mips/kernel/proc.c +@@ -82,6 +82,8 @@ static const char *cpu_name[] = { [CPU_VR4181] = "NEC VR4181", [CPU_VR4181A] = "NEC VR4181A", [CPU_SR71000] = "Sandcraft SR71000", @@ -93,11 +93,11 @@ Index: linux-2.6.23/arch/mips/kernel/proc.c [CPU_PR4450] = "Philips PR4450", [CPU_LOONGSON2] = "ICT Loongson-2", }; -Index: linux-2.6.23/arch/mips/Makefile +Index: linux-2.6.23.17/arch/mips/Makefile =================================================================== ---- linux-2.6.23.orig/arch/mips/Makefile 2007-10-13 02:23:06.682509066 +0200 -+++ linux-2.6.23/arch/mips/Makefile 2007-10-13 02:23:11.210767122 +0200 -@@ -533,6 +533,18 @@ +--- linux-2.6.23.17.orig/arch/mips/Makefile ++++ linux-2.6.23.17/arch/mips/Makefile +@@ -533,6 +533,18 @@ libs-$(CONFIG_SIBYTE_BIGSUR) += arch/mip load-$(CONFIG_SIBYTE_BIGSUR) := 0xffffffff80100000 # @@ -116,11 +116,11 @@ Index: linux-2.6.23/arch/mips/Makefile # SNI RM # core-$(CONFIG_SNI_RM) += arch/mips/sni/ -Index: linux-2.6.23/arch/mips/mm/tlbex.c +Index: linux-2.6.23.17/arch/mips/mm/tlbex.c =================================================================== ---- linux-2.6.23.orig/arch/mips/mm/tlbex.c 2007-10-13 02:23:06.694509748 +0200 -+++ linux-2.6.23/arch/mips/mm/tlbex.c 2007-10-13 02:26:00.272401391 +0200 -@@ -895,6 +895,8 @@ +--- linux-2.6.23.17.orig/arch/mips/mm/tlbex.c ++++ linux-2.6.23.17/arch/mips/mm/tlbex.c +@@ -895,6 +895,8 @@ static __init void build_tlb_write_entry case CPU_AU1550: case CPU_AU1200: case CPU_PR4450: @@ -129,11 +129,11 @@ Index: linux-2.6.23/arch/mips/mm/tlbex.c i_nop(p); tlbw(p); break; -Index: linux-2.6.23/drivers/Kconfig +Index: linux-2.6.23.17/drivers/Kconfig =================================================================== ---- linux-2.6.23.orig/drivers/Kconfig 2007-10-13 02:23:06.702510206 +0200 -+++ linux-2.6.23/drivers/Kconfig 2007-10-13 02:23:11.214767346 +0200 -@@ -58,6 +58,8 @@ +--- linux-2.6.23.17.orig/drivers/Kconfig ++++ linux-2.6.23.17/drivers/Kconfig +@@ -60,6 +60,8 @@ source "drivers/power/Kconfig" source "drivers/hwmon/Kconfig" @@ -142,10 +142,10 @@ Index: linux-2.6.23/drivers/Kconfig source "drivers/mfd/Kconfig" source "drivers/media/Kconfig" -Index: linux-2.6.23/include/asm-mips/bootinfo.h +Index: linux-2.6.23.17/include/asm-mips/bootinfo.h =================================================================== ---- linux-2.6.23.orig/include/asm-mips/bootinfo.h 2007-10-13 02:23:06.718511119 +0200 -+++ linux-2.6.23/include/asm-mips/bootinfo.h 2007-10-13 02:23:11.214767346 +0200 +--- linux-2.6.23.17.orig/include/asm-mips/bootinfo.h ++++ linux-2.6.23.17/include/asm-mips/bootinfo.h @@ -208,6 +208,12 @@ #define MACH_GROUP_WINDRIVER 28 /* Windriver boards */ #define MACH_WRPPMC 1 @@ -159,10 +159,10 @@ Index: linux-2.6.23/include/asm-mips/bootinfo.h #define CL_SIZE COMMAND_LINE_SIZE const char *get_system_type(void); -Index: linux-2.6.23/include/asm-mips/cpu.h +Index: linux-2.6.23.17/include/asm-mips/cpu.h =================================================================== ---- linux-2.6.23.orig/include/asm-mips/cpu.h 2007-10-13 02:23:06.726511570 +0200 -+++ linux-2.6.23/include/asm-mips/cpu.h 2007-10-13 02:27:43.994312161 +0200 +--- linux-2.6.23.17.orig/include/asm-mips/cpu.h ++++ linux-2.6.23.17/include/asm-mips/cpu.h @@ -106,6 +106,13 @@ #define PRID_IMP_SR71000 0x0400 @@ -189,20 +189,20 @@ Index: linux-2.6.23/include/asm-mips/cpu.h /* * ISA Level encodings -Index: linux-2.6.23.1/drivers/Makefile +Index: linux-2.6.23.17/drivers/Makefile =================================================================== ---- linux-2.6.23.1.orig/drivers/Makefile 2008-01-27 04:34:31.000000000 +0100 -+++ linux-2.6.23.1/drivers/Makefile 2008-01-27 04:39:57.000000000 +0100 -@@ -89,3 +89,4 @@ +--- linux-2.6.23.17.orig/drivers/Makefile ++++ linux-2.6.23.17/drivers/Makefile +@@ -90,3 +90,4 @@ obj-$(CONFIG_HID) += hid/ obj-$(CONFIG_PPC_PS3) += ps3/ obj-$(CONFIG_OF) += of/ obj-$(CONFIG_GPIO_DEVICE) += gpio/ +obj-$(CONFIG_SSB) += ssb/ -Index: linux-2.6.23.1/include/linux/pci_ids.h +Index: linux-2.6.23.17/include/linux/pci_ids.h =================================================================== ---- linux-2.6.23.1.orig/include/linux/pci_ids.h 2008-01-27 04:55:18.000000000 +0100 -+++ linux-2.6.23.1/include/linux/pci_ids.h 2008-01-27 04:55:22.000000000 +0100 -@@ -1972,6 +1972,7 @@ +--- linux-2.6.23.17.orig/include/linux/pci_ids.h ++++ linux-2.6.23.17/include/linux/pci_ids.h +@@ -1980,6 +1980,7 @@ #define PCI_DEVICE_ID_TIGON3_5906M 0x1713 #define PCI_DEVICE_ID_BCM4401 0x4401 #define PCI_DEVICE_ID_BCM4401B0 0x4402 diff --git a/target/linux/brcm47xx/patches-2.6.23/110-flash_map.patch b/target/linux/brcm47xx/patches-2.6.23/110-flash_map.patch index 7dc05b6c6a..47769aeb45 100644 --- a/target/linux/brcm47xx/patches-2.6.23/110-flash_map.patch +++ b/target/linux/brcm47xx/patches-2.6.23/110-flash_map.patch @@ -1,8 +1,8 @@ -Index: linux-2.6.23/drivers/mtd/maps/Kconfig +Index: linux-2.6.23.17/drivers/mtd/maps/Kconfig =================================================================== ---- linux-2.6.23.orig/drivers/mtd/maps/Kconfig 2007-10-09 22:31:38.000000000 +0200 -+++ linux-2.6.23/drivers/mtd/maps/Kconfig 2007-10-13 02:28:13.644001805 +0200 -@@ -352,6 +352,12 @@ +--- linux-2.6.23.17.orig/drivers/mtd/maps/Kconfig ++++ linux-2.6.23.17/drivers/mtd/maps/Kconfig +@@ -352,6 +352,12 @@ config MTD_CFI_FLAGADM Mapping for the Flaga digital module. If you don't have one, ignore this setting. @@ -15,11 +15,11 @@ Index: linux-2.6.23/drivers/mtd/maps/Kconfig config MTD_WALNUT tristate "Flash device mapped on IBM 405GP Walnut" depends on MTD_JEDECPROBE && WALNUT -Index: linux-2.6.23/drivers/mtd/maps/Makefile +Index: linux-2.6.23.17/drivers/mtd/maps/Makefile =================================================================== ---- linux-2.6.23.orig/drivers/mtd/maps/Makefile 2007-10-09 22:31:38.000000000 +0200 -+++ linux-2.6.23/drivers/mtd/maps/Makefile 2007-10-13 02:27:56.727037761 +0200 -@@ -33,6 +33,7 @@ +--- linux-2.6.23.17.orig/drivers/mtd/maps/Makefile ++++ linux-2.6.23.17/drivers/mtd/maps/Makefile +@@ -33,6 +33,7 @@ obj-$(CONFIG_MTD_PNC2000) += pnc2000.o obj-$(CONFIG_MTD_PCMCIA) += pcmciamtd.o obj-$(CONFIG_MTD_RPXLITE) += rpxlite.o obj-$(CONFIG_MTD_TQM8XXL) += tqm8xxl.o diff --git a/target/linux/brcm47xx/patches-2.6.23/120-b44_ssb_support.patch b/target/linux/brcm47xx/patches-2.6.23/120-b44_ssb_support.patch index 29125c6755..7921f91e84 100644 --- a/target/linux/brcm47xx/patches-2.6.23/120-b44_ssb_support.patch +++ b/target/linux/brcm47xx/patches-2.6.23/120-b44_ssb_support.patch @@ -1,7 +1,7 @@ -Index: linux-2.6.23.16/drivers/net/b44.c +Index: linux-2.6.23.17/drivers/net/b44.c =================================================================== ---- linux-2.6.23.16.orig/drivers/net/b44.c 2008-02-19 01:35:58.000000000 +0100 -+++ linux-2.6.23.16/drivers/net/b44.c 2008-02-19 01:37:04.000000000 +0100 +--- linux-2.6.23.17.orig/drivers/net/b44.c ++++ linux-2.6.23.17/drivers/net/b44.c @@ -1,7 +1,9 @@ -/* b44.c: Broadcom 4400 device driver. +/* b44.c: Broadcom 4400/47xx device driver. @@ -1402,10 +1402,10 @@ Index: linux-2.6.23.16/drivers/net/b44.c } module_init(b44_init); -Index: linux-2.6.23.16/drivers/net/b44.h +Index: linux-2.6.23.17/drivers/net/b44.h =================================================================== ---- linux-2.6.23.16.orig/drivers/net/b44.h 2008-02-19 01:35:58.000000000 +0100 -+++ linux-2.6.23.16/drivers/net/b44.h 2008-02-19 01:36:00.000000000 +0100 +--- linux-2.6.23.17.orig/drivers/net/b44.h ++++ linux-2.6.23.17/drivers/net/b44.h @@ -129,6 +129,7 @@ #define RXCONFIG_FLOW 0x00000020 /* Flow Control Enable */ #define RXCONFIG_FLOW_ACCEPT 0x00000040 /* Accept Unicast Flow Control Frame */ @@ -1529,10 +1529,10 @@ Index: linux-2.6.23.16/drivers/net/b44.h struct net_device *dev; dma_addr_t rx_ring_dma, tx_ring_dma; -Index: linux-2.6.23.16/drivers/net/Kconfig +Index: linux-2.6.23.17/drivers/net/Kconfig =================================================================== ---- linux-2.6.23.16.orig/drivers/net/Kconfig 2008-02-19 01:35:58.000000000 +0100 -+++ linux-2.6.23.16/drivers/net/Kconfig 2008-02-19 01:36:00.000000000 +0100 +--- linux-2.6.23.17.orig/drivers/net/Kconfig ++++ linux-2.6.23.17/drivers/net/Kconfig @@ -1577,7 +1577,7 @@ config APRICOT config B44 diff --git a/target/linux/brcm47xx/patches-2.6.23/121-fix_b44_phyaddr.patch b/target/linux/brcm47xx/patches-2.6.23/121-fix_b44_phyaddr.patch index c93d517923..3dd4f4dab4 100644 --- a/target/linux/brcm47xx/patches-2.6.23/121-fix_b44_phyaddr.patch +++ b/target/linux/brcm47xx/patches-2.6.23/121-fix_b44_phyaddr.patch @@ -1,8 +1,8 @@ -Index: linux-2.6.23.16/drivers/net/b44.c +Index: linux-2.6.23.17/drivers/net/b44.c =================================================================== ---- linux-2.6.23.16.orig/drivers/net/b44.c 2008-03-22 19:52:40.000000000 -0700 -+++ linux-2.6.23.16/drivers/net/b44.c 2008-03-22 19:52:41.000000000 -0700 -@@ -2273,6 +2273,10 @@ +--- linux-2.6.23.17.orig/drivers/net/b44.c ++++ linux-2.6.23.17/drivers/net/b44.c +@@ -2273,6 +2273,10 @@ static int __devinit b44_get_invariants( bp->phy_addr = sdev->bus->sprom.et1phyaddr; break; } diff --git a/target/linux/brcm47xx/patches-2.6.23/130-remove_scache.patch b/target/linux/brcm47xx/patches-2.6.23/130-remove_scache.patch index eea4e26026..b30f797816 100644 --- a/target/linux/brcm47xx/patches-2.6.23/130-remove_scache.patch +++ b/target/linux/brcm47xx/patches-2.6.23/130-remove_scache.patch @@ -1,8 +1,8 @@ -Index: linux-2.6.23/arch/mips/Kconfig +Index: linux-2.6.23.17/arch/mips/Kconfig =================================================================== ---- linux-2.6.23.orig/arch/mips/Kconfig 2007-10-13 02:23:41.484492317 +0200 -+++ linux-2.6.23/arch/mips/Kconfig 2007-10-13 02:47:02.784347843 +0200 -@@ -192,7 +192,6 @@ +--- linux-2.6.23.17.orig/arch/mips/Kconfig ++++ linux-2.6.23.17/arch/mips/Kconfig +@@ -192,7 +192,6 @@ config MIPS_MALTA select I8259 select MIPS_BOARDS_GEN select MIPS_BONITO64 @@ -10,7 +10,7 @@ Index: linux-2.6.23/arch/mips/Kconfig select PCI_GT64XXX_PCI0 select MIPS_MSC select SWAP_IO_SPACE -@@ -1281,13 +1280,6 @@ +@@ -1281,13 +1280,6 @@ config IP22_CPU_SCACHE bool select BOARD_SCACHE @@ -24,11 +24,11 @@ Index: linux-2.6.23/arch/mips/Kconfig config R5000_CPU_SCACHE bool select BOARD_SCACHE -Index: linux-2.6.23/arch/mips/kernel/cpu-probe.c +Index: linux-2.6.23.17/arch/mips/kernel/cpu-probe.c =================================================================== ---- linux-2.6.23.orig/arch/mips/kernel/cpu-probe.c 2007-10-13 02:23:11.210767122 +0200 -+++ linux-2.6.23/arch/mips/kernel/cpu-probe.c 2007-10-13 02:47:02.788348072 +0200 -@@ -701,6 +701,8 @@ +--- linux-2.6.23.17.orig/arch/mips/kernel/cpu-probe.c ++++ linux-2.6.23.17/arch/mips/kernel/cpu-probe.c +@@ -701,6 +701,8 @@ static inline void cpu_probe_mips(struct break; case PRID_IMP_25KF: c->cputype = CPU_25KF; @@ -37,11 +37,11 @@ Index: linux-2.6.23/arch/mips/kernel/cpu-probe.c break; case PRID_IMP_34K: c->cputype = CPU_34K; -Index: linux-2.6.23/arch/mips/mm/c-r4k.c +Index: linux-2.6.23.17/arch/mips/mm/c-r4k.c =================================================================== ---- linux-2.6.23.orig/arch/mips/mm/c-r4k.c 2007-10-09 22:31:38.000000000 +0200 -+++ linux-2.6.23/arch/mips/mm/c-r4k.c 2007-10-13 02:47:02.792348301 +0200 -@@ -1086,7 +1086,6 @@ +--- linux-2.6.23.17.orig/arch/mips/mm/c-r4k.c ++++ linux-2.6.23.17/arch/mips/mm/c-r4k.c +@@ -1101,7 +1101,6 @@ static void __init loongson2_sc_init(voi extern int r5k_sc_init(void); extern int rm7k_sc_init(void); @@ -49,7 +49,7 @@ Index: linux-2.6.23/arch/mips/mm/c-r4k.c static void __init setup_scache(void) { -@@ -1140,29 +1139,17 @@ +@@ -1155,29 +1154,17 @@ static void __init setup_scache(void) #endif default: @@ -84,11 +84,11 @@ Index: linux-2.6.23/arch/mips/mm/c-r4k.c /* compute a couple of other cache variables */ c->scache.waysize = scache_size / c->scache.ways; -Index: linux-2.6.23/arch/mips/mm/Makefile +Index: linux-2.6.23.17/arch/mips/mm/Makefile =================================================================== ---- linux-2.6.23.orig/arch/mips/mm/Makefile 2007-10-09 22:31:38.000000000 +0200 -+++ linux-2.6.23/arch/mips/mm/Makefile 2007-10-13 02:47:23.393522295 +0200 -@@ -31,6 +31,5 @@ +--- linux-2.6.23.17.orig/arch/mips/mm/Makefile ++++ linux-2.6.23.17/arch/mips/mm/Makefile +@@ -31,6 +31,5 @@ obj-$(CONFIG_CPU_VR41XX) += c-r4k.o cex- obj-$(CONFIG_IP22_CPU_SCACHE) += sc-ip22.o obj-$(CONFIG_R5000_CPU_SCACHE) += sc-r5k.o obj-$(CONFIG_RM7000_CPU_SCACHE) += sc-rm7k.o diff --git a/target/linux/brcm47xx/patches-2.6.23/150-cpu_fixes.patch b/target/linux/brcm47xx/patches-2.6.23/150-cpu_fixes.patch index d19ba81fad..f155de70b4 100644 --- a/target/linux/brcm47xx/patches-2.6.23/150-cpu_fixes.patch +++ b/target/linux/brcm47xx/patches-2.6.23/150-cpu_fixes.patch @@ -1,8 +1,8 @@ -Index: linux-2.6.23/arch/mips/kernel/genex.S +Index: linux-2.6.23.17/arch/mips/kernel/genex.S =================================================================== ---- linux-2.6.23.orig/arch/mips/kernel/genex.S 2007-10-13 11:29:46.219648163 +0200 -+++ linux-2.6.23/arch/mips/kernel/genex.S 2007-10-13 11:29:49.619841933 +0200 -@@ -51,6 +51,10 @@ +--- linux-2.6.23.17.orig/arch/mips/kernel/genex.S ++++ linux-2.6.23.17/arch/mips/kernel/genex.S +@@ -51,6 +51,10 @@ NESTED(except_vec1_generic, 0, sp) NESTED(except_vec3_generic, 0, sp) .set push .set noat @@ -13,10 +13,10 @@ Index: linux-2.6.23/arch/mips/kernel/genex.S #if R5432_CP0_INTERRUPT_WAR mfc0 k0, CP0_INDEX #endif -Index: linux-2.6.23/arch/mips/mm/c-r4k.c +Index: linux-2.6.23.17/arch/mips/mm/c-r4k.c =================================================================== ---- linux-2.6.23.orig/arch/mips/mm/c-r4k.c 2007-10-13 11:29:46.227648623 +0200 -+++ linux-2.6.23/arch/mips/mm/c-r4k.c 2007-10-13 11:29:49.619841933 +0200 +--- linux-2.6.23.17.orig/arch/mips/mm/c-r4k.c ++++ linux-2.6.23.17/arch/mips/mm/c-r4k.c @@ -30,6 +30,9 @@ #include <asm/cacheflush.h> /* for run_uncached() */ @@ -27,7 +27,7 @@ Index: linux-2.6.23/arch/mips/mm/c-r4k.c /* * Special Variant of smp_call_function for use by cache functions: * -@@ -94,6 +97,9 @@ +@@ -94,6 +97,9 @@ static void __init r4k_blast_dcache_page { unsigned long dc_lsize = cpu_dcache_line_size(); @@ -37,7 +37,7 @@ Index: linux-2.6.23/arch/mips/mm/c-r4k.c if (dc_lsize == 0) r4k_blast_dcache_page = (void *)cache_noop; else if (dc_lsize == 16) -@@ -108,6 +114,9 @@ +@@ -108,6 +114,9 @@ static void __init r4k_blast_dcache_page { unsigned long dc_lsize = cpu_dcache_line_size(); @@ -47,7 +47,7 @@ Index: linux-2.6.23/arch/mips/mm/c-r4k.c if (dc_lsize == 0) r4k_blast_dcache_page_indexed = (void *)cache_noop; else if (dc_lsize == 16) -@@ -122,6 +131,9 @@ +@@ -122,6 +131,9 @@ static void __init r4k_blast_dcache_setu { unsigned long dc_lsize = cpu_dcache_line_size(); @@ -57,7 +57,7 @@ Index: linux-2.6.23/arch/mips/mm/c-r4k.c if (dc_lsize == 0) r4k_blast_dcache = (void *)cache_noop; else if (dc_lsize == 16) -@@ -623,6 +635,8 @@ +@@ -638,6 +650,8 @@ static void local_r4k_flush_cache_sigtra unsigned long addr = (unsigned long) arg; R4600_HIT_CACHEOP_WAR_IMPL; @@ -66,7 +66,7 @@ Index: linux-2.6.23/arch/mips/mm/c-r4k.c if (dc_lsize) protected_writeback_dcache_line(addr & ~(dc_lsize - 1)); if (!cpu_icache_snoops_remote_store && scache_size) -@@ -1198,6 +1212,17 @@ +@@ -1213,6 +1227,17 @@ static void __init coherency_setup(void) * silly idea of putting something else there ... */ switch (current_cpu_data.cputype) { @@ -84,7 +84,7 @@ Index: linux-2.6.23/arch/mips/mm/c-r4k.c case CPU_R4000PC: case CPU_R4000SC: case CPU_R4000MC: -@@ -1228,6 +1253,15 @@ +@@ -1243,6 +1268,15 @@ void __init r4k_cache_init(void) /* Default cache error handler for R4000 and R5000 family */ set_uncached_handler (0x100, &except_vec2_generic, 0x80); @@ -100,7 +100,7 @@ Index: linux-2.6.23/arch/mips/mm/c-r4k.c probe_pcache(); setup_scache(); -@@ -1273,5 +1307,13 @@ +@@ -1288,5 +1322,13 @@ void __init r4k_cache_init(void) build_clear_page(); build_copy_page(); local_r4k___flush_cache_all(NULL); @@ -114,11 +114,11 @@ Index: linux-2.6.23/arch/mips/mm/c-r4k.c coherency_setup(); +#endif } -Index: linux-2.6.23/arch/mips/mm/tlbex.c +Index: linux-2.6.23.17/arch/mips/mm/tlbex.c =================================================================== ---- linux-2.6.23.orig/arch/mips/mm/tlbex.c 2007-10-13 11:29:46.235649074 +0200 -+++ linux-2.6.23/arch/mips/mm/tlbex.c 2007-10-13 11:35:46.076155216 +0200 -@@ -1273,6 +1273,9 @@ +--- linux-2.6.23.17.orig/arch/mips/mm/tlbex.c ++++ linux-2.6.23.17/arch/mips/mm/tlbex.c +@@ -1273,6 +1273,9 @@ static void __init build_r4000_tlb_refil /* No need for i_nop */ } @@ -128,7 +128,7 @@ Index: linux-2.6.23/arch/mips/mm/tlbex.c #ifdef CONFIG_64BIT build_get_pmde64(&p, &l, &r, K0, K1); /* get pmd in K1 */ #else -@@ -1708,6 +1711,9 @@ +@@ -1708,6 +1711,9 @@ build_r4000_tlbchange_handler_head(u32 * struct reloc **r, unsigned int pte, unsigned int ptr) { @@ -138,10 +138,10 @@ Index: linux-2.6.23/arch/mips/mm/tlbex.c #ifdef CONFIG_64BIT build_get_pmde64(p, l, r, pte, ptr); /* get pmd in ptr */ #else -Index: linux-2.6.23/include/asm-mips/r4kcache.h +Index: linux-2.6.23.17/include/asm-mips/r4kcache.h =================================================================== ---- linux-2.6.23.orig/include/asm-mips/r4kcache.h 2007-10-13 11:29:46.255650214 +0200 -+++ linux-2.6.23/include/asm-mips/r4kcache.h 2007-10-13 11:29:49.631842613 +0200 +--- linux-2.6.23.17.orig/include/asm-mips/r4kcache.h ++++ linux-2.6.23.17/include/asm-mips/r4kcache.h @@ -17,6 +17,20 @@ #include <asm/cpu-features.h> #include <asm/mipsmtregs.h> @@ -163,7 +163,7 @@ Index: linux-2.6.23/include/asm-mips/r4kcache.h /* * This macro return a properly sign-extended address suitable as base address * for indexed cache operations. Two issues here: -@@ -150,6 +164,7 @@ +@@ -150,6 +164,7 @@ static inline void flush_icache_line_ind static inline void flush_dcache_line_indexed(unsigned long addr) { __dflush_prologue @@ -171,7 +171,7 @@ Index: linux-2.6.23/include/asm-mips/r4kcache.h cache_op(Index_Writeback_Inv_D, addr); __dflush_epilogue } -@@ -169,6 +184,7 @@ +@@ -169,6 +184,7 @@ static inline void flush_icache_line(uns static inline void flush_dcache_line(unsigned long addr) { __dflush_prologue @@ -179,7 +179,7 @@ Index: linux-2.6.23/include/asm-mips/r4kcache.h cache_op(Hit_Writeback_Inv_D, addr); __dflush_epilogue } -@@ -176,6 +192,7 @@ +@@ -176,6 +192,7 @@ static inline void flush_dcache_line(uns static inline void invalidate_dcache_line(unsigned long addr) { __dflush_prologue @@ -187,7 +187,7 @@ Index: linux-2.6.23/include/asm-mips/r4kcache.h cache_op(Hit_Invalidate_D, addr); __dflush_epilogue } -@@ -208,6 +225,7 @@ +@@ -208,6 +225,7 @@ static inline void flush_scache_line(uns */ static inline void protected_flush_icache_line(unsigned long addr) { @@ -195,7 +195,7 @@ Index: linux-2.6.23/include/asm-mips/r4kcache.h protected_cache_op(Hit_Invalidate_I, addr); } -@@ -219,6 +237,7 @@ +@@ -219,6 +237,7 @@ static inline void protected_flush_icach */ static inline void protected_writeback_dcache_line(unsigned long addr) { @@ -203,7 +203,7 @@ Index: linux-2.6.23/include/asm-mips/r4kcache.h protected_cache_op(Hit_Writeback_Inv_D, addr); } -@@ -339,8 +358,52 @@ +@@ -339,8 +358,52 @@ static inline void invalidate_tcache_pag : "r" (base), \ "i" (op)); @@ -257,7 +257,7 @@ Index: linux-2.6.23/include/asm-mips/r4kcache.h static inline void blast_##pfx##cache##lsize(void) \ { \ unsigned long start = INDEX_BASE; \ -@@ -352,6 +415,7 @@ +@@ -352,6 +415,7 @@ static inline void blast_##pfx##cache##l \ __##pfx##flush_prologue \ \ @@ -265,7 +265,7 @@ Index: linux-2.6.23/include/asm-mips/r4kcache.h for (ws = 0; ws < ws_end; ws += ws_inc) \ for (addr = start; addr < end; addr += lsize * 32) \ cache##lsize##_unroll32(addr|ws,indexop); \ -@@ -366,6 +430,7 @@ +@@ -366,6 +430,7 @@ static inline void blast_##pfx##cache##l \ __##pfx##flush_prologue \ \ @@ -273,7 +273,7 @@ Index: linux-2.6.23/include/asm-mips/r4kcache.h do { \ cache##lsize##_unroll32(start,hitop); \ start += lsize * 32; \ -@@ -384,6 +449,8 @@ +@@ -384,6 +449,8 @@ static inline void blast_##pfx##cache##l current_cpu_data.desc.waybit; \ unsigned long ws, addr; \ \ @@ -282,7 +282,7 @@ Index: linux-2.6.23/include/asm-mips/r4kcache.h __##pfx##flush_prologue \ \ for (ws = 0; ws < ws_end; ws += ws_inc) \ -@@ -393,28 +460,30 @@ +@@ -393,28 +460,30 @@ static inline void blast_##pfx##cache##l __##pfx##flush_epilogue \ } @@ -323,7 +323,7 @@ Index: linux-2.6.23/include/asm-mips/r4kcache.h prot##cache_op(hitop, addr); \ if (addr == aend) \ break; \ -@@ -424,13 +493,13 @@ +@@ -424,13 +493,13 @@ static inline void prot##blast_##pfx##ca __##pfx##flush_epilogue \ } @@ -344,10 +344,10 @@ Index: linux-2.6.23/include/asm-mips/r4kcache.h +__BUILD_BLAST_CACHE_RANGE(inv_s, scache, Hit_Invalidate_SD,,, ) #endif /* _ASM_R4KCACHE_H */ -Index: linux-2.6.23/include/asm-mips/stackframe.h +Index: linux-2.6.23.17/include/asm-mips/stackframe.h =================================================================== ---- linux-2.6.23.orig/include/asm-mips/stackframe.h 2007-10-13 11:29:46.263650671 +0200 -+++ linux-2.6.23/include/asm-mips/stackframe.h 2007-10-13 11:33:38.504885346 +0200 +--- linux-2.6.23.17.orig/include/asm-mips/stackframe.h ++++ linux-2.6.23.17/include/asm-mips/stackframe.h @@ -350,6 +350,10 @@ .macro RESTORE_SP_AND_RET LONG_L sp, PT_R29(sp) diff --git a/target/linux/brcm47xx/patches-2.6.23/160-kmap_coherent.patch b/target/linux/brcm47xx/patches-2.6.23/160-kmap_coherent.patch index 8a3bd0ec74..753e5ad42f 100644 --- a/target/linux/brcm47xx/patches-2.6.23/160-kmap_coherent.patch +++ b/target/linux/brcm47xx/patches-2.6.23/160-kmap_coherent.patch @@ -1,8 +1,8 @@ -Index: linux-2.6.23/arch/mips/mm/init.c +Index: linux-2.6.23.17/arch/mips/mm/init.c =================================================================== ---- linux-2.6.23.orig/arch/mips/mm/init.c 2007-10-09 22:31:38.000000000 +0200 -+++ linux-2.6.23/arch/mips/mm/init.c 2007-10-13 02:57:18.483434538 +0200 -@@ -211,7 +211,7 @@ +--- linux-2.6.23.17.orig/arch/mips/mm/init.c ++++ linux-2.6.23.17/arch/mips/mm/init.c +@@ -211,7 +211,7 @@ void copy_user_highpage(struct page *to, void *vfrom, *vto; vto = kmap_atomic(to, KM_USER1); @@ -11,7 +11,7 @@ Index: linux-2.6.23/arch/mips/mm/init.c vfrom = kmap_coherent(from, vaddr); copy_page(vto, vfrom); kunmap_coherent(); -@@ -234,7 +234,7 @@ +@@ -234,7 +234,7 @@ void copy_to_user_page(struct vm_area_st struct page *page, unsigned long vaddr, void *dst, const void *src, unsigned long len) { @@ -20,7 +20,7 @@ Index: linux-2.6.23/arch/mips/mm/init.c void *vto = kmap_coherent(page, vaddr) + (vaddr & ~PAGE_MASK); memcpy(vto, src, len); kunmap_coherent(); -@@ -250,7 +250,7 @@ +@@ -250,7 +250,7 @@ void copy_from_user_page(struct vm_area_ struct page *page, unsigned long vaddr, void *dst, const void *src, unsigned long len) { @@ -29,10 +29,10 @@ Index: linux-2.6.23/arch/mips/mm/init.c void *vfrom = kmap_coherent(page, vaddr) + (vaddr & ~PAGE_MASK); memcpy(dst, vfrom, len); -Index: linux-2.6.23/include/asm-mips/mach-bcm947xx/cpu-feature-overrides.h +Index: linux-2.6.23.17/include/asm-mips/mach-bcm947xx/cpu-feature-overrides.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.23/include/asm-mips/mach-bcm947xx/cpu-feature-overrides.h 2007-10-13 02:56:22.020216880 +0200 +--- /dev/null ++++ linux-2.6.23.17/include/asm-mips/mach-bcm947xx/cpu-feature-overrides.h @@ -0,0 +1,13 @@ +/* + * This file is subject to the terms and conditions of the GNU General Public @@ -47,10 +47,10 @@ Index: linux-2.6.23/include/asm-mips/mach-bcm947xx/cpu-feature-overrides.h +#define cpu_use_kmap_coherent 0 + +#endif /* __ASM_MACH_BCM947XX_CPU_FEATURE_OVERRIDES_H */ -Index: linux-2.6.23/include/asm-mips/cpu-features.h +Index: linux-2.6.23.17/include/asm-mips/cpu-features.h =================================================================== ---- linux-2.6.23.orig/include/asm-mips/cpu-features.h 2007-10-09 22:31:38.000000000 +0200 -+++ linux-2.6.23/include/asm-mips/cpu-features.h 2007-10-13 02:56:22.028217337 +0200 +--- linux-2.6.23.17.orig/include/asm-mips/cpu-features.h ++++ linux-2.6.23.17/include/asm-mips/cpu-features.h @@ -101,6 +101,9 @@ #ifndef cpu_has_pindexed_dcache #define cpu_has_pindexed_dcache (cpu_data[0].dcache.flags & MIPS_CACHE_PINDEX) diff --git a/target/linux/brcm47xx/patches-2.6.23/170-cpu_wait.patch b/target/linux/brcm47xx/patches-2.6.23/170-cpu_wait.patch index 62b3b12b8f..331a27dcc7 100644 --- a/target/linux/brcm47xx/patches-2.6.23/170-cpu_wait.patch +++ b/target/linux/brcm47xx/patches-2.6.23/170-cpu_wait.patch @@ -1,8 +1,8 @@ -Index: linux-2.6.23/arch/mips/kernel/cpu-probe.c +Index: linux-2.6.23.17/arch/mips/kernel/cpu-probe.c =================================================================== ---- linux-2.6.23.orig/arch/mips/kernel/cpu-probe.c 2007-10-13 02:47:02.788348072 +0200 -+++ linux-2.6.23/arch/mips/kernel/cpu-probe.c 2007-10-13 02:57:46.293019312 +0200 -@@ -159,6 +159,7 @@ +--- linux-2.6.23.17.orig/arch/mips/kernel/cpu-probe.c ++++ linux-2.6.23.17/arch/mips/kernel/cpu-probe.c +@@ -159,6 +159,7 @@ static inline void check_wait(void) case CPU_5KC: case CPU_25KF: case CPU_PR4450: diff --git a/target/linux/brcm47xx/patches-2.6.23/220-bcm5354.patch b/target/linux/brcm47xx/patches-2.6.23/220-bcm5354.patch index 53818aba6d..e0333389eb 100644 --- a/target/linux/brcm47xx/patches-2.6.23/220-bcm5354.patch +++ b/target/linux/brcm47xx/patches-2.6.23/220-bcm5354.patch @@ -1,7 +1,7 @@ -Index: linux-2.6.23.16/drivers/ssb/driver_chipcommon.c +Index: linux-2.6.23.17/drivers/ssb/driver_chipcommon.c =================================================================== ---- linux-2.6.23.16.orig/drivers/ssb/driver_chipcommon.c 2008-02-19 13:46:08.000000000 +0100 -+++ linux-2.6.23.16/drivers/ssb/driver_chipcommon.c 2008-02-19 13:46:17.000000000 +0100 +--- linux-2.6.23.17.orig/drivers/ssb/driver_chipcommon.c ++++ linux-2.6.23.17/drivers/ssb/driver_chipcommon.c @@ -270,6 +270,8 @@ void ssb_chipco_resume(struct ssb_chipco void ssb_chipco_get_clockcpu(struct ssb_chipcommon *cc, u32 *plltype, u32 *n, u32 *m) @@ -20,11 +20,11 @@ Index: linux-2.6.23.16/drivers/ssb/driver_chipcommon.c *n = chipco_read32(cc, SSB_CHIPCO_CLOCK_N); *plltype = (cc->capabilities & SSB_CHIPCO_CAP_PLLT); switch (*plltype) { -Index: linux-2.6.23.16/drivers/ssb/driver_mipscore.c +Index: linux-2.6.23.17/drivers/ssb/driver_mipscore.c =================================================================== ---- linux-2.6.23.16.orig/drivers/ssb/driver_mipscore.c 2008-02-19 13:46:08.000000000 +0100 -+++ linux-2.6.23.16/drivers/ssb/driver_mipscore.c 2008-02-19 13:46:17.000000000 +0100 -@@ -160,6 +160,8 @@ u32 ssb_cpu_clock(struct ssb_mipscore *m +--- linux-2.6.23.17.orig/drivers/ssb/driver_mipscore.c ++++ linux-2.6.23.17/drivers/ssb/driver_mipscore.c +@@ -161,6 +161,8 @@ u32 ssb_cpu_clock(struct ssb_mipscore *m if ((pll_type == SSB_PLLTYPE_5) || (bus->chip_id == 0x5365)) { rate = 200000000; @@ -33,10 +33,10 @@ Index: linux-2.6.23.16/drivers/ssb/driver_mipscore.c } else { rate = ssb_calc_clock_rate(pll_type, n, m); } -Index: linux-2.6.23.16/drivers/ssb/main.c +Index: linux-2.6.23.17/drivers/ssb/main.c =================================================================== ---- linux-2.6.23.16.orig/drivers/ssb/main.c 2008-02-19 13:46:08.000000000 +0100 -+++ linux-2.6.23.16/drivers/ssb/main.c 2008-02-19 13:46:17.000000000 +0100 +--- linux-2.6.23.17.orig/drivers/ssb/main.c ++++ linux-2.6.23.17/drivers/ssb/main.c @@ -862,6 +862,8 @@ u32 ssb_clockspeed(struct ssb_bus *bus) if (bus->chip_id == 0x5365) { diff --git a/target/linux/brcm47xx/patches-2.6.23/230-ohci-ssb.patch b/target/linux/brcm47xx/patches-2.6.23/230-ohci-ssb.patch index 5be1a66c58..b74778e1a4 100644 --- a/target/linux/brcm47xx/patches-2.6.23/230-ohci-ssb.patch +++ b/target/linux/brcm47xx/patches-2.6.23/230-ohci-ssb.patch @@ -13,10 +13,10 @@ Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- -Index: linux-2.6.23.16/drivers/usb/host/Kconfig +Index: linux-2.6.23.17/drivers/usb/host/Kconfig =================================================================== ---- linux-2.6.23.16.orig/drivers/usb/host/Kconfig 2008-02-19 00:47:29.000000000 +0100 -+++ linux-2.6.23.16/drivers/usb/host/Kconfig 2008-02-19 00:47:51.000000000 +0100 +--- linux-2.6.23.17.orig/drivers/usb/host/Kconfig ++++ linux-2.6.23.17/drivers/usb/host/Kconfig @@ -154,6 +154,19 @@ config USB_OHCI_HCD_PCI Enables support for PCI-bus plug-in USB controller cards. If unsure, say Y. @@ -37,10 +37,10 @@ Index: linux-2.6.23.16/drivers/usb/host/Kconfig config USB_OHCI_BIG_ENDIAN_DESC bool depends on USB_OHCI_HCD -Index: linux-2.6.23.16/drivers/usb/host/ohci-hcd.c +Index: linux-2.6.23.17/drivers/usb/host/ohci-hcd.c =================================================================== ---- linux-2.6.23.16.orig/drivers/usb/host/ohci-hcd.c 2008-02-19 00:47:29.000000000 +0100 -+++ linux-2.6.23.16/drivers/usb/host/ohci-hcd.c 2008-02-19 00:47:51.000000000 +0100 +--- linux-2.6.23.17.orig/drivers/usb/host/ohci-hcd.c ++++ linux-2.6.23.17/drivers/usb/host/ohci-hcd.c @@ -926,11 +926,17 @@ MODULE_LICENSE ("GPL"); #define PS3_SYSTEM_BUS_DRIVER ps3_ohci_driver #endif @@ -91,10 +91,10 @@ Index: linux-2.6.23.16/drivers/usb/host/ohci-hcd.c #ifdef PCI_DRIVER pci_unregister_driver(&PCI_DRIVER); #endif -Index: linux-2.6.23.16/drivers/usb/host/ohci-ssb.c +Index: linux-2.6.23.17/drivers/usb/host/ohci-ssb.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.23.16/drivers/usb/host/ohci-ssb.c 2008-02-19 00:47:51.000000000 +0100 +--- /dev/null ++++ linux-2.6.23.17/drivers/usb/host/ohci-ssb.c @@ -0,0 +1,247 @@ +/* + * Sonics Silicon Backplane diff --git a/target/linux/brcm47xx/patches-2.6.23/240-ohci-ssb-pm.patch b/target/linux/brcm47xx/patches-2.6.23/240-ohci-ssb-pm.patch index 81ba45bee8..f8c03aba9b 100644 --- a/target/linux/brcm47xx/patches-2.6.23/240-ohci-ssb-pm.patch +++ b/target/linux/brcm47xx/patches-2.6.23/240-ohci-ssb-pm.patch @@ -13,11 +13,11 @@ Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> --- -diff --git a/drivers/usb/host/ohci-ssb.c b/drivers/usb/host/ohci-ssb.c -index bc3e785..fe70e72 100644 ---- a/drivers/usb/host/ohci-ssb.c -+++ b/drivers/usb/host/ohci-ssb.c -@@ -117,8 +117,10 @@ static const struct hc_driver ssb_ohci_hc_driver = { +Index: linux-2.6.23.17/drivers/usb/host/ohci-ssb.c +=================================================================== +--- linux-2.6.23.17.orig/drivers/usb/host/ohci-ssb.c ++++ linux-2.6.23.17/drivers/usb/host/ohci-ssb.c +@@ -117,8 +117,10 @@ static const struct hc_driver ssb_ohci_h .hub_status_data = ohci_hub_status_data, .hub_control = ohci_hub_control, .hub_irq_enable = ohci_rhsc_enable, diff --git a/target/linux/brcm47xx/patches-2.6.23/250-ohci-ssb-usb2.patch b/target/linux/brcm47xx/patches-2.6.23/250-ohci-ssb-usb2.patch index 45493958b2..84f989bca2 100644 --- a/target/linux/brcm47xx/patches-2.6.23/250-ohci-ssb-usb2.patch +++ b/target/linux/brcm47xx/patches-2.6.23/250-ohci-ssb-usb2.patch @@ -1,6 +1,8 @@ ---- a/drivers/usb/host/ohci-ssb.c 2007-11-05 07:56:56.000000000 -0800 -+++ b/drivers/usb/host/ohci-ssb.c 2007-11-05 08:26:15.000000000 -0800 -@@ -142,10 +142,59 @@ +Index: linux-2.6.23.17/drivers/usb/host/ohci-ssb.c +=================================================================== +--- linux-2.6.23.17.orig/drivers/usb/host/ohci-ssb.c ++++ linux-2.6.23.17/drivers/usb/host/ohci-ssb.c +@@ -142,10 +142,59 @@ static int ssb_ohci_attach(struct ssb_de int err = -ENOMEM; u32 tmp, flags = 0; @@ -62,7 +64,7 @@ hcd = usb_create_hcd(&ssb_ohci_hc_driver, dev->dev, dev->dev->bus_id); -@@ -235,6 +284,7 @@ +@@ -235,6 +284,7 @@ static int ssb_ohci_resume(struct ssb_de static const struct ssb_device_id ssb_ohci_table[] = { SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_USB11_HOSTDEV, SSB_ANY_REV), SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_USB11_HOST, SSB_ANY_REV), diff --git a/target/linux/brcm47xx/patches-2.6.23/260-ohci-set-dma-mask.patch b/target/linux/brcm47xx/patches-2.6.23/260-ohci-set-dma-mask.patch index 5c2d5223e9..d1bf24f8de 100644 --- a/target/linux/brcm47xx/patches-2.6.23/260-ohci-set-dma-mask.patch +++ b/target/linux/brcm47xx/patches-2.6.23/260-ohci-set-dma-mask.patch @@ -1,6 +1,8 @@ ---- linux-2.6.23.1/drivers/usb/host/ohci-ssb.c 2007-11-26 14:01:22.000000000 -0500 -+++ linux-2.6.23.1.new/drivers/usb/host/ohci-ssb.c 2007-11-26 14:16:08.000000000 -0500 -@@ -195,6 +195,11 @@ +Index: linux-2.6.23.17/drivers/usb/host/ohci-ssb.c +=================================================================== +--- linux-2.6.23.17.orig/drivers/usb/host/ohci-ssb.c ++++ linux-2.6.23.17/drivers/usb/host/ohci-ssb.c +@@ -195,6 +195,11 @@ static int ssb_ohci_attach(struct ssb_de else ssb_device_enable(dev, 0); diff --git a/target/linux/brcm47xx/patches-2.6.23/300-fork_cacheflush.patch b/target/linux/brcm47xx/patches-2.6.23/300-fork_cacheflush.patch index 1620bf48ad..d786d78ecf 100644 --- a/target/linux/brcm47xx/patches-2.6.23/300-fork_cacheflush.patch +++ b/target/linux/brcm47xx/patches-2.6.23/300-fork_cacheflush.patch @@ -1,7 +1,7 @@ -Index: linux-2.6.23/include/asm-mips/cacheflush.h +Index: linux-2.6.23.17/include/asm-mips/cacheflush.h =================================================================== ---- linux-2.6.23.orig/include/asm-mips/cacheflush.h 2007-10-13 11:01:52.780284289 +0200 -+++ linux-2.6.23/include/asm-mips/cacheflush.h 2007-10-13 11:02:16.289624011 +0200 +--- linux-2.6.23.17.orig/include/asm-mips/cacheflush.h ++++ linux-2.6.23.17/include/asm-mips/cacheflush.h @@ -32,7 +32,7 @@ extern void (*flush_cache_all)(void); extern void (*__flush_cache_all)(void); diff --git a/target/linux/brcm47xx/patches-2.6.23/310-no_highpage.patch b/target/linux/brcm47xx/patches-2.6.23/310-no_highpage.patch index 16e7e3f36c..f42726daa8 100644 --- a/target/linux/brcm47xx/patches-2.6.23/310-no_highpage.patch +++ b/target/linux/brcm47xx/patches-2.6.23/310-no_highpage.patch @@ -1,8 +1,8 @@ -Index: linux-2.6.23/arch/mips/mm/init.c +Index: linux-2.6.23.17/arch/mips/mm/init.c =================================================================== ---- linux-2.6.23.orig/arch/mips/mm/init.c 2007-10-13 11:46:58.762489429 +0200 -+++ linux-2.6.23/arch/mips/mm/init.c 2007-10-13 11:47:36.092616749 +0200 -@@ -205,31 +205,6 @@ +--- linux-2.6.23.17.orig/arch/mips/mm/init.c ++++ linux-2.6.23.17/arch/mips/mm/init.c +@@ -205,31 +205,6 @@ void kunmap_coherent(void) preempt_check_resched(); } @@ -34,10 +34,10 @@ Index: linux-2.6.23/arch/mips/mm/init.c void copy_to_user_page(struct vm_area_struct *vma, struct page *page, unsigned long vaddr, void *dst, const void *src, unsigned long len) -Index: linux-2.6.23/include/asm-mips/page.h +Index: linux-2.6.23.17/include/asm-mips/page.h =================================================================== ---- linux-2.6.23.orig/include/asm-mips/page.h 2007-10-13 11:45:50.518600430 +0200 -+++ linux-2.6.23/include/asm-mips/page.h 2007-10-13 11:47:26.472068504 +0200 +--- linux-2.6.23.17.orig/include/asm-mips/page.h ++++ linux-2.6.23.17/include/asm-mips/page.h @@ -35,6 +35,7 @@ #ifndef __ASSEMBLY__ @@ -46,7 +46,7 @@ Index: linux-2.6.23/include/asm-mips/page.h #include <asm/io.h> /* -@@ -67,13 +68,16 @@ +@@ -67,13 +68,16 @@ static inline void clear_user_page(void flush_data_cache_page((unsigned long)addr); } diff --git a/target/linux/brcm47xx/patches-2.6.23/410-aec62xx_pci_enable.patch b/target/linux/brcm47xx/patches-2.6.23/410-aec62xx_pci_enable.patch index ae2be766f9..303c2382ba 100644 --- a/target/linux/brcm47xx/patches-2.6.23/410-aec62xx_pci_enable.patch +++ b/target/linux/brcm47xx/patches-2.6.23/410-aec62xx_pci_enable.patch @@ -1,7 +1,8 @@ -diff -Naur a/drivers/ide/pci/aec62xx.c b/drivers/ide/pci/aec62xx.c ---- a/drivers/ide/pci/aec62xx.c 2007-10-12 18:43:44.000000000 +0200 -+++ b/drivers/ide/pci/aec62xx.c 2007-11-14 14:12:51.000000000 +0100 -@@ -248,7 +248,14 @@ +Index: linux-2.6.23.17/drivers/ide/pci/aec62xx.c +=================================================================== +--- linux-2.6.23.17.orig/drivers/ide/pci/aec62xx.c ++++ linux-2.6.23.17/drivers/ide/pci/aec62xx.c +@@ -248,7 +248,14 @@ static int __devinit init_setup_aec62xx( static int __devinit init_setup_aec6x80(struct pci_dev *dev, ide_pci_device_t *d) { @@ -17,7 +18,7 @@ diff -Naur a/drivers/ide/pci/aec62xx.c b/drivers/ide/pci/aec62xx.c if (inb(dma_base + 2) & 0x10) { d->name = (dev->device == PCI_DEVICE_ID_ARTOP_ATP865R) ? -@@ -256,7 +263,11 @@ +@@ -256,7 +263,11 @@ static int __devinit init_setup_aec6x80( d->udma_mask = 0x7f; /* udma0-6 */ } diff --git a/target/linux/brcm47xx/patches-2.6.23/500-lzma_initramfs.patch b/target/linux/brcm47xx/patches-2.6.23/500-lzma_initramfs.patch index b545bba264..88ce8052c7 100644 --- a/target/linux/brcm47xx/patches-2.6.23/500-lzma_initramfs.patch +++ b/target/linux/brcm47xx/patches-2.6.23/500-lzma_initramfs.patch @@ -1,8 +1,8 @@ -Index: linux-2.6.23.1/scripts/gen_initramfs_list.sh +Index: linux-2.6.23.17/scripts/gen_initramfs_list.sh =================================================================== ---- linux-2.6.23.1.orig/scripts/gen_initramfs_list.sh 2007-11-16 02:26:47.821227881 +0100 -+++ linux-2.6.23.1/scripts/gen_initramfs_list.sh 2007-11-16 02:45:42.753904007 +0100 -@@ -287,7 +287,7 @@ +--- linux-2.6.23.17.orig/scripts/gen_initramfs_list.sh ++++ linux-2.6.23.17/scripts/gen_initramfs_list.sh +@@ -287,7 +287,7 @@ if [ ! -z ${output_file} ]; then if [ "${is_cpio_compressed}" = "compressed" ]; then cat ${cpio_tfile} > ${output_file} else @@ -11,11 +11,11 @@ Index: linux-2.6.23.1/scripts/gen_initramfs_list.sh fi [ -z ${cpio_file} ] && rm ${cpio_tfile} fi -Index: linux-2.6.23.1/init/initramfs.c +Index: linux-2.6.23.17/init/initramfs.c =================================================================== ---- linux-2.6.23.1.orig/init/initramfs.c 2007-11-16 02:26:47.829228332 +0100 -+++ linux-2.6.23.1/init/initramfs.c 2007-11-16 03:03:09.661563882 +0100 -@@ -441,6 +441,69 @@ +--- linux-2.6.23.17.orig/init/initramfs.c ++++ linux-2.6.23.17/init/initramfs.c +@@ -441,6 +441,69 @@ static void __init flush_window(void) outcnt = 0; } @@ -85,7 +85,7 @@ Index: linux-2.6.23.1/init/initramfs.c static char * __init unpack_to_rootfs(char *buf, unsigned len, int check_only) { int written; -@@ -475,12 +538,28 @@ +@@ -475,12 +538,28 @@ static char * __init unpack_to_rootfs(ch inptr = 0; outcnt = 0; /* bytes in output buffer */ bytes_out = 0; diff --git a/target/linux/brcm47xx/patches-2.6.23/600-ssb-fix-pcidevices.patch b/target/linux/brcm47xx/patches-2.6.23/600-ssb-fix-pcidevices.patch index 01bd9ffea2..ee1358c082 100644 --- a/target/linux/brcm47xx/patches-2.6.23/600-ssb-fix-pcidevices.patch +++ b/target/linux/brcm47xx/patches-2.6.23/600-ssb-fix-pcidevices.patch @@ -1,7 +1,7 @@ -Index: linux-2.6.23.16/drivers/ssb/driver_pcicore.c +Index: linux-2.6.23.17/drivers/ssb/driver_pcicore.c =================================================================== ---- linux-2.6.23.16.orig/drivers/ssb/driver_pcicore.c 2008-02-16 17:55:20.000000000 +0100 -+++ linux-2.6.23.16/drivers/ssb/driver_pcicore.c 2008-02-16 17:55:35.000000000 +0100 +--- linux-2.6.23.17.orig/drivers/ssb/driver_pcicore.c ++++ linux-2.6.23.17/drivers/ssb/driver_pcicore.c @@ -66,6 +66,7 @@ int pcibios_plat_dev_init(struct pci_dev base = &ssb_pcicore_pcibus_iobase; else diff --git a/target/linux/brcm47xx/patches-2.6.23/601-mips-remove-pci-collision-check.patch b/target/linux/brcm47xx/patches-2.6.23/601-mips-remove-pci-collision-check.patch index 8ab28a75e2..7a7fb4e80c 100644 --- a/target/linux/brcm47xx/patches-2.6.23/601-mips-remove-pci-collision-check.patch +++ b/target/linux/brcm47xx/patches-2.6.23/601-mips-remove-pci-collision-check.patch @@ -2,10 +2,10 @@ The SSB pcicore driver does create some MMIO resource collisions. However, the pcicore PCI-fixup routine fixes these collisions afterwards. Remove this sanity check for now until we find a better solution. --mb -Index: linux-2.6.23.16/arch/mips/pci/pci.c +Index: linux-2.6.23.17/arch/mips/pci/pci.c =================================================================== ---- linux-2.6.23.16.orig/arch/mips/pci/pci.c 2008-02-16 17:55:20.000000000 +0100 -+++ linux-2.6.23.16/arch/mips/pci/pci.c 2008-02-16 17:57:39.000000000 +0100 +--- linux-2.6.23.17.orig/arch/mips/pci/pci.c ++++ linux-2.6.23.17/arch/mips/pci/pci.c @@ -177,10 +177,8 @@ static int pcibios_enable_resources(stru continue; diff --git a/target/linux/brcm47xx/patches-2.6.23/602-ssb-fix-serial-on-new-devices.patch b/target/linux/brcm47xx/patches-2.6.23/602-ssb-fix-serial-on-new-devices.patch index d80b86e78a..bf16997c41 100644 --- a/target/linux/brcm47xx/patches-2.6.23/602-ssb-fix-serial-on-new-devices.patch +++ b/target/linux/brcm47xx/patches-2.6.23/602-ssb-fix-serial-on-new-devices.patch @@ -1,7 +1,7 @@ -Index: linux-2.6.23.16/drivers/ssb/driver_chipcommon.c +Index: linux-2.6.23.17/drivers/ssb/driver_chipcommon.c =================================================================== ---- linux-2.6.23.16.orig/drivers/ssb/driver_chipcommon.c 2008-02-19 14:37:26.000000000 +0100 -+++ linux-2.6.23.16/drivers/ssb/driver_chipcommon.c 2008-02-19 14:37:27.000000000 +0100 +--- linux-2.6.23.17.orig/drivers/ssb/driver_chipcommon.c ++++ linux-2.6.23.17/drivers/ssb/driver_chipcommon.c @@ -403,6 +403,7 @@ int ssb_chipco_serial_init(struct ssb_ch unsigned int irq; u32 baud_base, div; @@ -71,10 +71,10 @@ Index: linux-2.6.23.16/drivers/ssb/driver_chipcommon.c uart_regs += (i * 8); else uart_regs += (i * 256); -Index: linux-2.6.23.16/include/linux/ssb/ssb_driver_chipcommon.h +Index: linux-2.6.23.17/include/linux/ssb/ssb_driver_chipcommon.h =================================================================== ---- linux-2.6.23.16.orig/include/linux/ssb/ssb_driver_chipcommon.h 2008-02-19 14:37:26.000000000 +0100 -+++ linux-2.6.23.16/include/linux/ssb/ssb_driver_chipcommon.h 2008-02-19 14:37:27.000000000 +0100 +--- linux-2.6.23.17.orig/include/linux/ssb/ssb_driver_chipcommon.h ++++ linux-2.6.23.17/include/linux/ssb/ssb_driver_chipcommon.h @@ -51,9 +51,12 @@ #define SSB_CHIPCO_CAP_JTAGM 0x00400000 /* JTAG master present */ #define SSB_CHIPCO_CAP_BROM 0x00800000 /* Internal boot ROM active */ diff --git a/target/linux/brcm47xx/patches-2.6.23/610-ssb-watchdog-fix.patch b/target/linux/brcm47xx/patches-2.6.23/610-ssb-watchdog-fix.patch index fecb8b50d0..de1c1a91a9 100644 --- a/target/linux/brcm47xx/patches-2.6.23/610-ssb-watchdog-fix.patch +++ b/target/linux/brcm47xx/patches-2.6.23/610-ssb-watchdog-fix.patch @@ -1,7 +1,7 @@ -Index: linux-2.6.23.16/drivers/ssb/Kconfig +Index: linux-2.6.23.17/drivers/ssb/Kconfig =================================================================== ---- linux-2.6.23.16.orig/drivers/ssb/Kconfig 2008-02-19 13:46:05.000000000 +0100 -+++ linux-2.6.23.16/drivers/ssb/Kconfig 2008-02-19 13:46:33.000000000 +0100 +--- linux-2.6.23.17.orig/drivers/ssb/Kconfig ++++ linux-2.6.23.17/drivers/ssb/Kconfig @@ -105,6 +105,12 @@ config SSB_DRIVER_MIPS If unsure, say N @@ -15,10 +15,10 @@ Index: linux-2.6.23.16/drivers/ssb/Kconfig config SSB_DRIVER_EXTIF bool "SSB Broadcom EXTIF core driver (EXPERIMENTAL)" depends on SSB_DRIVER_MIPS && EXPERIMENTAL -Index: linux-2.6.23.16/drivers/ssb/Makefile +Index: linux-2.6.23.17/drivers/ssb/Makefile =================================================================== ---- linux-2.6.23.16.orig/drivers/ssb/Makefile 2008-02-19 13:46:05.000000000 +0100 -+++ linux-2.6.23.16/drivers/ssb/Makefile 2008-02-19 13:46:33.000000000 +0100 +--- linux-2.6.23.17.orig/drivers/ssb/Makefile ++++ linux-2.6.23.17/drivers/ssb/Makefile @@ -1,5 +1,6 @@ # core ssb-y += main.o scan.o @@ -26,10 +26,10 @@ Index: linux-2.6.23.16/drivers/ssb/Makefile # host support ssb-$(CONFIG_SSB_PCIHOST) += pci.o pcihost_wrapper.o -Index: linux-2.6.23.16/drivers/ssb/driver_extif.c +Index: linux-2.6.23.17/drivers/ssb/driver_extif.c =================================================================== ---- linux-2.6.23.16.orig/drivers/ssb/driver_extif.c 2008-02-19 13:46:05.000000000 +0100 -+++ linux-2.6.23.16/drivers/ssb/driver_extif.c 2008-02-19 13:46:33.000000000 +0100 +--- linux-2.6.23.17.orig/drivers/ssb/driver_extif.c ++++ linux-2.6.23.17/drivers/ssb/driver_extif.c @@ -37,6 +37,12 @@ static inline u32 extif_write32_masked(s return value; } @@ -43,10 +43,10 @@ Index: linux-2.6.23.16/drivers/ssb/driver_extif.c #ifdef CONFIG_SSB_SERIAL static bool serial_exists(u8 *regs) { -Index: linux-2.6.23.16/drivers/ssb/embedded.c +Index: linux-2.6.23.17/drivers/ssb/embedded.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.23.16/drivers/ssb/embedded.c 2008-02-19 13:46:33.000000000 +0100 +--- /dev/null ++++ linux-2.6.23.17/drivers/ssb/embedded.c @@ -0,0 +1,26 @@ +/* + * Sonics Silicon Backplane @@ -74,10 +74,10 @@ Index: linux-2.6.23.16/drivers/ssb/embedded.c + } + return -ENODEV; +} -Index: linux-2.6.23.16/include/linux/ssb/ssb_driver_chipcommon.h +Index: linux-2.6.23.17/include/linux/ssb/ssb_driver_chipcommon.h =================================================================== ---- linux-2.6.23.16.orig/include/linux/ssb/ssb_driver_chipcommon.h 2008-02-19 13:46:29.000000000 +0100 -+++ linux-2.6.23.16/include/linux/ssb/ssb_driver_chipcommon.h 2008-02-19 13:46:33.000000000 +0100 +--- linux-2.6.23.17.orig/include/linux/ssb/ssb_driver_chipcommon.h ++++ linux-2.6.23.17/include/linux/ssb/ssb_driver_chipcommon.h @@ -360,6 +360,11 @@ struct ssb_chipcommon { u16 fast_pwrup_delay; }; @@ -90,10 +90,10 @@ Index: linux-2.6.23.16/include/linux/ssb/ssb_driver_chipcommon.h extern void ssb_chipcommon_init(struct ssb_chipcommon *cc); #include <linux/pm.h> -Index: linux-2.6.23.16/include/linux/ssb/ssb_driver_extif.h +Index: linux-2.6.23.17/include/linux/ssb/ssb_driver_extif.h =================================================================== ---- linux-2.6.23.16.orig/include/linux/ssb/ssb_driver_extif.h 2008-02-19 13:46:05.000000000 +0100 -+++ linux-2.6.23.16/include/linux/ssb/ssb_driver_extif.h 2008-02-19 13:46:33.000000000 +0100 +--- linux-2.6.23.17.orig/include/linux/ssb/ssb_driver_extif.h ++++ linux-2.6.23.17/include/linux/ssb/ssb_driver_extif.h @@ -178,6 +178,9 @@ u32 ssb_extif_gpio_outen(struct ssb_exti u32 ssb_extif_gpio_polarity(struct ssb_extif *extif, u32 mask, u32 value); u32 ssb_extif_gpio_intmask(struct ssb_extif *extif, u32 mask, u32 value); @@ -116,10 +116,10 @@ Index: linux-2.6.23.16/include/linux/ssb/ssb_driver_extif.h + #endif /* CONFIG_SSB_DRIVER_EXTIF */ #endif /* LINUX_SSB_EXTIFCORE_H_ */ -Index: linux-2.6.23.16/include/linux/ssb/ssb_embedded.h +Index: linux-2.6.23.17/include/linux/ssb/ssb_embedded.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.23.16/include/linux/ssb/ssb_embedded.h 2008-02-19 13:46:33.000000000 +0100 +--- /dev/null ++++ linux-2.6.23.17/include/linux/ssb/ssb_embedded.h @@ -0,0 +1,10 @@ +#ifndef LINUX_SSB_EMBEDDED_H_ +#define LINUX_SSB_EMBEDDED_H_ diff --git a/target/linux/brcm47xx/patches-2.6.23/620-ssb-modinit-fix.patch b/target/linux/brcm47xx/patches-2.6.23/620-ssb-modinit-fix.patch index a36c046018..0963bde744 100644 --- a/target/linux/brcm47xx/patches-2.6.23/620-ssb-modinit-fix.patch +++ b/target/linux/brcm47xx/patches-2.6.23/620-ssb-modinit-fix.patch @@ -1,7 +1,7 @@ -Index: linux-2.6.23.16/drivers/ssb/main.c +Index: linux-2.6.23.17/drivers/ssb/main.c =================================================================== ---- linux-2.6.23.16.orig/drivers/ssb/main.c 2008-02-19 12:38:34.000000000 +0100 -+++ linux-2.6.23.16/drivers/ssb/main.c 2008-02-19 12:48:25.000000000 +0100 +--- linux-2.6.23.17.orig/drivers/ssb/main.c ++++ linux-2.6.23.17/drivers/ssb/main.c @@ -1163,7 +1163,9 @@ static int __init ssb_modinit(void) /* ssb must be initialized after PCI but before the ssb drivers. * That means we must use some initcall between subsys_initcall diff --git a/target/linux/brcm47xx/patches-2.6.23/621-ssb-common-gpio-api.patch b/target/linux/brcm47xx/patches-2.6.23/621-ssb-common-gpio-api.patch index d1debcfe3a..5b96c29952 100644 --- a/target/linux/brcm47xx/patches-2.6.23/621-ssb-common-gpio-api.patch +++ b/target/linux/brcm47xx/patches-2.6.23/621-ssb-common-gpio-api.patch @@ -1,7 +1,7 @@ -Index: linux-2.6.23.16/drivers/ssb/driver_chipcommon.c +Index: linux-2.6.23.17/drivers/ssb/driver_chipcommon.c =================================================================== ---- linux-2.6.23.16.orig/drivers/ssb/driver_chipcommon.c 2008-02-19 15:50:42.000000000 +0100 -+++ linux-2.6.23.16/drivers/ssb/driver_chipcommon.c 2008-02-19 15:50:44.000000000 +0100 +--- linux-2.6.23.17.orig/drivers/ssb/driver_chipcommon.c ++++ linux-2.6.23.17/drivers/ssb/driver_chipcommon.c @@ -361,37 +361,31 @@ u32 ssb_chipco_gpio_in(struct ssb_chipco { return chipco_read32(cc, SSB_CHIPCO_GPIOIN) & mask; @@ -40,10 +40,10 @@ Index: linux-2.6.23.16/drivers/ssb/driver_chipcommon.c #ifdef CONFIG_SSB_SERIAL int ssb_chipco_serial_init(struct ssb_chipcommon *cc, -Index: linux-2.6.23.16/drivers/ssb/driver_extif.c +Index: linux-2.6.23.17/drivers/ssb/driver_extif.c =================================================================== ---- linux-2.6.23.16.orig/drivers/ssb/driver_extif.c 2008-02-19 15:50:42.000000000 +0100 -+++ linux-2.6.23.16/drivers/ssb/driver_extif.c 2008-02-19 15:50:44.000000000 +0100 +--- linux-2.6.23.17.orig/drivers/ssb/driver_extif.c ++++ linux-2.6.23.17/drivers/ssb/driver_extif.c @@ -122,30 +122,25 @@ u32 ssb_extif_gpio_in(struct ssb_extif * { return extif_read32(extif, SSB_EXTIF_GPIO_IN) & mask; @@ -75,10 +75,10 @@ Index: linux-2.6.23.16/drivers/ssb/driver_extif.c return extif_write32_masked(extif, SSB_EXTIF_GPIO_INTMASK, mask, value); } -EXPORT_SYMBOL(ssb_extif_gpio_intmask); -Index: linux-2.6.23.16/drivers/ssb/embedded.c +Index: linux-2.6.23.17/drivers/ssb/embedded.c =================================================================== ---- linux-2.6.23.16.orig/drivers/ssb/embedded.c 2008-02-19 15:50:42.000000000 +0100 -+++ linux-2.6.23.16/drivers/ssb/embedded.c 2008-02-19 15:51:01.000000000 +0100 +--- linux-2.6.23.17.orig/drivers/ssb/embedded.c ++++ linux-2.6.23.17/drivers/ssb/embedded.c @@ -11,6 +11,8 @@ #include <linux/ssb/ssb.h> #include <linux/ssb/ssb_embedded.h> @@ -196,10 +196,10 @@ Index: linux-2.6.23.16/drivers/ssb/embedded.c + return res; +} +EXPORT_SYMBOL(ssb_gpio_polarity); -Index: linux-2.6.23.16/include/linux/ssb/ssb.h +Index: linux-2.6.23.17/include/linux/ssb/ssb.h =================================================================== ---- linux-2.6.23.16.orig/include/linux/ssb/ssb.h 2008-02-19 15:50:42.000000000 +0100 -+++ linux-2.6.23.16/include/linux/ssb/ssb.h 2008-02-19 15:50:44.000000000 +0100 +--- linux-2.6.23.17.orig/include/linux/ssb/ssb.h ++++ linux-2.6.23.17/include/linux/ssb/ssb.h @@ -283,6 +283,11 @@ struct ssb_bus { /* Contents of the SPROM. */ struct ssb_sprom sprom; @@ -212,10 +212,10 @@ Index: linux-2.6.23.16/include/linux/ssb/ssb.h /* Internal-only stuff follows. Do not touch. */ struct list_head list; #ifdef CONFIG_SSB_DEBUG -Index: linux-2.6.23.16/include/linux/ssb/ssb_embedded.h +Index: linux-2.6.23.17/include/linux/ssb/ssb_embedded.h =================================================================== ---- linux-2.6.23.16.orig/include/linux/ssb/ssb_embedded.h 2008-02-19 15:50:42.000000000 +0100 -+++ linux-2.6.23.16/include/linux/ssb/ssb_embedded.h 2008-02-19 15:50:44.000000000 +0100 +--- linux-2.6.23.17.orig/include/linux/ssb/ssb_embedded.h ++++ linux-2.6.23.17/include/linux/ssb/ssb_embedded.h @@ -7,4 +7,12 @@ extern int ssb_watchdog_timer_set(struct ssb_bus *bus, u32 ticks); @@ -229,10 +229,10 @@ Index: linux-2.6.23.16/include/linux/ssb/ssb_embedded.h +u32 ssb_gpio_polarity(struct ssb_bus *bus, u32 mask, u32 value); + #endif /* LINUX_SSB_EMBEDDED_H_ */ -Index: linux-2.6.23.16/drivers/ssb/main.c +Index: linux-2.6.23.17/drivers/ssb/main.c =================================================================== ---- linux-2.6.23.16.orig/drivers/ssb/main.c 2008-02-19 15:50:42.000000000 +0100 -+++ linux-2.6.23.16/drivers/ssb/main.c 2008-02-19 15:50:44.000000000 +0100 +--- linux-2.6.23.17.orig/drivers/ssb/main.c ++++ linux-2.6.23.17/drivers/ssb/main.c @@ -571,6 +571,9 @@ static int ssb_bus_register(struct ssb_b spin_lock_init(&bus->bar_lock); diff --git a/target/linux/brcm47xx/patches-2.6.23/622-ssb-cardbus-fixes.patch b/target/linux/brcm47xx/patches-2.6.23/622-ssb-cardbus-fixes.patch index 1d2779ed74..5dea9b7560 100644 --- a/target/linux/brcm47xx/patches-2.6.23/622-ssb-cardbus-fixes.patch +++ b/target/linux/brcm47xx/patches-2.6.23/622-ssb-cardbus-fixes.patch @@ -1,7 +1,7 @@ -Index: linux-2.6.23.16/drivers/ssb/driver_pcicore.c +Index: linux-2.6.23.17/drivers/ssb/driver_pcicore.c =================================================================== ---- linux-2.6.23.16.orig/drivers/ssb/driver_pcicore.c 2008-02-19 16:37:14.000000000 +0100 -+++ linux-2.6.23.16/drivers/ssb/driver_pcicore.c 2008-02-19 17:25:26.000000000 +0100 +--- linux-2.6.23.17.orig/drivers/ssb/driver_pcicore.c ++++ linux-2.6.23.17/drivers/ssb/driver_pcicore.c @@ -11,6 +11,7 @@ #include <linux/ssb/ssb.h> #include <linux/pci.h> @@ -59,10 +59,10 @@ Index: linux-2.6.23.16/drivers/ssb/driver_pcicore.c /* 64MB I/O window */ pcicore_write32(pc, SSB_PCICORE_SBTOPCI0, -Index: linux-2.6.23.16/drivers/ssb/main.c +Index: linux-2.6.23.17/drivers/ssb/main.c =================================================================== ---- linux-2.6.23.16.orig/drivers/ssb/main.c 2008-02-19 15:50:44.000000000 +0100 -+++ linux-2.6.23.16/drivers/ssb/main.c 2008-02-19 16:38:31.000000000 +0100 +--- linux-2.6.23.17.orig/drivers/ssb/main.c ++++ linux-2.6.23.17/drivers/ssb/main.c @@ -559,6 +559,7 @@ static int ssb_fetch_invariants(struct s goto out; memcpy(&bus->boardinfo, &iv.boardinfo, sizeof(iv.boardinfo)); @@ -71,10 +71,10 @@ Index: linux-2.6.23.16/drivers/ssb/main.c out: return err; } -Index: linux-2.6.23.16/include/linux/ssb/ssb.h +Index: linux-2.6.23.17/include/linux/ssb/ssb.h =================================================================== ---- linux-2.6.23.16.orig/include/linux/ssb/ssb.h 2008-02-19 15:50:44.000000000 +0100 -+++ linux-2.6.23.16/include/linux/ssb/ssb.h 2008-02-19 16:38:31.000000000 +0100 +--- linux-2.6.23.17.orig/include/linux/ssb/ssb.h ++++ linux-2.6.23.17/include/linux/ssb/ssb.h @@ -282,6 +282,8 @@ struct ssb_bus { struct ssb_boardinfo boardinfo; /* Contents of the SPROM. */ @@ -98,10 +98,10 @@ Index: linux-2.6.23.16/include/linux/ssb/ssb.h }; /* Type of function to fetch the invariants. */ typedef int (*ssb_invariants_func_t)(struct ssb_bus *bus, -Index: linux-2.6.23.16/include/linux/ssb/ssb_driver_pci.h +Index: linux-2.6.23.17/include/linux/ssb/ssb_driver_pci.h =================================================================== ---- linux-2.6.23.16.orig/include/linux/ssb/ssb_driver_pci.h 2008-02-13 20:27:17.000000000 +0100 -+++ linux-2.6.23.16/include/linux/ssb/ssb_driver_pci.h 2008-02-19 17:31:47.000000000 +0100 +--- linux-2.6.23.17.orig/include/linux/ssb/ssb_driver_pci.h ++++ linux-2.6.23.17/include/linux/ssb/ssb_driver_pci.h @@ -51,6 +51,11 @@ #define SSB_PCICORE_SBTOPCI1_MASK 0xFC000000 #define SSB_PCICORE_SBTOPCI2 0x0108 /* Backplane to PCI translation 2 (sbtopci2) */ diff --git a/target/linux/brcm47xx/patches-2.6.23/680-ssb-support-8bit-writes.patch b/target/linux/brcm47xx/patches-2.6.23/680-ssb-support-8bit-writes.patch index 82b64a37b6..939fed2f95 100644 --- a/target/linux/brcm47xx/patches-2.6.23/680-ssb-support-8bit-writes.patch +++ b/target/linux/brcm47xx/patches-2.6.23/680-ssb-support-8bit-writes.patch @@ -1,8 +1,8 @@ Add support for 8bit reads/writes to SSB. -Index: linux-2.6.23.16/drivers/ssb/main.c +Index: linux-2.6.23.17/drivers/ssb/main.c =================================================================== ---- linux-2.6.23.16.orig/drivers/ssb/main.c 2008-02-20 14:10:07.000000000 +0100 -+++ linux-2.6.23.16/drivers/ssb/main.c 2008-02-20 18:34:48.000000000 +0100 +--- linux-2.6.23.17.orig/drivers/ssb/main.c ++++ linux-2.6.23.17/drivers/ssb/main.c @@ -507,6 +507,14 @@ error: return err; } @@ -44,10 +44,10 @@ Index: linux-2.6.23.16/drivers/ssb/main.c .write16 = ssb_ssb_write16, .write32 = ssb_ssb_write32, }; -Index: linux-2.6.23.16/drivers/ssb/pci.c +Index: linux-2.6.23.17/drivers/ssb/pci.c =================================================================== ---- linux-2.6.23.16.orig/drivers/ssb/pci.c 2008-02-20 14:10:03.000000000 +0100 -+++ linux-2.6.23.16/drivers/ssb/pci.c 2008-02-20 14:10:07.000000000 +0100 +--- linux-2.6.23.17.orig/drivers/ssb/pci.c ++++ linux-2.6.23.17/drivers/ssb/pci.c @@ -572,6 +572,19 @@ static inline int ssb_pci_assert_buspowe } #endif /* DEBUG */ @@ -99,10 +99,10 @@ Index: linux-2.6.23.16/drivers/ssb/pci.c .write16 = ssb_pci_write16, .write32 = ssb_pci_write32, }; -Index: linux-2.6.23.16/drivers/ssb/pcmcia.c +Index: linux-2.6.23.17/drivers/ssb/pcmcia.c =================================================================== ---- linux-2.6.23.16.orig/drivers/ssb/pcmcia.c 2008-02-20 14:10:03.000000000 +0100 -+++ linux-2.6.23.16/drivers/ssb/pcmcia.c 2008-02-20 14:10:07.000000000 +0100 +--- linux-2.6.23.17.orig/drivers/ssb/pcmcia.c ++++ linux-2.6.23.17/drivers/ssb/pcmcia.c @@ -172,6 +172,22 @@ static int select_core_and_segment(struc return 0; } @@ -158,10 +158,10 @@ Index: linux-2.6.23.16/drivers/ssb/pcmcia.c .write16 = ssb_pcmcia_write16, .write32 = ssb_pcmcia_write32, }; -Index: linux-2.6.23.16/include/linux/ssb/ssb.h +Index: linux-2.6.23.17/include/linux/ssb/ssb.h =================================================================== ---- linux-2.6.23.16.orig/include/linux/ssb/ssb.h 2008-02-20 14:10:07.000000000 +0100 -+++ linux-2.6.23.16/include/linux/ssb/ssb.h 2008-02-20 18:33:21.000000000 +0100 +--- linux-2.6.23.17.orig/include/linux/ssb/ssb.h ++++ linux-2.6.23.17/include/linux/ssb/ssb.h @@ -72,8 +72,10 @@ struct ssb_device; /* Lowlevel read/write operations on the device MMIO. * Internal, don't use that outside of ssb. */ diff --git a/target/linux/brcm47xx/patches-2.6.23/690-mips-allow-pciregister-after-boot.patch b/target/linux/brcm47xx/patches-2.6.23/690-mips-allow-pciregister-after-boot.patch index 132b41dc5d..a52160a872 100644 --- a/target/linux/brcm47xx/patches-2.6.23/690-mips-allow-pciregister-after-boot.patch +++ b/target/linux/brcm47xx/patches-2.6.23/690-mips-allow-pciregister-after-boot.patch @@ -1,10 +1,10 @@ Allow registering PCI devices after early boot. This is an ugly hack and needs to be rewritten before going upstream. -Index: linux-2.6.23.16/arch/mips/pci/pci.c +Index: linux-2.6.23.17/arch/mips/pci/pci.c =================================================================== ---- linux-2.6.23.16.orig/arch/mips/pci/pci.c 2008-02-20 16:06:36.000000000 +0100 -+++ linux-2.6.23.16/arch/mips/pci/pci.c 2008-02-20 16:09:33.000000000 +0100 +--- linux-2.6.23.17.orig/arch/mips/pci/pci.c ++++ linux-2.6.23.17/arch/mips/pci/pci.c @@ -21,6 +21,17 @@ */ int pci_probe_only; @@ -146,10 +146,10 @@ Index: linux-2.6.23.16/arch/mips/pci/pci.c return 0; } -Index: linux-2.6.23.16/drivers/ssb/main.c +Index: linux-2.6.23.17/drivers/ssb/main.c =================================================================== ---- linux-2.6.23.16.orig/drivers/ssb/main.c 2008-02-20 16:06:36.000000000 +0100 -+++ linux-2.6.23.16/drivers/ssb/main.c 2008-02-20 18:33:21.000000000 +0100 +--- linux-2.6.23.17.orig/drivers/ssb/main.c ++++ linux-2.6.23.17/drivers/ssb/main.c @@ -1185,9 +1185,7 @@ static int __init ssb_modinit(void) /* ssb must be initialized after PCI but before the ssb drivers. * That means we must use some initcall between subsys_initcall diff --git a/target/linux/brcm47xx/patches-2.6.23/700-ssb-gigabit-ethernet-driver.patch b/target/linux/brcm47xx/patches-2.6.23/700-ssb-gigabit-ethernet-driver.patch index 1b97d126c9..c396395fd3 100644 --- a/target/linux/brcm47xx/patches-2.6.23/700-ssb-gigabit-ethernet-driver.patch +++ b/target/linux/brcm47xx/patches-2.6.23/700-ssb-gigabit-ethernet-driver.patch @@ -1,7 +1,7 @@ -Index: linux-2.6.23.16/drivers/ssb/Kconfig +Index: linux-2.6.23.17/drivers/ssb/Kconfig =================================================================== ---- linux-2.6.23.16.orig/drivers/ssb/Kconfig 2008-03-19 11:16:18.000000000 +0100 -+++ linux-2.6.23.16/drivers/ssb/Kconfig 2008-03-19 11:16:18.000000000 +0100 +--- linux-2.6.23.17.orig/drivers/ssb/Kconfig ++++ linux-2.6.23.17/drivers/ssb/Kconfig @@ -120,4 +120,13 @@ config SSB_DRIVER_EXTIF If unsure, say N @@ -16,10 +16,10 @@ Index: linux-2.6.23.16/drivers/ssb/Kconfig + If unsure, say N + endmenu -Index: linux-2.6.23.16/drivers/ssb/Makefile +Index: linux-2.6.23.17/drivers/ssb/Makefile =================================================================== ---- linux-2.6.23.16.orig/drivers/ssb/Makefile 2008-03-19 11:16:18.000000000 +0100 -+++ linux-2.6.23.16/drivers/ssb/Makefile 2008-03-19 11:16:18.000000000 +0100 +--- linux-2.6.23.17.orig/drivers/ssb/Makefile ++++ linux-2.6.23.17/drivers/ssb/Makefile @@ -11,6 +11,7 @@ ssb-y += driver_chipcommon.o ssb-$(CONFIG_SSB_DRIVER_MIPS) += driver_mipscore.o ssb-$(CONFIG_SSB_DRIVER_EXTIF) += driver_extif.o @@ -28,10 +28,10 @@ Index: linux-2.6.23.16/drivers/ssb/Makefile # b43 pci-ssb-bridge driver # Not strictly a part of SSB, but kept here for convenience -Index: linux-2.6.23.16/drivers/ssb/driver_gige.c +Index: linux-2.6.23.17/drivers/ssb/driver_gige.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.23.16/drivers/ssb/driver_gige.c 2008-03-19 11:16:18.000000000 +0100 +--- /dev/null ++++ linux-2.6.23.17/drivers/ssb/driver_gige.c @@ -0,0 +1,294 @@ +/* + * Sonics Silicon Backplane @@ -327,10 +327,10 @@ Index: linux-2.6.23.16/drivers/ssb/driver_gige.c +{ + return ssb_driver_register(&ssb_gige_driver); +} -Index: linux-2.6.23.16/include/linux/ssb/ssb_driver_gige.h +Index: linux-2.6.23.17/include/linux/ssb/ssb_driver_gige.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.23.16/include/linux/ssb/ssb_driver_gige.h 2008-03-19 11:16:18.000000000 +0100 +--- /dev/null ++++ linux-2.6.23.17/include/linux/ssb/ssb_driver_gige.h @@ -0,0 +1,174 @@ +#ifndef LINUX_SSB_DRIVER_GIGE_H_ +#define LINUX_SSB_DRIVER_GIGE_H_ @@ -506,10 +506,10 @@ Index: linux-2.6.23.16/include/linux/ssb/ssb_driver_gige.h + +#endif /* CONFIG_SSB_DRIVER_GIGE */ +#endif /* LINUX_SSB_DRIVER_GIGE_H_ */ -Index: linux-2.6.23.16/drivers/ssb/driver_pcicore.c +Index: linux-2.6.23.17/drivers/ssb/driver_pcicore.c =================================================================== ---- linux-2.6.23.16.orig/drivers/ssb/driver_pcicore.c 2008-03-19 11:16:18.000000000 +0100 -+++ linux-2.6.23.16/drivers/ssb/driver_pcicore.c 2008-03-19 11:16:18.000000000 +0100 +--- linux-2.6.23.17.orig/drivers/ssb/driver_pcicore.c ++++ linux-2.6.23.17/drivers/ssb/driver_pcicore.c @@ -60,74 +60,6 @@ static DEFINE_SPINLOCK(cfgspace_lock); /* Core to access the external PCI config space. Can only have one. */ static struct ssb_pcicore *extpci_core; @@ -678,10 +678,10 @@ Index: linux-2.6.23.16/drivers/ssb/driver_pcicore.c static void ssb_pcicore_init_hostmode(struct ssb_pcicore *pc) { u32 val; -Index: linux-2.6.23.16/drivers/ssb/embedded.c +Index: linux-2.6.23.17/drivers/ssb/embedded.c =================================================================== ---- linux-2.6.23.16.orig/drivers/ssb/embedded.c 2008-03-19 11:16:18.000000000 +0100 -+++ linux-2.6.23.16/drivers/ssb/embedded.c 2008-03-19 11:16:18.000000000 +0100 +--- linux-2.6.23.17.orig/drivers/ssb/embedded.c ++++ linux-2.6.23.17/drivers/ssb/embedded.c @@ -10,6 +10,9 @@ #include <linux/ssb/ssb.h> @@ -783,10 +783,10 @@ Index: linux-2.6.23.16/drivers/ssb/embedded.c + + return -ENODEV; +} -Index: linux-2.6.23.16/include/linux/ssb/ssb.h +Index: linux-2.6.23.17/include/linux/ssb/ssb.h =================================================================== ---- linux-2.6.23.16.orig/include/linux/ssb/ssb.h 2008-03-19 11:16:18.000000000 +0100 -+++ linux-2.6.23.16/include/linux/ssb/ssb.h 2008-03-19 11:16:18.000000000 +0100 +--- linux-2.6.23.17.orig/include/linux/ssb/ssb.h ++++ linux-2.6.23.17/include/linux/ssb/ssb.h @@ -422,5 +422,12 @@ extern int ssb_bus_powerup(struct ssb_bu extern u32 ssb_admatch_base(u32 adm); extern u32 ssb_admatch_size(u32 adm); @@ -800,10 +800,10 @@ Index: linux-2.6.23.16/include/linux/ssb/ssb.h +#endif /* CONFIG_SSB_EMBEDDED */ #endif /* LINUX_SSB_H_ */ -Index: linux-2.6.23.16/include/linux/ssb/ssb_driver_pci.h +Index: linux-2.6.23.17/include/linux/ssb/ssb_driver_pci.h =================================================================== ---- linux-2.6.23.16.orig/include/linux/ssb/ssb_driver_pci.h 2008-03-19 11:16:18.000000000 +0100 -+++ linux-2.6.23.16/include/linux/ssb/ssb_driver_pci.h 2008-03-19 11:16:18.000000000 +0100 +--- linux-2.6.23.17.orig/include/linux/ssb/ssb_driver_pci.h ++++ linux-2.6.23.17/include/linux/ssb/ssb_driver_pci.h @@ -1,6 +1,11 @@ #ifndef LINUX_SSB_PCICORE_H_ #define LINUX_SSB_PCICORE_H_ @@ -843,10 +843,10 @@ Index: linux-2.6.23.16/include/linux/ssb/ssb_driver_pci.h + #endif /* CONFIG_SSB_DRIVER_PCICORE */ #endif /* LINUX_SSB_PCICORE_H_ */ -Index: linux-2.6.23.16/drivers/ssb/main.c +Index: linux-2.6.23.17/drivers/ssb/main.c =================================================================== ---- linux-2.6.23.16.orig/drivers/ssb/main.c 2008-03-19 11:16:18.000000000 +0100 -+++ linux-2.6.23.16/drivers/ssb/main.c 2008-03-19 11:16:18.000000000 +0100 +--- linux-2.6.23.17.orig/drivers/ssb/main.c ++++ linux-2.6.23.17/drivers/ssb/main.c @@ -14,6 +14,7 @@ #include <linux/io.h> #include <linux/ssb/ssb.h> @@ -905,10 +905,10 @@ Index: linux-2.6.23.16/drivers/ssb/main.c b43_pci_ssb_bridge_exit(); bus_unregister(&ssb_bustype); } -Index: linux-2.6.23.16/drivers/ssb/ssb_private.h +Index: linux-2.6.23.17/drivers/ssb/ssb_private.h =================================================================== ---- linux-2.6.23.16.orig/drivers/ssb/ssb_private.h 2008-03-19 11:16:15.000000000 +0100 -+++ linux-2.6.23.16/drivers/ssb/ssb_private.h 2008-03-19 11:16:18.000000000 +0100 +--- linux-2.6.23.17.orig/drivers/ssb/ssb_private.h ++++ linux-2.6.23.17/drivers/ssb/ssb_private.h @@ -118,6 +118,8 @@ extern u32 ssb_calc_clock_rate(u32 pllty extern int ssb_devices_freeze(struct ssb_bus *bus); extern int ssb_devices_thaw(struct ssb_bus *bus); @@ -918,10 +918,10 @@ Index: linux-2.6.23.16/drivers/ssb/ssb_private.h /* b43_pci_bridge.c */ #ifdef CONFIG_SSB_PCIHOST -Index: linux-2.6.23.16/drivers/net/tg3.c +Index: linux-2.6.23.17/drivers/net/tg3.c =================================================================== ---- linux-2.6.23.16.orig/drivers/net/tg3.c 2008-03-19 11:16:15.000000000 +0100 -+++ linux-2.6.23.16/drivers/net/tg3.c 2008-03-19 11:16:18.000000000 +0100 +--- linux-2.6.23.17.orig/drivers/net/tg3.c ++++ linux-2.6.23.17/drivers/net/tg3.c @@ -38,6 +38,7 @@ #include <linux/workqueue.h> #include <linux/prefetch.h> @@ -1205,10 +1205,10 @@ Index: linux-2.6.23.16/drivers/net/tg3.c /* The word/byte swap controls here control register access byte * swapping. DMA data byte swapping is controlled in the GRC_MODE -Index: linux-2.6.23.16/drivers/net/tg3.h +Index: linux-2.6.23.17/drivers/net/tg3.h =================================================================== ---- linux-2.6.23.16.orig/drivers/net/tg3.h 2008-03-19 11:16:15.000000000 +0100 -+++ linux-2.6.23.16/drivers/net/tg3.h 2008-03-19 11:16:18.000000000 +0100 +--- linux-2.6.23.17.orig/drivers/net/tg3.h ++++ linux-2.6.23.17/drivers/net/tg3.h @@ -2279,6 +2279,10 @@ struct tg3 { #define TG3_FLG2_PHY_JITTER_BUG 0x20000000 #define TG3_FLG2_NO_FWARE_REPORTED 0x40000000 @@ -1238,11 +1238,11 @@ Index: linux-2.6.23.16/drivers/net/tg3.h struct tg3_hw_stats *hw_stats; dma_addr_t stats_mapping; -Index: linux-2.6.23.16/drivers/ssb/driver_mipscore.c +Index: linux-2.6.23.17/drivers/ssb/driver_mipscore.c =================================================================== ---- linux-2.6.23.16.orig/drivers/ssb/driver_mipscore.c 2008-03-19 11:16:18.000000000 +0100 -+++ linux-2.6.23.16/drivers/ssb/driver_mipscore.c 2008-03-19 11:16:18.000000000 +0100 -@@ -211,6 +211,7 @@ void ssb_mipscore_init(struct ssb_mipsco +--- linux-2.6.23.17.orig/drivers/ssb/driver_mipscore.c ++++ linux-2.6.23.17/drivers/ssb/driver_mipscore.c +@@ -212,6 +212,7 @@ void ssb_mipscore_init(struct ssb_mipsco /* fallthrough */ case SSB_DEV_PCI: case SSB_DEV_ETHERNET: diff --git a/target/linux/brcm47xx/patches-2.6.25/100-board_support.patch b/target/linux/brcm47xx/patches-2.6.25/100-board_support.patch index d094b9ba88..943b3341c1 100644 --- a/target/linux/brcm47xx/patches-2.6.25/100-board_support.patch +++ b/target/linux/brcm47xx/patches-2.6.25/100-board_support.patch @@ -1,7 +1,7 @@ -Index: linux-2.6.25/arch/mips/Kconfig +Index: linux-2.6.25.4/arch/mips/Kconfig =================================================================== ---- linux-2.6.25.orig/arch/mips/Kconfig 2008-04-26 21:56:21.000000000 +0100 -+++ linux-2.6.25/arch/mips/Kconfig 2008-04-26 22:08:17.000000000 +0100 +--- linux-2.6.25.4.orig/arch/mips/Kconfig ++++ linux-2.6.25.4/arch/mips/Kconfig @@ -50,8 +50,10 @@ config BCM47XX select SYS_SUPPORTS_32BIT_KERNEL select SYS_SUPPORTS_LITTLE_ENDIAN @@ -21,10 +21,10 @@ Index: linux-2.6.25/arch/mips/Kconfig config DMA_COHERENT bool -Index: linux-2.6.25/include/asm-mips/bootinfo.h +Index: linux-2.6.25.4/include/asm-mips/bootinfo.h =================================================================== ---- linux-2.6.25.orig/include/asm-mips/bootinfo.h 2008-04-26 21:56:21.000000000 +0100 -+++ linux-2.6.25/include/asm-mips/bootinfo.h 2008-04-26 21:57:10.000000000 +0100 +--- linux-2.6.25.4.orig/include/asm-mips/bootinfo.h ++++ linux-2.6.25.4/include/asm-mips/bootinfo.h @@ -94,6 +94,12 @@ #define MACH_MSP7120_FPGA 5 /* PMC-Sierra MSP7120 Emulation */ #define MACH_MSP_OTHER 255 /* PMC-Sierra unknown board type */ @@ -38,10 +38,10 @@ Index: linux-2.6.25/include/asm-mips/bootinfo.h #define CL_SIZE COMMAND_LINE_SIZE extern char *system_type; -Index: linux-2.6.25/include/linux/pci_ids.h +Index: linux-2.6.25.4/include/linux/pci_ids.h =================================================================== ---- linux-2.6.25.orig/include/linux/pci_ids.h 2008-04-26 21:56:21.000000000 +0100 -+++ linux-2.6.25/include/linux/pci_ids.h 2008-04-26 21:57:10.000000000 +0100 +--- linux-2.6.25.4.orig/include/linux/pci_ids.h ++++ linux-2.6.25.4/include/linux/pci_ids.h @@ -2000,6 +2000,7 @@ #define PCI_DEVICE_ID_TIGON3_5906M 0x1713 #define PCI_DEVICE_ID_BCM4401 0x4401 diff --git a/target/linux/brcm47xx/patches-2.6.25/110-flash_map.patch b/target/linux/brcm47xx/patches-2.6.25/110-flash_map.patch index 11422b71d8..3c16831f68 100644 --- a/target/linux/brcm47xx/patches-2.6.25/110-flash_map.patch +++ b/target/linux/brcm47xx/patches-2.6.25/110-flash_map.patch @@ -1,7 +1,7 @@ -Index: linux-2.6.25/drivers/mtd/maps/Kconfig +Index: linux-2.6.25.4/drivers/mtd/maps/Kconfig =================================================================== ---- linux-2.6.25.orig/drivers/mtd/maps/Kconfig 2008-04-26 21:56:21.000000000 +0100 -+++ linux-2.6.25/drivers/mtd/maps/Kconfig 2008-04-26 21:57:12.000000000 +0100 +--- linux-2.6.25.4.orig/drivers/mtd/maps/Kconfig ++++ linux-2.6.25.4/drivers/mtd/maps/Kconfig @@ -337,6 +337,12 @@ config MTD_CFI_FLAGADM Mapping for the Flaga digital module. If you don't have one, ignore this setting. @@ -15,10 +15,10 @@ Index: linux-2.6.25/drivers/mtd/maps/Kconfig config MTD_WALNUT tristate "Flash device mapped on IBM 405GP Walnut" depends on MTD_JEDECPROBE && WALNUT && !PPC_MERGE -Index: linux-2.6.25/drivers/mtd/maps/Makefile +Index: linux-2.6.25.4/drivers/mtd/maps/Makefile =================================================================== ---- linux-2.6.25.orig/drivers/mtd/maps/Makefile 2008-04-26 21:56:21.000000000 +0100 -+++ linux-2.6.25/drivers/mtd/maps/Makefile 2008-04-26 21:57:12.000000000 +0100 +--- linux-2.6.25.4.orig/drivers/mtd/maps/Makefile ++++ linux-2.6.25.4/drivers/mtd/maps/Makefile @@ -31,6 +31,7 @@ obj-$(CONFIG_MTD_PMC_MSP_RAMROOT)+= pmcm obj-$(CONFIG_MTD_PCMCIA) += pcmciamtd.o obj-$(CONFIG_MTD_RPXLITE) += rpxlite.o diff --git a/target/linux/brcm47xx/patches-2.6.25/130-remove_scache.patch b/target/linux/brcm47xx/patches-2.6.25/130-remove_scache.patch index ae66ab7a64..7d215a1a97 100644 --- a/target/linux/brcm47xx/patches-2.6.25/130-remove_scache.patch +++ b/target/linux/brcm47xx/patches-2.6.25/130-remove_scache.patch @@ -1,7 +1,7 @@ -Index: linux-2.6.25/arch/mips/Kconfig +Index: linux-2.6.25.4/arch/mips/Kconfig =================================================================== ---- linux-2.6.25.orig/arch/mips/Kconfig 2008-04-26 21:57:10.000000000 +0100 -+++ linux-2.6.25/arch/mips/Kconfig 2008-04-26 21:57:13.000000000 +0100 +--- linux-2.6.25.4.orig/arch/mips/Kconfig ++++ linux-2.6.25.4/arch/mips/Kconfig @@ -228,7 +228,6 @@ config MIPS_MALTA select I8259 select MIPS_BOARDS_GEN @@ -24,10 +24,10 @@ Index: linux-2.6.25/arch/mips/Kconfig config R5000_CPU_SCACHE bool select BOARD_SCACHE -Index: linux-2.6.25/arch/mips/kernel/cpu-probe.c +Index: linux-2.6.25.4/arch/mips/kernel/cpu-probe.c =================================================================== ---- linux-2.6.25.orig/arch/mips/kernel/cpu-probe.c 2008-04-26 21:56:21.000000000 +0100 -+++ linux-2.6.25/arch/mips/kernel/cpu-probe.c 2008-04-26 21:57:13.000000000 +0100 +--- linux-2.6.25.4.orig/arch/mips/kernel/cpu-probe.c ++++ linux-2.6.25.4/arch/mips/kernel/cpu-probe.c @@ -704,6 +704,8 @@ static inline void cpu_probe_mips(struct break; case PRID_IMP_25KF: @@ -37,10 +37,10 @@ Index: linux-2.6.25/arch/mips/kernel/cpu-probe.c break; case PRID_IMP_34K: c->cputype = CPU_34K; -Index: linux-2.6.25/arch/mips/mm/c-r4k.c +Index: linux-2.6.25.4/arch/mips/mm/c-r4k.c =================================================================== ---- linux-2.6.25.orig/arch/mips/mm/c-r4k.c 2008-04-26 21:56:21.000000000 +0100 -+++ linux-2.6.25/arch/mips/mm/c-r4k.c 2008-04-26 22:08:15.000000000 +0100 +--- linux-2.6.25.4.orig/arch/mips/mm/c-r4k.c ++++ linux-2.6.25.4/arch/mips/mm/c-r4k.c @@ -1103,7 +1103,6 @@ static void __init loongson2_sc_init(voi extern int r5k_sc_init(void); @@ -84,10 +84,10 @@ Index: linux-2.6.25/arch/mips/mm/c-r4k.c /* compute a couple of other cache variables */ c->scache.waysize = scache_size / c->scache.ways; -Index: linux-2.6.25/arch/mips/mm/Makefile +Index: linux-2.6.25.4/arch/mips/mm/Makefile =================================================================== ---- linux-2.6.25.orig/arch/mips/mm/Makefile 2008-04-26 21:56:21.000000000 +0100 -+++ linux-2.6.25/arch/mips/mm/Makefile 2008-04-26 21:57:13.000000000 +0100 +--- linux-2.6.25.4.orig/arch/mips/mm/Makefile ++++ linux-2.6.25.4/arch/mips/mm/Makefile @@ -32,6 +32,5 @@ obj-$(CONFIG_CPU_VR41XX) += c-r4k.o cex- obj-$(CONFIG_IP22_CPU_SCACHE) += sc-ip22.o obj-$(CONFIG_R5000_CPU_SCACHE) += sc-r5k.o diff --git a/target/linux/brcm47xx/patches-2.6.25/150-cpu_fixes.patch b/target/linux/brcm47xx/patches-2.6.25/150-cpu_fixes.patch index a5f9a88ced..fb91dfae74 100644 --- a/target/linux/brcm47xx/patches-2.6.25/150-cpu_fixes.patch +++ b/target/linux/brcm47xx/patches-2.6.25/150-cpu_fixes.patch @@ -1,7 +1,7 @@ -Index: linux-2.6.25/arch/mips/kernel/genex.S +Index: linux-2.6.25.4/arch/mips/kernel/genex.S =================================================================== ---- linux-2.6.25.orig/arch/mips/kernel/genex.S 2008-04-26 21:56:21.000000000 +0100 -+++ linux-2.6.25/arch/mips/kernel/genex.S 2008-04-26 21:57:14.000000000 +0100 +--- linux-2.6.25.4.orig/arch/mips/kernel/genex.S ++++ linux-2.6.25.4/arch/mips/kernel/genex.S @@ -51,6 +51,10 @@ NESTED(except_vec1_generic, 0, sp) NESTED(except_vec3_generic, 0, sp) .set push @@ -13,10 +13,10 @@ Index: linux-2.6.25/arch/mips/kernel/genex.S #if R5432_CP0_INTERRUPT_WAR mfc0 k0, CP0_INDEX #endif -Index: linux-2.6.25/arch/mips/mm/c-r4k.c +Index: linux-2.6.25.4/arch/mips/mm/c-r4k.c =================================================================== ---- linux-2.6.25.orig/arch/mips/mm/c-r4k.c 2008-04-26 21:57:13.000000000 +0100 -+++ linux-2.6.25/arch/mips/mm/c-r4k.c 2008-04-26 21:57:14.000000000 +0100 +--- linux-2.6.25.4.orig/arch/mips/mm/c-r4k.c ++++ linux-2.6.25.4/arch/mips/mm/c-r4k.c @@ -33,6 +33,9 @@ #include <asm/cacheflush.h> /* for run_uncached() */ @@ -114,10 +114,10 @@ Index: linux-2.6.25/arch/mips/mm/c-r4k.c coherency_setup(); +#endif } -Index: linux-2.6.25/arch/mips/mm/tlbex.c +Index: linux-2.6.25.4/arch/mips/mm/tlbex.c =================================================================== ---- linux-2.6.25.orig/arch/mips/mm/tlbex.c 2008-04-26 21:56:21.000000000 +0100 -+++ linux-2.6.25/arch/mips/mm/tlbex.c 2008-04-26 21:57:14.000000000 +0100 +--- linux-2.6.25.4.orig/arch/mips/mm/tlbex.c ++++ linux-2.6.25.4/arch/mips/mm/tlbex.c @@ -677,6 +677,9 @@ static void __cpuinit build_r4000_tlb_re /* No need for uasm_i_nop */ } @@ -138,10 +138,10 @@ Index: linux-2.6.25/arch/mips/mm/tlbex.c #ifdef CONFIG_64BIT build_get_pmde64(p, l, r, pte, ptr); /* get pmd in ptr */ #else -Index: linux-2.6.25/include/asm-mips/r4kcache.h +Index: linux-2.6.25.4/include/asm-mips/r4kcache.h =================================================================== ---- linux-2.6.25.orig/include/asm-mips/r4kcache.h 2008-04-26 21:56:21.000000000 +0100 -+++ linux-2.6.25/include/asm-mips/r4kcache.h 2008-04-26 21:57:14.000000000 +0100 +--- linux-2.6.25.4.orig/include/asm-mips/r4kcache.h ++++ linux-2.6.25.4/include/asm-mips/r4kcache.h @@ -17,6 +17,20 @@ #include <asm/cpu-features.h> #include <asm/mipsmtregs.h> @@ -358,10 +358,10 @@ Index: linux-2.6.25/include/asm-mips/r4kcache.h +__BUILD_BLAST_CACHE_RANGE(inv_s, scache, Hit_Invalidate_SD,,, ) #endif /* _ASM_R4KCACHE_H */ -Index: linux-2.6.25/include/asm-mips/stackframe.h +Index: linux-2.6.25.4/include/asm-mips/stackframe.h =================================================================== ---- linux-2.6.25.orig/include/asm-mips/stackframe.h 2008-04-26 21:56:21.000000000 +0100 -+++ linux-2.6.25/include/asm-mips/stackframe.h 2008-04-26 21:57:14.000000000 +0100 +--- linux-2.6.25.4.orig/include/asm-mips/stackframe.h ++++ linux-2.6.25.4/include/asm-mips/stackframe.h @@ -359,6 +359,10 @@ .macro RESTORE_SP_AND_RET LONG_L sp, PT_R29(sp) diff --git a/target/linux/brcm47xx/patches-2.6.25/160-kmap_coherent.patch b/target/linux/brcm47xx/patches-2.6.25/160-kmap_coherent.patch index 612ab981a6..3db02d663d 100644 --- a/target/linux/brcm47xx/patches-2.6.25/160-kmap_coherent.patch +++ b/target/linux/brcm47xx/patches-2.6.25/160-kmap_coherent.patch @@ -1,7 +1,7 @@ -Index: linux-2.6.25.1/arch/mips/mm/init.c +Index: linux-2.6.25.4/arch/mips/mm/init.c =================================================================== ---- linux-2.6.25.1.orig/arch/mips/mm/init.c 2008-05-18 11:32:33.000000000 +0100 -+++ linux-2.6.25.1/arch/mips/mm/init.c 2008-05-18 21:05:57.000000000 +0100 +--- linux-2.6.25.4.orig/arch/mips/mm/init.c ++++ linux-2.6.25.4/arch/mips/mm/init.c @@ -211,7 +211,7 @@ void copy_user_highpage(struct page *to, void *vfrom, *vto; @@ -29,10 +29,10 @@ Index: linux-2.6.25.1/arch/mips/mm/init.c page_mapped(page) && !Page_dcache_dirty(page)) { void *vfrom = kmap_coherent(page, vaddr) + (vaddr & ~PAGE_MASK); memcpy(dst, vfrom, len); -Index: linux-2.6.25.1/include/asm-mips/mach-bcm47xx/cpu-feature-overrides.h +Index: linux-2.6.25.4/include/asm-mips/mach-bcm47xx/cpu-feature-overrides.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.25.1/include/asm-mips/mach-bcm47xx/cpu-feature-overrides.h 2008-05-18 11:32:40.000000000 +0100 +--- /dev/null ++++ linux-2.6.25.4/include/asm-mips/mach-bcm47xx/cpu-feature-overrides.h @@ -0,0 +1,13 @@ +/* + * This file is subject to the terms and conditions of the GNU General Public @@ -47,10 +47,10 @@ Index: linux-2.6.25.1/include/asm-mips/mach-bcm47xx/cpu-feature-overrides.h +#define cpu_use_kmap_coherent 0 + +#endif /* __ASM_MACH_BCM47XX_CPU_FEATURE_OVERRIDES_H */ -Index: linux-2.6.25.1/include/asm-mips/cpu-features.h +Index: linux-2.6.25.4/include/asm-mips/cpu-features.h =================================================================== ---- linux-2.6.25.1.orig/include/asm-mips/cpu-features.h 2008-05-18 11:32:33.000000000 +0100 -+++ linux-2.6.25.1/include/asm-mips/cpu-features.h 2008-05-18 11:32:40.000000000 +0100 +--- linux-2.6.25.4.orig/include/asm-mips/cpu-features.h ++++ linux-2.6.25.4/include/asm-mips/cpu-features.h @@ -101,6 +101,9 @@ #ifndef cpu_has_pindexed_dcache #define cpu_has_pindexed_dcache (cpu_data[0].dcache.flags & MIPS_CACHE_PINDEX) @@ -61,10 +61,10 @@ Index: linux-2.6.25.1/include/asm-mips/cpu-features.h /* * I-Cache snoops remote store. This only matters on SMP. Some multiprocessors -Index: linux-2.6.25.1/arch/mips/mm/c-r4k.c +Index: linux-2.6.25.4/arch/mips/mm/c-r4k.c =================================================================== ---- linux-2.6.25.1.orig/arch/mips/mm/c-r4k.c 2008-05-18 21:06:36.000000000 +0100 -+++ linux-2.6.25.1/arch/mips/mm/c-r4k.c 2008-05-18 21:09:28.000000000 +0100 +--- linux-2.6.25.4.orig/arch/mips/mm/c-r4k.c ++++ linux-2.6.25.4/arch/mips/mm/c-r4k.c @@ -484,7 +484,7 @@ static inline void local_r4k_flush_cache * Use kmap_coherent or kmap_atomic to do flushes for * another ASID than the current one. diff --git a/target/linux/brcm47xx/patches-2.6.25/220-bcm5354.patch b/target/linux/brcm47xx/patches-2.6.25/220-bcm5354.patch index 2e1f77c5d0..6e6f10e4c5 100644 --- a/target/linux/brcm47xx/patches-2.6.25/220-bcm5354.patch +++ b/target/linux/brcm47xx/patches-2.6.25/220-bcm5354.patch @@ -1,7 +1,7 @@ -Index: linux-2.6.25/drivers/ssb/driver_chipcommon.c +Index: linux-2.6.25.4/drivers/ssb/driver_chipcommon.c =================================================================== ---- linux-2.6.25.orig/drivers/ssb/driver_chipcommon.c 2008-04-27 21:36:52.000000000 +0100 -+++ linux-2.6.25/drivers/ssb/driver_chipcommon.c 2008-04-27 21:43:50.000000000 +0100 +--- linux-2.6.25.4.orig/drivers/ssb/driver_chipcommon.c ++++ linux-2.6.25.4/drivers/ssb/driver_chipcommon.c @@ -270,6 +270,8 @@ void ssb_chipco_resume(struct ssb_chipco void ssb_chipco_get_clockcpu(struct ssb_chipcommon *cc, u32 *plltype, u32 *n, u32 *m) @@ -20,10 +20,10 @@ Index: linux-2.6.25/drivers/ssb/driver_chipcommon.c *n = chipco_read32(cc, SSB_CHIPCO_CLOCK_N); *plltype = (cc->capabilities & SSB_CHIPCO_CAP_PLLT); switch (*plltype) { -Index: linux-2.6.25/drivers/ssb/driver_mipscore.c +Index: linux-2.6.25.4/drivers/ssb/driver_mipscore.c =================================================================== ---- linux-2.6.25.orig/drivers/ssb/driver_mipscore.c 2008-04-17 03:49:44.000000000 +0100 -+++ linux-2.6.25/drivers/ssb/driver_mipscore.c 2008-04-27 21:43:50.000000000 +0100 +--- linux-2.6.25.4.orig/drivers/ssb/driver_mipscore.c ++++ linux-2.6.25.4/drivers/ssb/driver_mipscore.c @@ -161,6 +161,8 @@ u32 ssb_cpu_clock(struct ssb_mipscore *m if ((pll_type == SSB_PLLTYPE_5) || (bus->chip_id == 0x5365)) { @@ -33,10 +33,10 @@ Index: linux-2.6.25/drivers/ssb/driver_mipscore.c } else { rate = ssb_calc_clock_rate(pll_type, n, m); } -Index: linux-2.6.25/drivers/ssb/main.c +Index: linux-2.6.25.4/drivers/ssb/main.c =================================================================== ---- linux-2.6.25.orig/drivers/ssb/main.c 2008-04-17 03:49:44.000000000 +0100 -+++ linux-2.6.25/drivers/ssb/main.c 2008-04-27 21:43:50.000000000 +0100 +--- linux-2.6.25.4.orig/drivers/ssb/main.c ++++ linux-2.6.25.4/drivers/ssb/main.c @@ -867,6 +867,8 @@ u32 ssb_clockspeed(struct ssb_bus *bus) if (bus->chip_id == 0x5365) { diff --git a/target/linux/brcm47xx/patches-2.6.25/250-ohci-ssb-usb2.patch b/target/linux/brcm47xx/patches-2.6.25/250-ohci-ssb-usb2.patch index b4575c43a4..c33af0071d 100644 --- a/target/linux/brcm47xx/patches-2.6.25/250-ohci-ssb-usb2.patch +++ b/target/linux/brcm47xx/patches-2.6.25/250-ohci-ssb-usb2.patch @@ -1,7 +1,7 @@ -Index: linux-2.6.25/drivers/usb/host/ohci-ssb.c +Index: linux-2.6.25.4/drivers/usb/host/ohci-ssb.c =================================================================== ---- linux-2.6.25.orig/drivers/usb/host/ohci-ssb.c 2008-04-26 21:56:21.000000000 +0100 -+++ linux-2.6.25/drivers/usb/host/ohci-ssb.c 2008-04-26 22:07:53.000000000 +0100 +--- linux-2.6.25.4.orig/drivers/usb/host/ohci-ssb.c ++++ linux-2.6.25.4/drivers/usb/host/ohci-ssb.c @@ -142,10 +142,59 @@ static int ssb_ohci_attach(struct ssb_de int err = -ENOMEM; u32 tmp, flags = 0; @@ -64,7 +64,7 @@ Index: linux-2.6.25/drivers/usb/host/ohci-ssb.c hcd = usb_create_hcd(&ssb_ohci_hc_driver, dev->dev, dev->dev->bus_id); -@@ -235,6 +284,7 @@ static int ssb_ohci_resume(struct ssb_de +@@ -236,6 +285,7 @@ static int ssb_ohci_resume(struct ssb_de static const struct ssb_device_id ssb_ohci_table[] = { SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_USB11_HOSTDEV, SSB_ANY_REV), SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_USB11_HOST, SSB_ANY_REV), diff --git a/target/linux/brcm47xx/patches-2.6.25/260-ohci-set-dma-mask.patch b/target/linux/brcm47xx/patches-2.6.25/260-ohci-set-dma-mask.patch index afeeaa3f49..a2a01df6a9 100644 --- a/target/linux/brcm47xx/patches-2.6.25/260-ohci-set-dma-mask.patch +++ b/target/linux/brcm47xx/patches-2.6.25/260-ohci-set-dma-mask.patch @@ -1,7 +1,7 @@ -Index: linux-2.6.25/drivers/usb/host/ohci-ssb.c +Index: linux-2.6.25.4/drivers/usb/host/ohci-ssb.c =================================================================== ---- linux-2.6.25.orig/drivers/usb/host/ohci-ssb.c 2008-04-26 21:57:17.000000000 +0100 -+++ linux-2.6.25/drivers/usb/host/ohci-ssb.c 2008-04-26 21:57:17.000000000 +0100 +--- linux-2.6.25.4.orig/drivers/usb/host/ohci-ssb.c ++++ linux-2.6.25.4/drivers/usb/host/ohci-ssb.c @@ -195,6 +195,11 @@ static int ssb_ohci_attach(struct ssb_de else ssb_device_enable(dev, 0); diff --git a/target/linux/brcm47xx/patches-2.6.25/300-fork_cacheflush.patch b/target/linux/brcm47xx/patches-2.6.25/300-fork_cacheflush.patch index a13ba435fa..93a7ac86f2 100644 --- a/target/linux/brcm47xx/patches-2.6.25/300-fork_cacheflush.patch +++ b/target/linux/brcm47xx/patches-2.6.25/300-fork_cacheflush.patch @@ -1,7 +1,7 @@ -Index: linux-2.6.25/include/asm-mips/cacheflush.h +Index: linux-2.6.25.4/include/asm-mips/cacheflush.h =================================================================== ---- linux-2.6.25.orig/include/asm-mips/cacheflush.h 2008-04-26 21:56:21.000000000 +0100 -+++ linux-2.6.25/include/asm-mips/cacheflush.h 2008-04-26 21:57:18.000000000 +0100 +--- linux-2.6.25.4.orig/include/asm-mips/cacheflush.h ++++ linux-2.6.25.4/include/asm-mips/cacheflush.h @@ -32,7 +32,7 @@ extern void (*flush_cache_all)(void); extern void (*__flush_cache_all)(void); diff --git a/target/linux/brcm47xx/patches-2.6.25/310-no_highpage.patch b/target/linux/brcm47xx/patches-2.6.25/310-no_highpage.patch index c43332b547..fc25172dd2 100644 --- a/target/linux/brcm47xx/patches-2.6.25/310-no_highpage.patch +++ b/target/linux/brcm47xx/patches-2.6.25/310-no_highpage.patch @@ -1,7 +1,7 @@ -Index: linux-2.6.25/arch/mips/mm/init.c +Index: linux-2.6.25.4/arch/mips/mm/init.c =================================================================== ---- linux-2.6.25.orig/arch/mips/mm/init.c 2008-04-26 21:57:15.000000000 +0100 -+++ linux-2.6.25/arch/mips/mm/init.c 2008-04-26 21:57:19.000000000 +0100 +--- linux-2.6.25.4.orig/arch/mips/mm/init.c ++++ linux-2.6.25.4/arch/mips/mm/init.c @@ -205,32 +205,6 @@ void kunmap_coherent(void) preempt_check_resched(); } @@ -35,10 +35,10 @@ Index: linux-2.6.25/arch/mips/mm/init.c void copy_to_user_page(struct vm_area_struct *vma, struct page *page, unsigned long vaddr, void *dst, const void *src, unsigned long len) -Index: linux-2.6.25/include/asm-mips/page.h +Index: linux-2.6.25.4/include/asm-mips/page.h =================================================================== ---- linux-2.6.25.orig/include/asm-mips/page.h 2008-04-26 21:56:21.000000000 +0100 -+++ linux-2.6.25/include/asm-mips/page.h 2008-04-26 21:57:19.000000000 +0100 +--- linux-2.6.25.4.orig/include/asm-mips/page.h ++++ linux-2.6.25.4/include/asm-mips/page.h @@ -32,6 +32,7 @@ #ifndef __ASSEMBLY__ diff --git a/target/linux/brcm47xx/patches-2.6.25/400-arch-bcm47xx.patch b/target/linux/brcm47xx/patches-2.6.25/400-arch-bcm47xx.patch index df041da653..78dc4dafdd 100644 --- a/target/linux/brcm47xx/patches-2.6.25/400-arch-bcm47xx.patch +++ b/target/linux/brcm47xx/patches-2.6.25/400-arch-bcm47xx.patch @@ -1,7 +1,7 @@ -Index: linux-2.6.25.1/arch/mips/bcm47xx/irq.c +Index: linux-2.6.25.4/arch/mips/bcm47xx/irq.c =================================================================== ---- linux-2.6.25.1.orig/arch/mips/bcm47xx/irq.c 2008-05-14 14:36:58.000000000 +0100 -+++ linux-2.6.25.1/arch/mips/bcm47xx/irq.c 2008-05-14 14:37:06.000000000 +0100 +--- linux-2.6.25.4.orig/arch/mips/bcm47xx/irq.c ++++ linux-2.6.25.4/arch/mips/bcm47xx/irq.c @@ -1,5 +1,6 @@ /* * Copyright (C) 2004 Florian Schirmer <jolt@tuxbox.org> @@ -49,10 +49,10 @@ Index: linux-2.6.25.1/arch/mips/bcm47xx/irq.c + + return res; +} -Index: linux-2.6.25.1/arch/mips/bcm47xx/setup.c +Index: linux-2.6.25.4/arch/mips/bcm47xx/setup.c =================================================================== ---- linux-2.6.25.1.orig/arch/mips/bcm47xx/setup.c 2008-05-14 14:36:58.000000000 +0100 -+++ linux-2.6.25.1/arch/mips/bcm47xx/setup.c 2008-05-14 14:37:06.000000000 +0100 +--- linux-2.6.25.4.orig/arch/mips/bcm47xx/setup.c ++++ linux-2.6.25.4/arch/mips/bcm47xx/setup.c @@ -2,7 +2,7 @@ * Copyright (C) 2004 Florian Schirmer <jolt@tuxbox.org> * Copyright (C) 2005 Waldemar Brodkorb <wbx@openwrt.org> @@ -310,10 +310,10 @@ Index: linux-2.6.25.1/arch/mips/bcm47xx/setup.c + return 0; +} +device_initcall(bcm47xx_register_gpiodev); -Index: linux-2.6.25.1/arch/mips/bcm47xx/time.c +Index: linux-2.6.25.4/arch/mips/bcm47xx/time.c =================================================================== ---- linux-2.6.25.1.orig/arch/mips/bcm47xx/time.c 2008-05-14 14:36:58.000000000 +0100 -+++ linux-2.6.25.1/arch/mips/bcm47xx/time.c 2008-05-14 14:37:06.000000000 +0100 +--- linux-2.6.25.4.orig/arch/mips/bcm47xx/time.c ++++ linux-2.6.25.4/arch/mips/bcm47xx/time.c @@ -22,11 +22,17 @@ * 675 Mass Ave, Cambridge, MA 02139, USA. */ @@ -334,10 +334,10 @@ Index: linux-2.6.25.1/arch/mips/bcm47xx/time.c void __init plat_time_init(void) { -Index: linux-2.6.25.1/arch/mips/bcm47xx/nvram.c +Index: linux-2.6.25.4/arch/mips/bcm47xx/nvram.c =================================================================== ---- linux-2.6.25.1.orig/arch/mips/bcm47xx/nvram.c 2008-05-14 14:36:58.000000000 +0100 -+++ linux-2.6.25.1/arch/mips/bcm47xx/nvram.c 2008-05-14 14:37:06.000000000 +0100 +--- linux-2.6.25.4.orig/arch/mips/bcm47xx/nvram.c ++++ linux-2.6.25.4/arch/mips/bcm47xx/nvram.c @@ -24,10 +24,10 @@ #include <asm/io.h> #include <asm/uaccess.h> @@ -360,20 +360,20 @@ Index: linux-2.6.25.1/arch/mips/bcm47xx/nvram.c struct nvram_header *header; int i; u32 base, lim, off; -Index: linux-2.6.25.1/arch/mips/bcm47xx/Makefile +Index: linux-2.6.25.4/arch/mips/bcm47xx/Makefile =================================================================== ---- linux-2.6.25.1.orig/arch/mips/bcm47xx/Makefile 2008-05-14 14:36:58.000000000 +0100 -+++ linux-2.6.25.1/arch/mips/bcm47xx/Makefile 2008-05-14 14:37:06.000000000 +0100 +--- linux-2.6.25.4.orig/arch/mips/bcm47xx/Makefile ++++ linux-2.6.25.4/arch/mips/bcm47xx/Makefile @@ -3,4 +3,4 @@ # under Linux. # -obj-y := gpio.o irq.o prom.o serial.o setup.o time.o wgt634u.o +obj-y := cfe_env.o gpio.o irq.o nvram.o prom.o serial.o setup.o time.o wgt634u.o -Index: linux-2.6.25.1/arch/mips/Kconfig +Index: linux-2.6.25.4/arch/mips/Kconfig =================================================================== ---- linux-2.6.25.1.orig/arch/mips/Kconfig 2008-05-14 14:47:43.000000000 +0100 -+++ linux-2.6.25.1/arch/mips/Kconfig 2008-05-14 14:48:15.000000000 +0100 +--- linux-2.6.25.4.orig/arch/mips/Kconfig ++++ linux-2.6.25.4/arch/mips/Kconfig @@ -54,6 +54,7 @@ config BCM47XX select SSB_DRIVER_MIPS select SSB_DRIVER_EXTIF diff --git a/target/linux/brcm47xx/patches-2.6.25/500-lzma_initramfs.patch b/target/linux/brcm47xx/patches-2.6.25/500-lzma_initramfs.patch index 59c1d1d754..b67c875e31 100644 --- a/target/linux/brcm47xx/patches-2.6.25/500-lzma_initramfs.patch +++ b/target/linux/brcm47xx/patches-2.6.25/500-lzma_initramfs.patch @@ -1,7 +1,7 @@ -Index: linux-2.6.25/scripts/gen_initramfs_list.sh +Index: linux-2.6.25.4/scripts/gen_initramfs_list.sh =================================================================== ---- linux-2.6.25.orig/scripts/gen_initramfs_list.sh 2008-04-26 21:57:00.000000000 +0100 -+++ linux-2.6.25/scripts/gen_initramfs_list.sh 2008-04-26 21:57:20.000000000 +0100 +--- linux-2.6.25.4.orig/scripts/gen_initramfs_list.sh ++++ linux-2.6.25.4/scripts/gen_initramfs_list.sh @@ -287,7 +287,7 @@ if [ ! -z ${output_file} ]; then if [ "${is_cpio_compressed}" = "compressed" ]; then cat ${cpio_tfile} > ${output_file} @@ -11,10 +11,10 @@ Index: linux-2.6.25/scripts/gen_initramfs_list.sh fi [ -z ${cpio_file} ] && rm ${cpio_tfile} fi -Index: linux-2.6.25/init/initramfs.c +Index: linux-2.6.25.4/init/initramfs.c =================================================================== ---- linux-2.6.25.orig/init/initramfs.c 2008-04-26 21:56:21.000000000 +0100 -+++ linux-2.6.25/init/initramfs.c 2008-04-26 21:57:20.000000000 +0100 +--- linux-2.6.25.4.orig/init/initramfs.c ++++ linux-2.6.25.4/init/initramfs.c @@ -441,6 +441,69 @@ static void __init flush_window(void) outcnt = 0; } diff --git a/target/linux/brcm47xx/patches-2.6.25/601-mips-remove-pci-collision-check.patch b/target/linux/brcm47xx/patches-2.6.25/601-mips-remove-pci-collision-check.patch index aa3ac25168..ed8938f287 100644 --- a/target/linux/brcm47xx/patches-2.6.25/601-mips-remove-pci-collision-check.patch +++ b/target/linux/brcm47xx/patches-2.6.25/601-mips-remove-pci-collision-check.patch @@ -2,10 +2,10 @@ The SSB pcicore driver does create some MMIO resource collisions. However, the pcicore PCI-fixup routine fixes these collisions afterwards. Remove this sanity check for now until we find a better solution. --mb -Index: linux-2.6.25.1/arch/mips/pci/pci.c +Index: linux-2.6.25.4/arch/mips/pci/pci.c =================================================================== ---- linux-2.6.25.1.orig/arch/mips/pci/pci.c 2008-05-08 22:37:55.000000000 +0100 -+++ linux-2.6.25.1/arch/mips/pci/pci.c 2008-05-09 07:39:55.000000000 +0100 +--- linux-2.6.25.4.orig/arch/mips/pci/pci.c ++++ linux-2.6.25.4/arch/mips/pci/pci.c @@ -182,12 +182,10 @@ static int pcibios_enable_resources(stru if ((idx == PCI_ROM_RESOURCE) && (!(r->flags & IORESOURCE_ROM_ENABLE))) diff --git a/target/linux/brcm47xx/patches-2.6.25/620-ssb-modinit-fix.patch b/target/linux/brcm47xx/patches-2.6.25/620-ssb-modinit-fix.patch index 1efaf7c3f8..4e31b578dd 100644 --- a/target/linux/brcm47xx/patches-2.6.25/620-ssb-modinit-fix.patch +++ b/target/linux/brcm47xx/patches-2.6.25/620-ssb-modinit-fix.patch @@ -1,7 +1,7 @@ -Index: linux-2.6.25.1/drivers/ssb/main.c +Index: linux-2.6.25.4/drivers/ssb/main.c =================================================================== ---- linux-2.6.25.1.orig/drivers/ssb/main.c 2008-05-10 08:35:23.000000000 +0100 -+++ linux-2.6.25.1/drivers/ssb/main.c 2008-05-10 09:04:53.000000000 +0100 +--- linux-2.6.25.4.orig/drivers/ssb/main.c ++++ linux-2.6.25.4/drivers/ssb/main.c @@ -1173,7 +1173,9 @@ static int __init ssb_modinit(void) /* ssb must be initialized after PCI but before the ssb drivers. * That means we must use some initcall between subsys_initcall diff --git a/target/linux/brcm47xx/patches-2.6.25/680-ssb-support-8bit-writes.patch b/target/linux/brcm47xx/patches-2.6.25/680-ssb-support-8bit-writes.patch index e3f7a6da64..975d72d4e1 100644 --- a/target/linux/brcm47xx/patches-2.6.25/680-ssb-support-8bit-writes.patch +++ b/target/linux/brcm47xx/patches-2.6.25/680-ssb-support-8bit-writes.patch @@ -1,8 +1,8 @@ Add support for 8bit reads/writes to SSB. -Index: linux-2.6.25.1/drivers/ssb/main.c +Index: linux-2.6.25.4/drivers/ssb/main.c =================================================================== ---- linux-2.6.25.1.orig/drivers/ssb/main.c 2008-05-10 09:04:53.000000000 +0100 -+++ linux-2.6.25.1/drivers/ssb/main.c 2008-05-10 09:05:38.000000000 +0100 +--- linux-2.6.25.4.orig/drivers/ssb/main.c ++++ linux-2.6.25.4/drivers/ssb/main.c @@ -508,6 +508,14 @@ error: return err; } @@ -44,10 +44,10 @@ Index: linux-2.6.25.1/drivers/ssb/main.c .write16 = ssb_ssb_write16, .write32 = ssb_ssb_write32, }; -Index: linux-2.6.25.1/drivers/ssb/pci.c +Index: linux-2.6.25.4/drivers/ssb/pci.c =================================================================== ---- linux-2.6.25.1.orig/drivers/ssb/pci.c 2008-05-10 09:04:53.000000000 +0100 -+++ linux-2.6.25.1/drivers/ssb/pci.c 2008-05-10 09:05:38.000000000 +0100 +--- linux-2.6.25.4.orig/drivers/ssb/pci.c ++++ linux-2.6.25.4/drivers/ssb/pci.c @@ -577,6 +577,19 @@ static inline int ssb_pci_assert_buspowe } #endif /* DEBUG */ @@ -99,10 +99,10 @@ Index: linux-2.6.25.1/drivers/ssb/pci.c .write16 = ssb_pci_write16, .write32 = ssb_pci_write32, }; -Index: linux-2.6.25.1/drivers/ssb/pcmcia.c +Index: linux-2.6.25.4/drivers/ssb/pcmcia.c =================================================================== ---- linux-2.6.25.1.orig/drivers/ssb/pcmcia.c 2008-05-10 09:04:53.000000000 +0100 -+++ linux-2.6.25.1/drivers/ssb/pcmcia.c 2008-05-10 09:05:38.000000000 +0100 +--- linux-2.6.25.4.orig/drivers/ssb/pcmcia.c ++++ linux-2.6.25.4/drivers/ssb/pcmcia.c @@ -172,6 +172,22 @@ static int select_core_and_segment(struc return 0; } @@ -158,10 +158,10 @@ Index: linux-2.6.25.1/drivers/ssb/pcmcia.c .write16 = ssb_pcmcia_write16, .write32 = ssb_pcmcia_write32, }; -Index: linux-2.6.25.1/include/linux/ssb/ssb.h +Index: linux-2.6.25.4/include/linux/ssb/ssb.h =================================================================== ---- linux-2.6.25.1.orig/include/linux/ssb/ssb.h 2008-05-10 09:04:53.000000000 +0100 -+++ linux-2.6.25.1/include/linux/ssb/ssb.h 2008-05-10 09:05:38.000000000 +0100 +--- linux-2.6.25.4.orig/include/linux/ssb/ssb.h ++++ linux-2.6.25.4/include/linux/ssb/ssb.h @@ -72,8 +72,10 @@ struct ssb_device; /* Lowlevel read/write operations on the device MMIO. * Internal, don't use that outside of ssb. */ diff --git a/target/linux/brcm47xx/patches-2.6.25/690-mips-allow-pciregister-after-boot.patch b/target/linux/brcm47xx/patches-2.6.25/690-mips-allow-pciregister-after-boot.patch index 0463da5615..cc5de49fa5 100644 --- a/target/linux/brcm47xx/patches-2.6.25/690-mips-allow-pciregister-after-boot.patch +++ b/target/linux/brcm47xx/patches-2.6.25/690-mips-allow-pciregister-after-boot.patch @@ -1,10 +1,10 @@ Allow registering PCI devices after early boot. This is an ugly hack and needs to be rewritten before going upstream. -Index: linux-2.6.25/arch/mips/pci/pci.c +Index: linux-2.6.25.4/arch/mips/pci/pci.c =================================================================== ---- linux-2.6.25.orig/arch/mips/pci/pci.c 2008-04-27 21:49:19.000000000 +0100 -+++ linux-2.6.25/arch/mips/pci/pci.c 2008-04-27 21:58:31.000000000 +0100 +--- linux-2.6.25.4.orig/arch/mips/pci/pci.c ++++ linux-2.6.25.4/arch/mips/pci/pci.c @@ -21,6 +21,17 @@ */ int pci_probe_only; @@ -146,10 +146,10 @@ Index: linux-2.6.25/arch/mips/pci/pci.c return 0; } -Index: linux-2.6.25/drivers/ssb/main.c +Index: linux-2.6.25.4/drivers/ssb/main.c =================================================================== ---- linux-2.6.25.orig/drivers/ssb/main.c 2008-04-27 21:55:32.000000000 +0100 -+++ linux-2.6.25/drivers/ssb/main.c 2008-04-27 21:58:31.000000000 +0100 +--- linux-2.6.25.4.orig/drivers/ssb/main.c ++++ linux-2.6.25.4/drivers/ssb/main.c @@ -1191,9 +1191,7 @@ static int __init ssb_modinit(void) /* ssb must be initialized after PCI but before the ssb drivers. * That means we must use some initcall between subsys_initcall diff --git a/target/linux/brcm47xx/patches-2.6.25/700-ssb-gigabit-ethernet-driver.patch b/target/linux/brcm47xx/patches-2.6.25/700-ssb-gigabit-ethernet-driver.patch index ec3f81d195..60576a262a 100644 --- a/target/linux/brcm47xx/patches-2.6.25/700-ssb-gigabit-ethernet-driver.patch +++ b/target/linux/brcm47xx/patches-2.6.25/700-ssb-gigabit-ethernet-driver.patch @@ -1,7 +1,7 @@ -Index: linux-2.6.25.1/drivers/ssb/Kconfig +Index: linux-2.6.25.4/drivers/ssb/Kconfig =================================================================== ---- linux-2.6.25.1.orig/drivers/ssb/Kconfig 2008-05-07 22:45:24.000000000 +0100 -+++ linux-2.6.25.1/drivers/ssb/Kconfig 2008-05-07 22:57:40.000000000 +0100 +--- linux-2.6.25.4.orig/drivers/ssb/Kconfig ++++ linux-2.6.25.4/drivers/ssb/Kconfig @@ -125,4 +125,13 @@ config SSB_DRIVER_EXTIF If unsure, say N @@ -16,10 +16,10 @@ Index: linux-2.6.25.1/drivers/ssb/Kconfig + If unsure, say N + endmenu -Index: linux-2.6.25.1/drivers/ssb/Makefile +Index: linux-2.6.25.4/drivers/ssb/Makefile =================================================================== ---- linux-2.6.25.1.orig/drivers/ssb/Makefile 2008-05-07 22:45:24.000000000 +0100 -+++ linux-2.6.25.1/drivers/ssb/Makefile 2008-05-07 22:57:40.000000000 +0100 +--- linux-2.6.25.4.orig/drivers/ssb/Makefile ++++ linux-2.6.25.4/drivers/ssb/Makefile @@ -11,6 +11,7 @@ ssb-y += driver_chipcommon.o ssb-$(CONFIG_SSB_DRIVER_MIPS) += driver_mipscore.o ssb-$(CONFIG_SSB_DRIVER_EXTIF) += driver_extif.o @@ -28,10 +28,10 @@ Index: linux-2.6.25.1/drivers/ssb/Makefile # b43 pci-ssb-bridge driver # Not strictly a part of SSB, but kept here for convenience -Index: linux-2.6.25.1/drivers/ssb/driver_gige.c +Index: linux-2.6.25.4/drivers/ssb/driver_gige.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.25.1/drivers/ssb/driver_gige.c 2008-05-07 22:57:40.000000000 +0100 +--- /dev/null ++++ linux-2.6.25.4/drivers/ssb/driver_gige.c @@ -0,0 +1,294 @@ +/* + * Sonics Silicon Backplane @@ -327,10 +327,10 @@ Index: linux-2.6.25.1/drivers/ssb/driver_gige.c +{ + return ssb_driver_register(&ssb_gige_driver); +} -Index: linux-2.6.25.1/include/linux/ssb/ssb_driver_gige.h +Index: linux-2.6.25.4/include/linux/ssb/ssb_driver_gige.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.25.1/include/linux/ssb/ssb_driver_gige.h 2008-05-07 22:57:40.000000000 +0100 +--- /dev/null ++++ linux-2.6.25.4/include/linux/ssb/ssb_driver_gige.h @@ -0,0 +1,174 @@ +#ifndef LINUX_SSB_DRIVER_GIGE_H_ +#define LINUX_SSB_DRIVER_GIGE_H_ @@ -506,10 +506,10 @@ Index: linux-2.6.25.1/include/linux/ssb/ssb_driver_gige.h + +#endif /* CONFIG_SSB_DRIVER_GIGE */ +#endif /* LINUX_SSB_DRIVER_GIGE_H_ */ -Index: linux-2.6.25.1/drivers/ssb/driver_pcicore.c +Index: linux-2.6.25.4/drivers/ssb/driver_pcicore.c =================================================================== ---- linux-2.6.25.1.orig/drivers/ssb/driver_pcicore.c 2008-05-07 22:45:24.000000000 +0100 -+++ linux-2.6.25.1/drivers/ssb/driver_pcicore.c 2008-05-07 22:57:40.000000000 +0100 +--- linux-2.6.25.4.orig/drivers/ssb/driver_pcicore.c ++++ linux-2.6.25.4/drivers/ssb/driver_pcicore.c @@ -60,78 +60,6 @@ static DEFINE_SPINLOCK(cfgspace_lock); /* Core to access the external PCI config space. Can only have one. */ static struct ssb_pcicore *extpci_core; @@ -685,10 +685,10 @@ Index: linux-2.6.25.1/drivers/ssb/driver_pcicore.c static void ssb_pcicore_init_hostmode(struct ssb_pcicore *pc) { u32 val; -Index: linux-2.6.25.1/drivers/ssb/embedded.c +Index: linux-2.6.25.4/drivers/ssb/embedded.c =================================================================== ---- linux-2.6.25.1.orig/drivers/ssb/embedded.c 2008-05-07 22:45:24.000000000 +0100 -+++ linux-2.6.25.1/drivers/ssb/embedded.c 2008-05-07 22:57:40.000000000 +0100 +--- linux-2.6.25.4.orig/drivers/ssb/embedded.c ++++ linux-2.6.25.4/drivers/ssb/embedded.c @@ -10,6 +10,9 @@ #include <linux/ssb/ssb.h> @@ -790,10 +790,10 @@ Index: linux-2.6.25.1/drivers/ssb/embedded.c + + return -ENODEV; +} -Index: linux-2.6.25.1/include/linux/ssb/ssb.h +Index: linux-2.6.25.4/include/linux/ssb/ssb.h =================================================================== ---- linux-2.6.25.1.orig/include/linux/ssb/ssb.h 2008-05-07 22:45:33.000000000 +0100 -+++ linux-2.6.25.1/include/linux/ssb/ssb.h 2008-05-07 22:57:40.000000000 +0100 +--- linux-2.6.25.4.orig/include/linux/ssb/ssb.h ++++ linux-2.6.25.4/include/linux/ssb/ssb.h @@ -426,5 +426,12 @@ extern int ssb_bus_powerup(struct ssb_bu extern u32 ssb_admatch_base(u32 adm); extern u32 ssb_admatch_size(u32 adm); @@ -807,10 +807,10 @@ Index: linux-2.6.25.1/include/linux/ssb/ssb.h +#endif /* CONFIG_SSB_EMBEDDED */ #endif /* LINUX_SSB_H_ */ -Index: linux-2.6.25.1/include/linux/ssb/ssb_driver_pci.h +Index: linux-2.6.25.4/include/linux/ssb/ssb_driver_pci.h =================================================================== ---- linux-2.6.25.1.orig/include/linux/ssb/ssb_driver_pci.h 2008-05-07 22:45:24.000000000 +0100 -+++ linux-2.6.25.1/include/linux/ssb/ssb_driver_pci.h 2008-05-07 22:57:40.000000000 +0100 +--- linux-2.6.25.4.orig/include/linux/ssb/ssb_driver_pci.h ++++ linux-2.6.25.4/include/linux/ssb/ssb_driver_pci.h @@ -1,6 +1,11 @@ #ifndef LINUX_SSB_PCICORE_H_ #define LINUX_SSB_PCICORE_H_ @@ -850,10 +850,10 @@ Index: linux-2.6.25.1/include/linux/ssb/ssb_driver_pci.h + #endif /* CONFIG_SSB_DRIVER_PCICORE */ #endif /* LINUX_SSB_PCICORE_H_ */ -Index: linux-2.6.25.1/drivers/ssb/main.c +Index: linux-2.6.25.4/drivers/ssb/main.c =================================================================== ---- linux-2.6.25.1.orig/drivers/ssb/main.c 2008-05-07 22:45:33.000000000 +0100 -+++ linux-2.6.25.1/drivers/ssb/main.c 2008-05-07 22:57:40.000000000 +0100 +--- linux-2.6.25.4.orig/drivers/ssb/main.c ++++ linux-2.6.25.4/drivers/ssb/main.c @@ -14,6 +14,7 @@ #include <linux/io.h> #include <linux/ssb/ssb.h> @@ -912,10 +912,10 @@ Index: linux-2.6.25.1/drivers/ssb/main.c b43_pci_ssb_bridge_exit(); bus_unregister(&ssb_bustype); } -Index: linux-2.6.25.1/drivers/ssb/ssb_private.h +Index: linux-2.6.25.4/drivers/ssb/ssb_private.h =================================================================== ---- linux-2.6.25.1.orig/drivers/ssb/ssb_private.h 2008-05-07 22:45:24.000000000 +0100 -+++ linux-2.6.25.1/drivers/ssb/ssb_private.h 2008-05-07 22:57:40.000000000 +0100 +--- linux-2.6.25.4.orig/drivers/ssb/ssb_private.h ++++ linux-2.6.25.4/drivers/ssb/ssb_private.h @@ -118,6 +118,8 @@ extern u32 ssb_calc_clock_rate(u32 pllty extern int ssb_devices_freeze(struct ssb_bus *bus); extern int ssb_devices_thaw(struct ssb_bus *bus); @@ -925,10 +925,10 @@ Index: linux-2.6.25.1/drivers/ssb/ssb_private.h /* b43_pci_bridge.c */ #ifdef CONFIG_SSB_B43_PCI_BRIDGE -Index: linux-2.6.25.1/drivers/net/tg3.c +Index: linux-2.6.25.4/drivers/net/tg3.c =================================================================== ---- linux-2.6.25.1.orig/drivers/net/tg3.c 2008-05-07 22:45:24.000000000 +0100 -+++ linux-2.6.25.1/drivers/net/tg3.c 2008-05-07 22:57:40.000000000 +0100 +--- linux-2.6.25.4.orig/drivers/net/tg3.c ++++ linux-2.6.25.4/drivers/net/tg3.c @@ -38,6 +38,7 @@ #include <linux/workqueue.h> #include <linux/prefetch.h> @@ -1212,10 +1212,10 @@ Index: linux-2.6.25.1/drivers/net/tg3.c /* The word/byte swap controls here control register access byte * swapping. DMA data byte swapping is controlled in the GRC_MODE -Index: linux-2.6.25.1/drivers/net/tg3.h +Index: linux-2.6.25.4/drivers/net/tg3.h =================================================================== ---- linux-2.6.25.1.orig/drivers/net/tg3.h 2008-05-07 22:45:24.000000000 +0100 -+++ linux-2.6.25.1/drivers/net/tg3.h 2008-05-07 23:02:12.000000000 +0100 +--- linux-2.6.25.4.orig/drivers/net/tg3.h ++++ linux-2.6.25.4/drivers/net/tg3.h @@ -2477,6 +2477,9 @@ struct tg3 { #define TG3_FLG3_ENABLE_APE 0x00000002 #define TG3_FLG3_5761_5784_AX_FIXES 0x00000004 @@ -1243,10 +1243,10 @@ Index: linux-2.6.25.1/drivers/net/tg3.h struct tg3_hw_stats *hw_stats; dma_addr_t stats_mapping; -Index: linux-2.6.25.1/drivers/ssb/driver_mipscore.c +Index: linux-2.6.25.4/drivers/ssb/driver_mipscore.c =================================================================== ---- linux-2.6.25.1.orig/drivers/ssb/driver_mipscore.c 2008-05-07 22:45:33.000000000 +0100 -+++ linux-2.6.25.1/drivers/ssb/driver_mipscore.c 2008-05-07 22:57:40.000000000 +0100 +--- linux-2.6.25.4.orig/drivers/ssb/driver_mipscore.c ++++ linux-2.6.25.4/drivers/ssb/driver_mipscore.c @@ -212,6 +212,7 @@ void ssb_mipscore_init(struct ssb_mipsco /* fallthrough */ case SSB_DEV_PCI: diff --git a/target/linux/brcm47xx/patches-2.6.25/800-cfe-workaround.patch b/target/linux/brcm47xx/patches-2.6.25/800-cfe-workaround.patch index 361f006c5f..63ed81113b 100644 --- a/target/linux/brcm47xx/patches-2.6.25/800-cfe-workaround.patch +++ b/target/linux/brcm47xx/patches-2.6.25/800-cfe-workaround.patch @@ -1,7 +1,7 @@ -Index: linux-2.6.25.1/arch/mips/bcm47xx/prom.c +Index: linux-2.6.25.4/arch/mips/bcm47xx/prom.c =================================================================== ---- linux-2.6.25.1.orig/arch/mips/bcm47xx/prom.c 2008-05-14 14:46:44.000000000 +0100 -+++ linux-2.6.25.1/arch/mips/bcm47xx/prom.c 2008-05-14 17:05:43.000000000 +0100 +--- linux-2.6.25.4.orig/arch/mips/bcm47xx/prom.c ++++ linux-2.6.25.4/arch/mips/bcm47xx/prom.c @@ -83,9 +83,18 @@ static __init void prom_init_cfe(void) } } |