diff options
Diffstat (limited to 'target/linux/brcm47xx')
21 files changed, 121 insertions, 123 deletions
diff --git a/target/linux/brcm47xx/Makefile b/target/linux/brcm47xx/Makefile index bad5ec108d..daa867b4b3 100644 --- a/target/linux/brcm47xx/Makefile +++ b/target/linux/brcm47xx/Makefile @@ -11,7 +11,7 @@ BOARD:=brcm47xx BOARDNAME:=Broadcom BCM947xx/953xx FEATURES:=squashfs usb -LINUX_VERSION:=2.6.25.17 +LINUX_VERSION:=2.6.25.19 include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES += kmod-switch kmod-diag 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 783aa8c10d..b48215d3cc 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,6 +1,6 @@ --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -50,8 +50,10 @@ +@@ -50,8 +50,10 @@ config BCM47XX select SYS_SUPPORTS_32BIT_KERNEL select SYS_SUPPORTS_LITTLE_ENDIAN select SSB @@ -11,7 +11,7 @@ select SSB_PCICORE_HOSTMODE if PCI select GENERIC_GPIO select SYS_HAS_EARLY_PRINTK -@@ -790,6 +792,7 @@ +@@ -790,6 +792,7 @@ config CSRC_SB1250 config CFE bool 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 1471083177..6d3161c86d 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,6 +1,6 @@ --- a/drivers/mtd/maps/Kconfig +++ b/drivers/mtd/maps/Kconfig -@@ -337,6 +337,12 @@ +@@ -337,6 +337,12 @@ config MTD_CFI_FLAGADM Mapping for the Flaga digital module. If you don't have one, ignore this setting. @@ -15,7 +15,7 @@ depends on MTD_JEDECPROBE && WALNUT && !PPC_MERGE --- a/drivers/mtd/maps/Makefile +++ b/drivers/mtd/maps/Makefile -@@ -31,6 +31,7 @@ +@@ -31,6 +31,7 @@ obj-$(CONFIG_MTD_PMC_MSP_RAMROOT)+= pmcm 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.25/130-remove_scache.patch b/target/linux/brcm47xx/patches-2.6.25/130-remove_scache.patch index d36b4d8307..941b649c7f 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,6 +1,6 @@ --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -228,7 +228,6 @@ +@@ -228,7 +228,6 @@ config MIPS_MALTA select I8259 select MIPS_BOARDS_GEN select MIPS_BONITO64 @@ -8,7 +8,7 @@ select PCI_GT64XXX_PCI0 select MIPS_MSC select SWAP_IO_SPACE -@@ -1421,13 +1420,6 @@ +@@ -1421,13 +1420,6 @@ config IP22_CPU_SCACHE bool select BOARD_SCACHE @@ -24,7 +24,7 @@ select BOARD_SCACHE --- a/arch/mips/kernel/cpu-probe.c +++ b/arch/mips/kernel/cpu-probe.c -@@ -704,6 +704,8 @@ +@@ -704,6 +704,8 @@ static inline void cpu_probe_mips(struct break; case PRID_IMP_25KF: c->cputype = CPU_25KF; @@ -35,7 +35,7 @@ c->cputype = CPU_34K; --- a/arch/mips/mm/c-r4k.c +++ b/arch/mips/mm/c-r4k.c -@@ -1103,7 +1103,6 @@ +@@ -1103,7 +1103,6 @@ static void __init loongson2_sc_init(voi extern int r5k_sc_init(void); extern int rm7k_sc_init(void); @@ -43,7 +43,7 @@ static void __cpuinit setup_scache(void) { -@@ -1157,29 +1156,17 @@ +@@ -1157,29 +1156,17 @@ static void __cpuinit setup_scache(void) #endif default: @@ -80,7 +80,7 @@ --- a/arch/mips/mm/Makefile +++ b/arch/mips/mm/Makefile -@@ -32,6 +32,5 @@ +@@ -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 obj-$(CONFIG_RM7000_CPU_SCACHE) += sc-rm7k.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 e0d225b154..58dafe5695 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,6 +1,6 @@ --- a/arch/mips/kernel/genex.S +++ b/arch/mips/kernel/genex.S -@@ -51,6 +51,10 @@ +@@ -51,6 +51,10 @@ NESTED(except_vec1_generic, 0, sp) NESTED(except_vec3_generic, 0, sp) .set push .set noat @@ -23,7 +23,7 @@ /* * Special Variant of smp_call_function for use by cache functions: * -@@ -97,6 +100,9 @@ +@@ -97,6 +100,9 @@ static void __cpuinit r4k_blast_dcache_p { unsigned long dc_lsize = cpu_dcache_line_size(); @@ -33,7 +33,7 @@ if (dc_lsize == 0) r4k_blast_dcache_page = (void *)cache_noop; else if (dc_lsize == 16) -@@ -111,6 +117,9 @@ +@@ -111,6 +117,9 @@ static void __cpuinit r4k_blast_dcache_p { unsigned long dc_lsize = cpu_dcache_line_size(); @@ -43,7 +43,7 @@ if (dc_lsize == 0) r4k_blast_dcache_page_indexed = (void *)cache_noop; else if (dc_lsize == 16) -@@ -125,6 +134,9 @@ +@@ -125,6 +134,9 @@ static void __cpuinit r4k_blast_dcache_s { unsigned long dc_lsize = cpu_dcache_line_size(); @@ -53,7 +53,7 @@ if (dc_lsize == 0) r4k_blast_dcache = (void *)cache_noop; else if (dc_lsize == 16) -@@ -630,6 +642,8 @@ +@@ -630,6 +642,8 @@ static void local_r4k_flush_cache_sigtra unsigned long addr = (unsigned long) arg; R4600_HIT_CACHEOP_WAR_IMPL; @@ -62,7 +62,7 @@ if (dc_lsize) protected_writeback_dcache_line(addr & ~(dc_lsize - 1)); if (!cpu_icache_snoops_remote_store && scache_size) -@@ -1215,6 +1229,17 @@ +@@ -1215,6 +1229,17 @@ static void __cpuinit coherency_setup(vo * silly idea of putting something else there ... */ switch (current_cpu_type()) { @@ -80,7 +80,7 @@ case CPU_R4000PC: case CPU_R4000SC: case CPU_R4000MC: -@@ -1254,6 +1279,15 @@ +@@ -1254,6 +1279,15 @@ void __cpuinit r4k_cache_init(void) break; } @@ -96,7 +96,7 @@ probe_pcache(); setup_scache(); -@@ -1303,5 +1337,13 @@ +@@ -1303,5 +1337,13 @@ void __cpuinit r4k_cache_init(void) build_clear_page(); build_copy_page(); local_r4k___flush_cache_all(NULL); @@ -112,7 +112,7 @@ } --- a/arch/mips/mm/tlbex.c +++ b/arch/mips/mm/tlbex.c -@@ -677,6 +677,9 @@ +@@ -677,6 +677,9 @@ static void __cpuinit build_r4000_tlb_re /* No need for uasm_i_nop */ } @@ -122,7 +122,7 @@ #ifdef CONFIG_64BIT build_get_pmde64(&p, &l, &r, K0, K1); /* get pmd in K1 */ #else -@@ -1084,6 +1087,9 @@ +@@ -1084,6 +1087,9 @@ build_r4000_tlbchange_handler_head(u32 * struct uasm_reloc **r, unsigned int pte, unsigned int ptr) { @@ -155,7 +155,7 @@ /* * 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 @@ -163,7 +163,7 @@ 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 @@ -171,7 +171,7 @@ 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 @@ -179,7 +179,7 @@ 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) { @@ -187,7 +187,7 @@ 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) { @@ -195,7 +195,7 @@ 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)); @@ -249,7 +249,7 @@ 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 \ \ @@ -257,7 +257,7 @@ 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 \ \ @@ -265,7 +265,7 @@ 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; \ \ @@ -274,7 +274,7 @@ __##pfx##flush_prologue \ \ for (ws = 0; ws < ws_end; ws += ws_inc) \ -@@ -393,35 +460,37 @@ +@@ -393,35 +460,37 @@ static inline void blast_##pfx##cache##l __##pfx##flush_epilogue \ } @@ -329,7 +329,7 @@ prot##cache_op(hitop, addr); \ if (addr == aend) \ break; \ -@@ -431,13 +500,13 @@ +@@ -431,13 +500,13 @@ static inline void prot##blast_##pfx##ca __##pfx##flush_epilogue \ } 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 725fb3c7ed..5fe38aaaf6 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,6 +1,6 @@ --- a/arch/mips/mm/init.c +++ b/arch/mips/mm/init.c -@@ -211,7 +211,7 @@ +@@ -211,7 +211,7 @@ void copy_user_highpage(struct page *to, void *vfrom, *vto; vto = kmap_atomic(to, KM_USER1); @@ -9,7 +9,7 @@ page_mapped(from) && !Page_dcache_dirty(from)) { vfrom = kmap_coherent(from, vaddr); copy_page(vto, vfrom); -@@ -235,7 +235,7 @@ +@@ -235,7 +235,7 @@ void copy_to_user_page(struct vm_area_st struct page *page, unsigned long vaddr, void *dst, const void *src, unsigned long len) { @@ -18,7 +18,7 @@ page_mapped(page) && !Page_dcache_dirty(page)) { void *vto = kmap_coherent(page, vaddr) + (vaddr & ~PAGE_MASK); memcpy(vto, src, len); -@@ -255,7 +255,7 @@ +@@ -255,7 +255,7 @@ void copy_from_user_page(struct vm_area_ struct page *page, unsigned long vaddr, void *dst, const void *src, unsigned long len) { @@ -57,7 +57,7 @@ * I-Cache snoops remote store. This only matters on SMP. Some multiprocessors --- a/arch/mips/mm/c-r4k.c +++ b/arch/mips/mm/c-r4k.c -@@ -484,7 +484,7 @@ +@@ -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. */ @@ -66,7 +66,7 @@ vaddr = kmap_coherent(page, addr); else vaddr = kmap_atomic(page, KM_USER0); -@@ -505,7 +505,7 @@ +@@ -505,7 +505,7 @@ static inline void local_r4k_flush_cache } if (vaddr) { diff --git a/target/linux/brcm47xx/patches-2.6.25/210-b44_phy_fix.patch b/target/linux/brcm47xx/patches-2.6.25/210-b44_phy_fix.patch index 55c08fe0d3..6669fba464 100644 --- a/target/linux/brcm47xx/patches-2.6.25/210-b44_phy_fix.patch +++ b/target/linux/brcm47xx/patches-2.6.25/210-b44_phy_fix.patch @@ -1,7 +1,5 @@ -Index: linux-2.6.25.17/drivers/net/b44.c -=================================================================== ---- linux-2.6.25.17.orig/drivers/net/b44.c 2008-10-16 23:13:19.000000000 +0200 -+++ linux-2.6.25.17/drivers/net/b44.c 2008-11-02 12:13:38.000000000 +0100 +--- a/drivers/net/b44.c ++++ b/drivers/net/b44.c @@ -339,7 +339,7 @@ static int b44_phy_reset(struct b44 *bp) } } 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 8658d6d255..6a4341fede 100644 --- a/target/linux/brcm47xx/patches-2.6.25/220-bcm5354.patch +++ b/target/linux/brcm47xx/patches-2.6.25/220-bcm5354.patch @@ -1,6 +1,6 @@ --- a/drivers/ssb/driver_chipcommon.c +++ b/drivers/ssb/driver_chipcommon.c -@@ -270,6 +270,8 @@ +@@ -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) { @@ -9,7 +9,7 @@ *n = chipco_read32(cc, SSB_CHIPCO_CLOCK_N); *plltype = (cc->capabilities & SSB_CHIPCO_CAP_PLLT); switch (*plltype) { -@@ -293,6 +295,8 @@ +@@ -293,6 +295,8 @@ void ssb_chipco_get_clockcpu(struct ssb_ void ssb_chipco_get_clockcontrol(struct ssb_chipcommon *cc, u32 *plltype, u32 *n, u32 *m) { @@ -20,7 +20,7 @@ switch (*plltype) { --- a/drivers/ssb/driver_mipscore.c +++ b/drivers/ssb/driver_mipscore.c -@@ -161,6 +161,8 @@ +@@ -161,6 +161,8 @@ u32 ssb_cpu_clock(struct ssb_mipscore *m if ((pll_type == SSB_PLLTYPE_5) || (bus->chip_id == 0x5365)) { rate = 200000000; @@ -31,7 +31,7 @@ } --- a/drivers/ssb/main.c +++ b/drivers/ssb/main.c -@@ -867,6 +867,8 @@ +@@ -867,6 +867,8 @@ u32 ssb_clockspeed(struct ssb_bus *bus) if (bus->chip_id == 0x5365) { rate = 100000000; 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 f599ca773c..856651b3de 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,6 +1,6 @@ --- a/drivers/usb/host/ohci-ssb.c +++ b/drivers/usb/host/ohci-ssb.c -@@ -142,10 +142,59 @@ +@@ -142,10 +142,59 @@ static int ssb_ohci_attach(struct ssb_de int err = -ENOMEM; u32 tmp, flags = 0; @@ -62,7 +62,7 @@ hcd = usb_create_hcd(&ssb_ohci_hc_driver, dev->dev, dev->dev->bus_id); -@@ -236,6 +285,7 @@ +@@ -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 21fac47407..afeec9c69f 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,6 +1,6 @@ --- a/drivers/usb/host/ohci-ssb.c +++ b/drivers/usb/host/ohci-ssb.c -@@ -195,6 +195,11 @@ +@@ -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/310-no_highpage.patch b/target/linux/brcm47xx/patches-2.6.25/310-no_highpage.patch index a2c27ab7c7..505e8aa4d5 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,6 +1,6 @@ --- a/arch/mips/mm/init.c +++ b/arch/mips/mm/init.c -@@ -205,32 +205,6 @@ +@@ -205,32 +205,6 @@ void kunmap_coherent(void) preempt_check_resched(); } @@ -43,7 +43,7 @@ #include <asm/io.h> /* -@@ -64,13 +65,16 @@ +@@ -64,13 +65,16 @@ static inline void clear_user_page(void flush_data_cache_page((unsigned long)addr); } 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 fb69cc4aab..7153871d21 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 @@ -27,7 +27,7 @@ void plat_irq_dispatch(void) { u32 cause; -@@ -53,3 +63,19 @@ +@@ -53,3 +63,19 @@ void __init arch_init_irq(void) { mips_cpu_irq_init(); } @@ -115,7 +115,7 @@ while (1) cpu_relax(); } -@@ -50,12 +79,13 @@ +@@ -50,12 +79,13 @@ static void bcm47xx_machine_halt(void) { /* Disable interrupts and watchdog and spin forever */ local_irq_disable(); @@ -131,7 +131,7 @@ { int i = 0; -@@ -72,52 +102,141 @@ +@@ -72,52 +102,141 @@ static void str2eaddr(char *str, char *d } } @@ -343,7 +343,7 @@ static char nvram_buf[NVRAM_SPACE]; static int cfe_env; -@@ -36,7 +36,7 @@ +@@ -36,7 +36,7 @@ extern char *cfe_env_get(char *nv_buf, c /* Probe for NVRAM header */ static void __init early_nvram_init(void) { @@ -362,7 +362,7 @@ +obj-y := cfe_env.o gpio.o irq.o nvram.o prom.o serial.o setup.o time.o wgt634u.o --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -54,6 +54,7 @@ +@@ -54,6 +54,7 @@ config BCM47XX select SSB_DRIVER_MIPS select SSB_DRIVER_EXTIF select SSB_DRIVER_PCICORE 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 a2e4c2b85c..59f4c1fdb3 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,6 +1,6 @@ --- a/scripts/gen_initramfs_list.sh +++ b/scripts/gen_initramfs_list.sh -@@ -287,7 +287,7 @@ +@@ -287,7 +287,7 @@ if [ ! -z ${output_file} ]; then if [ "${is_cpio_compressed}" = "compressed" ]; then cat ${cpio_tfile} > ${output_file} else @@ -11,7 +11,7 @@ fi --- a/init/initramfs.c +++ b/init/initramfs.c -@@ -441,6 +441,69 @@ +@@ -441,6 +441,69 @@ static void __init flush_window(void) outcnt = 0; } @@ -81,7 +81,7 @@ 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.25/601-mips-remove-pci-collision-check.patch b/target/linux/brcm47xx/patches-2.6.25/601-mips-remove-pci-collision-check.patch index 21e89cddff..9071b7cb34 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 @@ -4,7 +4,7 @@ Remove this sanity check for now until we find a better solution. --mb --- a/arch/mips/pci/pci.c +++ b/arch/mips/pci/pci.c -@@ -182,12 +182,10 @@ +@@ -182,12 +182,10 @@ static int pcibios_enable_resources(stru if ((idx == PCI_ROM_RESOURCE) && (!(r->flags & IORESOURCE_ROM_ENABLE))) continue; 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 d2271dd43e..af251d5ea1 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,6 +1,6 @@ --- a/drivers/ssb/main.c +++ b/drivers/ssb/main.c -@@ -1173,7 +1173,9 @@ +@@ -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 * and device_initcall. */ diff --git a/target/linux/brcm47xx/patches-2.6.25/630-ssb-fix-irq-init.patch b/target/linux/brcm47xx/patches-2.6.25/630-ssb-fix-irq-init.patch index 5f5e480229..72505d3e27 100644 --- a/target/linux/brcm47xx/patches-2.6.25/630-ssb-fix-irq-init.patch +++ b/target/linux/brcm47xx/patches-2.6.25/630-ssb-fix-irq-init.patch @@ -8,7 +8,7 @@ Signed-off-by: Michael Buesch <mb@bu3sch.de> --- a/drivers/ssb/driver_pcicore.c +++ b/drivers/ssb/driver_pcicore.c -@@ -519,6 +519,13 @@ +@@ -519,6 +519,13 @@ int ssb_pcicore_dev_irqvecs_enable(struc int err = 0; u32 tmp; 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 c7b1b26af4..f96b4d2dab 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,7 +1,7 @@ Add support for 8bit reads/writes to SSB. --- a/drivers/ssb/main.c +++ b/drivers/ssb/main.c -@@ -508,6 +508,14 @@ +@@ -508,6 +508,14 @@ error: return err; } @@ -16,7 +16,7 @@ Add support for 8bit reads/writes to SSB. static u16 ssb_ssb_read16(struct ssb_device *dev, u16 offset) { struct ssb_bus *bus = dev->bus; -@@ -524,6 +532,14 @@ +@@ -524,6 +532,14 @@ static u32 ssb_ssb_read32(struct ssb_dev return readl(bus->mmio + offset); } @@ -31,7 +31,7 @@ Add support for 8bit reads/writes to SSB. static void ssb_ssb_write16(struct ssb_device *dev, u16 offset, u16 value) { struct ssb_bus *bus = dev->bus; -@@ -542,8 +558,10 @@ +@@ -542,8 +558,10 @@ static void ssb_ssb_write32(struct ssb_d /* Ops for the plain SSB bus without a host-device (no PCI or PCMCIA). */ static const struct ssb_bus_ops ssb_ssb_ops = { @@ -44,7 +44,7 @@ Add support for 8bit reads/writes to SSB. }; --- a/drivers/ssb/pci.c +++ b/drivers/ssb/pci.c -@@ -577,6 +577,19 @@ +@@ -577,6 +577,19 @@ static inline int ssb_pci_assert_buspowe } #endif /* DEBUG */ @@ -64,7 +64,7 @@ Add support for 8bit reads/writes to SSB. static u16 ssb_pci_read16(struct ssb_device *dev, u16 offset) { struct ssb_bus *bus = dev->bus; -@@ -603,6 +616,19 @@ +@@ -603,6 +616,19 @@ static u32 ssb_pci_read32(struct ssb_dev return ioread32(bus->mmio + offset); } @@ -84,7 +84,7 @@ Add support for 8bit reads/writes to SSB. static void ssb_pci_write16(struct ssb_device *dev, u16 offset, u16 value) { struct ssb_bus *bus = dev->bus; -@@ -631,8 +657,10 @@ +@@ -631,8 +657,10 @@ static void ssb_pci_write32(struct ssb_d /* Not "static", as it's used in main.c */ const struct ssb_bus_ops ssb_pci_ops = { @@ -97,7 +97,7 @@ Add support for 8bit reads/writes to SSB. }; --- a/drivers/ssb/pcmcia.c +++ b/drivers/ssb/pcmcia.c -@@ -172,6 +172,22 @@ +@@ -172,6 +172,22 @@ static int select_core_and_segment(struc return 0; } @@ -120,7 +120,7 @@ Add support for 8bit reads/writes to SSB. static u16 ssb_pcmcia_read16(struct ssb_device *dev, u16 offset) { struct ssb_bus *bus = dev->bus; -@@ -206,6 +222,20 @@ +@@ -206,6 +222,20 @@ static u32 ssb_pcmcia_read32(struct ssb_ return (lo | (hi << 16)); } @@ -141,7 +141,7 @@ Add support for 8bit reads/writes to SSB. static void ssb_pcmcia_write16(struct ssb_device *dev, u16 offset, u16 value) { struct ssb_bus *bus = dev->bus; -@@ -238,8 +268,10 @@ +@@ -238,8 +268,10 @@ static void ssb_pcmcia_write32(struct ss /* Not "static", as it's used in main.c */ const struct ssb_bus_ops ssb_pcmcia_ops = { @@ -154,7 +154,7 @@ Add support for 8bit reads/writes to SSB. }; --- a/include/linux/ssb/ssb.h +++ b/include/linux/ssb/ssb.h -@@ -72,8 +72,10 @@ +@@ -72,8 +72,10 @@ struct ssb_device; /* Lowlevel read/write operations on the device MMIO. * Internal, don't use that outside of ssb. */ struct ssb_bus_ops { @@ -165,7 +165,7 @@ Add support for 8bit reads/writes to SSB. void (*write16)(struct ssb_device *dev, u16 offset, u16 value); void (*write32)(struct ssb_device *dev, u16 offset, u32 value); }; -@@ -348,6 +350,10 @@ +@@ -348,6 +350,10 @@ void ssb_device_disable(struct ssb_devic /* Device MMIO register read/write functions. */ @@ -176,7 +176,7 @@ Add support for 8bit reads/writes to SSB. static inline u16 ssb_read16(struct ssb_device *dev, u16 offset) { return dev->ops->read16(dev, offset); -@@ -356,6 +362,10 @@ +@@ -356,6 +362,10 @@ static inline u32 ssb_read32(struct ssb_ { return dev->ops->read32(dev, offset); } 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 1ba199fcbb..8b0445f5ba 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 @@ -21,7 +21,7 @@ This is an ugly hack and needs to be rewritten before going upstream. #define PCI_ASSIGN_ALL_BUSSES 1 unsigned int pci_probe = PCI_ASSIGN_ALL_BUSSES; -@@ -75,8 +86,32 @@ +@@ -75,8 +86,32 @@ pcibios_align_resource(void *data, struc res->start = start; } @@ -55,7 +55,7 @@ This is an ugly hack and needs to be rewritten before going upstream. if (request_resource(&iomem_resource, hose->mem_resource) < 0) goto out; if (request_resource(&ioport_resource, hose->io_resource) < 0) { -@@ -84,9 +119,6 @@ +@@ -84,9 +119,6 @@ void __devinit register_pci_controller(s goto out; } @@ -65,7 +65,7 @@ This is an ugly hack and needs to be rewritten before going upstream. /* * Do not panic here but later - this might hapen before console init. */ -@@ -94,41 +126,47 @@ +@@ -94,41 +126,47 @@ void __devinit register_pci_controller(s printk(KERN_WARNING "registering PCI controller with io_map_base unset\n"); } @@ -136,7 +136,7 @@ This is an ugly hack and needs to be rewritten before going upstream. /* Scan all of the recorded PCI controllers. */ for (next_busno = 0, hose = hose_head; hose; hose = hose->next) { -@@ -157,6 +195,7 @@ +@@ -157,6 +195,7 @@ static int __init pcibios_init(void) if (!pci_probe_only) pci_assign_unassigned_resources(); pci_fixup_irqs(common_swizzle, pcibios_map_irq); @@ -146,7 +146,7 @@ This is an ugly hack and needs to be rewritten before going upstream. } --- a/drivers/ssb/main.c +++ b/drivers/ssb/main.c -@@ -1191,9 +1191,7 @@ +@@ -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 * and device_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 ae97cf6cd5..1ed53e5ef8 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,6 +1,6 @@ --- a/drivers/ssb/Kconfig +++ b/drivers/ssb/Kconfig -@@ -125,4 +125,13 @@ +@@ -125,4 +125,13 @@ config SSB_DRIVER_EXTIF If unsure, say N @@ -16,7 +16,7 @@ endmenu --- a/drivers/ssb/Makefile +++ b/drivers/ssb/Makefile -@@ -11,6 +11,7 @@ +@@ -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 ssb-$(CONFIG_SSB_DRIVER_PCICORE) += driver_pcicore.o @@ -500,7 +500,7 @@ +#endif /* LINUX_SSB_DRIVER_GIGE_H_ */ --- a/drivers/ssb/driver_pcicore.c +++ b/drivers/ssb/driver_pcicore.c -@@ -60,78 +60,6 @@ +@@ -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; @@ -579,7 +579,7 @@ static u32 get_cfgspace_addr(struct ssb_pcicore *pc, unsigned int bus, unsigned int dev, unsigned int func, unsigned int off) -@@ -320,6 +248,95 @@ +@@ -320,6 +248,95 @@ static struct pci_controller ssb_pcicore .mem_offset = 0x24000000, }; @@ -687,7 +687,7 @@ #include "ssb_private.h" -@@ -130,3 +133,90 @@ +@@ -130,3 +133,90 @@ u32 ssb_gpio_polarity(struct ssb_bus *bu return res; } EXPORT_SYMBOL(ssb_gpio_polarity); @@ -780,7 +780,7 @@ +} --- a/include/linux/ssb/ssb.h +++ b/include/linux/ssb/ssb.h -@@ -426,5 +426,12 @@ +@@ -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,7 +807,7 @@ #ifdef CONFIG_SSB_DRIVER_PCICORE /* PCI core registers. */ -@@ -88,6 +93,9 @@ +@@ -88,6 +93,9 @@ extern void ssb_pcicore_init(struct ssb_ extern int ssb_pcicore_dev_irqvecs_enable(struct ssb_pcicore *pc, struct ssb_device *dev); @@ -817,7 +817,7 @@ #else /* CONFIG_SSB_DRIVER_PCICORE */ -@@ -107,5 +115,16 @@ +@@ -107,5 +115,16 @@ int ssb_pcicore_dev_irqvecs_enable(struc return 0; } @@ -844,7 +844,7 @@ #include <linux/dma-mapping.h> #include <linux/pci.h> -@@ -68,6 +69,25 @@ +@@ -68,6 +69,25 @@ found: } #endif /* CONFIG_SSB_PCIHOST */ @@ -870,7 +870,7 @@ static struct ssb_device *ssb_device_get(struct ssb_device *dev) { if (dev) -@@ -1181,7 +1201,14 @@ +@@ -1181,7 +1201,14 @@ static int __init ssb_modinit(void) err = b43_pci_ssb_bridge_init(); if (err) { ssb_printk(KERN_ERR "Broadcom 43xx PCI-SSB-bridge " @@ -886,7 +886,7 @@ /* don't fail SSB init because of this */ err = 0; } -@@ -1195,6 +1222,7 @@ +@@ -1195,6 +1222,7 @@ fs_initcall(ssb_modinit); static void __exit ssb_modexit(void) { @@ -896,7 +896,7 @@ } --- a/drivers/ssb/ssb_private.h +++ b/drivers/ssb/ssb_private.h -@@ -118,6 +118,8 @@ +@@ -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); extern struct ssb_bus *ssb_pci_dev_to_bus(struct pci_dev *pdev); @@ -915,7 +915,7 @@ #include <net/checksum.h> #include <net/ip.h> -@@ -425,8 +426,9 @@ +@@ -425,8 +426,9 @@ static void _tw32_flush(struct tg3 *tp, static inline void tw32_mailbox_flush(struct tg3 *tp, u32 off, u32 val) { tp->write32_mbox(tp, off, val); @@ -927,7 +927,7 @@ tp->read32_mbox(tp, off); } -@@ -706,7 +708,7 @@ +@@ -706,7 +708,7 @@ static void tg3_switch_clocks(struct tg3 #define PHY_BUSY_LOOPS 5000 @@ -936,7 +936,7 @@ { u32 frame_val; unsigned int loops; -@@ -720,7 +722,7 @@ +@@ -720,7 +722,7 @@ static int tg3_readphy(struct tg3 *tp, i *val = 0x0; @@ -945,7 +945,7 @@ MI_COM_PHY_ADDR_MASK); frame_val |= ((reg << MI_COM_REG_ADDR_SHIFT) & MI_COM_REG_ADDR_MASK); -@@ -755,7 +757,12 @@ +@@ -755,7 +757,12 @@ static int tg3_readphy(struct tg3 *tp, i return ret; } @@ -959,7 +959,7 @@ { u32 frame_val; unsigned int loops; -@@ -771,7 +778,7 @@ +@@ -771,7 +778,7 @@ static int tg3_writephy(struct tg3 *tp, udelay(80); } @@ -968,7 +968,7 @@ MI_COM_PHY_ADDR_MASK); frame_val |= ((reg << MI_COM_REG_ADDR_SHIFT) & MI_COM_REG_ADDR_MASK); -@@ -804,6 +811,11 @@ +@@ -804,6 +811,11 @@ static int tg3_writephy(struct tg3 *tp, return ret; } @@ -980,7 +980,7 @@ static void tg3_phydsp_write(struct tg3 *tp, u32 reg, u32 val) { tg3_writephy(tp, MII_TG3_DSP_ADDRESS, reg); -@@ -2250,6 +2262,14 @@ +@@ -2250,6 +2262,14 @@ static int tg3_setup_copper_phy(struct t } } @@ -995,7 +995,7 @@ if (current_link_up == 1 && tp->link_config.active_duplex == DUPLEX_FULL) tg3_setup_flow_control(tp, lcl_adv, rmt_adv); -@@ -5197,6 +5217,11 @@ +@@ -5197,6 +5217,11 @@ static int tg3_poll_fw(struct tg3 *tp) int i; u32 val; @@ -1007,7 +1007,7 @@ if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906) { /* Wait up to 20ms for init done. */ for (i = 0; i < 200; i++) { -@@ -5435,6 +5460,14 @@ +@@ -5435,6 +5460,14 @@ static int tg3_chip_reset(struct tg3 *tp tw32(0x5000, 0x400); } @@ -1022,7 +1022,7 @@ tw32(GRC_MODE, tp->grc_mode); if (tp->pci_chip_rev_id == CHIPREV_ID_5705_A0) { -@@ -5704,9 +5737,12 @@ +@@ -5704,9 +5737,12 @@ static int tg3_halt_cpu(struct tg3 *tp, return -ENODEV; } @@ -1038,7 +1038,7 @@ return 0; } -@@ -5787,6 +5823,11 @@ +@@ -5787,6 +5823,11 @@ static int tg3_load_5701_a0_firmware_fix struct fw_info info; int err, i; @@ -1050,7 +1050,7 @@ info.text_base = TG3_FW_TEXT_ADDR; info.text_len = TG3_FW_TEXT_LEN; info.text_data = &tg3FwText[0]; -@@ -6345,6 +6386,11 @@ +@@ -6345,6 +6386,11 @@ static int tg3_load_tso_firmware(struct unsigned long cpu_base, cpu_scratch_base, cpu_scratch_size; int err, i; @@ -1062,7 +1062,7 @@ if (tp->tg3_flags2 & TG3_FLG2_HW_TSO) return 0; -@@ -7306,6 +7352,11 @@ +@@ -7306,6 +7352,11 @@ static void tg3_timer(unsigned long __op spin_lock(&tp->lock); @@ -1074,7 +1074,7 @@ if (!(tp->tg3_flags & TG3_FLAG_TAGGED_STATUS)) { /* All of this garbage is because when using non-tagged * IRQ status the mailbox/status_block protocol the chip -@@ -8906,6 +8957,11 @@ +@@ -8906,6 +8957,11 @@ static int tg3_test_nvram(struct tg3 *tp __le32 *buf; int i, j, k, err = 0, size; @@ -1086,7 +1086,7 @@ if (tg3_nvram_read_swab(tp, 0, &magic) != 0) return -EIO; -@@ -9689,7 +9745,7 @@ +@@ -9689,7 +9745,7 @@ static int tg3_ioctl(struct net_device * return -EAGAIN; spin_lock_bh(&tp->lock); @@ -1095,7 +1095,7 @@ spin_unlock_bh(&tp->lock); data->val_out = mii_regval; -@@ -9708,7 +9764,7 @@ +@@ -9708,7 +9764,7 @@ static int tg3_ioctl(struct net_device * return -EAGAIN; spin_lock_bh(&tp->lock); @@ -1104,7 +1104,7 @@ spin_unlock_bh(&tp->lock); return err; -@@ -10177,6 +10233,12 @@ +@@ -10177,6 +10233,12 @@ static void __devinit tg3_get_5906_nvram /* Chips other than 5700/5701 use the NVRAM for fetching info. */ static void __devinit tg3_nvram_init(struct tg3 *tp) { @@ -1117,7 +1117,7 @@ tw32_f(GRC_EEPROM_ADDR, (EEPROM_ADDR_FSM_RESET | (EEPROM_DEFAULT_CLOCK_PERIOD << -@@ -10317,6 +10379,9 @@ +@@ -10317,6 +10379,9 @@ static int tg3_nvram_read(struct tg3 *tp { int ret; @@ -1127,7 +1127,7 @@ if (!(tp->tg3_flags & TG3_FLAG_NVRAM)) return tg3_nvram_read_using_eeprom(tp, offset, val); -@@ -10563,6 +10628,9 @@ +@@ -10563,6 +10628,9 @@ static int tg3_nvram_write_block(struct { int ret; @@ -1137,7 +1137,7 @@ if (tp->tg3_flags & TG3_FLAG_EEPROM_WRITE_PROT) { tw32_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl & ~GRC_LCLCTRL_GPIO_OUTPUT1); -@@ -11610,7 +11678,6 @@ +@@ -11610,7 +11678,6 @@ static int __devinit tg3_get_invariants( tp->write32 = tg3_write_flush_reg32; } @@ -1145,7 +1145,7 @@ if ((tp->tg3_flags & TG3_FLAG_TXD_MBOX_HWBUG) || (tp->tg3_flags & TG3_FLAG_MBOX_WRITE_REORDER)) { tp->write32_tx_mbox = tg3_write32_tx_mbox; -@@ -11646,6 +11713,11 @@ +@@ -11646,6 +11713,11 @@ static int __devinit tg3_get_invariants( GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5701))) tp->tg3_flags |= TG3_FLAG_SRAM_USE_CONFIG; @@ -1157,7 +1157,7 @@ /* Get eeprom hw config before calling tg3_set_power_state(). * In particular, the TG3_FLG2_IS_NIC flag must be * determined before calling tg3_set_power_state() so that -@@ -12017,6 +12089,10 @@ +@@ -12017,6 +12089,10 @@ static int __devinit tg3_get_device_addr } if (!is_valid_ether_addr(&dev->dev_addr[0])) { @@ -1168,7 +1168,7 @@ #ifdef CONFIG_SPARC if (!tg3_get_default_macaddr_sparc(tp)) return 0; -@@ -12508,6 +12584,7 @@ +@@ -12508,6 +12584,7 @@ static char * __devinit tg3_phy_string(s case PHY_ID_BCM5704: return "5704"; case PHY_ID_BCM5705: return "5705"; case PHY_ID_BCM5750: return "5750"; @@ -1176,7 +1176,7 @@ case PHY_ID_BCM5752: return "5752"; case PHY_ID_BCM5714: return "5714"; case PHY_ID_BCM5780: return "5780"; -@@ -12695,6 +12772,13 @@ +@@ -12695,6 +12772,13 @@ static int __devinit tg3_init_one(struct tp->msg_enable = tg3_debug; else tp->msg_enable = TG3_DEF_MSG_ENABLE; @@ -1192,7 +1192,7 @@ * swapping. DMA data byte swapping is controlled in the GRC_MODE --- a/drivers/net/tg3.h +++ b/drivers/net/tg3.h -@@ -2477,6 +2477,9 @@ +@@ -2477,6 +2477,9 @@ struct tg3 { #define TG3_FLG3_ENABLE_APE 0x00000002 #define TG3_FLG3_5761_5784_AX_FIXES 0x00000004 #define TG3_FLG3_5701_DMA_BUG 0x00000008 @@ -1202,7 +1202,7 @@ struct timer_list timer; u16 timer_counter; -@@ -2532,6 +2535,7 @@ +@@ -2532,6 +2535,7 @@ struct tg3 { #define PHY_ID_BCM5714 0x60008340 #define PHY_ID_BCM5780 0x60008350 #define PHY_ID_BCM5755 0xbc050cc0 @@ -1210,7 +1210,7 @@ #define PHY_ID_BCM5787 0xbc050ce0 #define PHY_ID_BCM5756 0xbc050ed0 #define PHY_ID_BCM5784 0xbc050fa0 -@@ -2568,7 +2572,7 @@ +@@ -2568,7 +2572,7 @@ struct tg3 { (X) == PHY_ID_BCM5780 || (X) == PHY_ID_BCM5787 || \ (X) == PHY_ID_BCM5755 || (X) == PHY_ID_BCM5756 || \ (X) == PHY_ID_BCM5906 || (X) == PHY_ID_BCM5761 || \ @@ -1221,7 +1221,7 @@ dma_addr_t stats_mapping; --- a/drivers/ssb/driver_mipscore.c +++ b/drivers/ssb/driver_mipscore.c -@@ -212,6 +212,7 @@ +@@ -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/710-add-gpio-is-valid.patch b/target/linux/brcm47xx/patches-2.6.25/710-add-gpio-is-valid.patch index 59552ed927..b06f08e1cf 100644 --- a/target/linux/brcm47xx/patches-2.6.25/710-add-gpio-is-valid.patch +++ b/target/linux/brcm47xx/patches-2.6.25/710-add-gpio-is-valid.patch @@ -1,7 +1,7 @@ Add gpio_is_valid() for bcm47xx --- a/arch/mips/bcm47xx/gpio.c +++ b/arch/mips/bcm47xx/gpio.c -@@ -77,3 +77,15 @@ +@@ -77,3 +77,15 @@ int bcm47xx_gpio_direction_output(unsign } EXPORT_SYMBOL_GPL(bcm47xx_gpio_direction_output); @@ -19,7 +19,7 @@ Add gpio_is_valid() for bcm47xx +EXPORT_SYMBOL_GPL(bcm47xx_gpio_is_valid); --- a/include/asm-mips/mach-bcm47xx/gpio.h +++ b/include/asm-mips/mach-bcm47xx/gpio.h -@@ -17,6 +17,7 @@ +@@ -17,6 +17,7 @@ extern int bcm47xx_gpio_get_value(unsign extern void bcm47xx_gpio_set_value(unsigned gpio, int value); extern int bcm47xx_gpio_direction_input(unsigned gpio); extern int bcm47xx_gpio_direction_output(unsigned gpio, int value); @@ -27,7 +27,7 @@ Add gpio_is_valid() for bcm47xx static inline int gpio_request(unsigned gpio, const char *label) { -@@ -52,6 +53,8 @@ +@@ -52,6 +53,8 @@ static inline int gpio_direction_output( return bcm47xx_gpio_direction_output(gpio, value); } diff --git a/target/linux/brcm47xx/patches-2.6.25/800-fix_cfe_detection.patch b/target/linux/brcm47xx/patches-2.6.25/800-fix_cfe_detection.patch index e72f99e803..63a71f05f4 100644 --- a/target/linux/brcm47xx/patches-2.6.25/800-fix_cfe_detection.patch +++ b/target/linux/brcm47xx/patches-2.6.25/800-fix_cfe_detection.patch @@ -8,7 +8,7 @@ const char *get_system_type(void) { -@@ -40,65 +41,40 @@ +@@ -40,65 +41,40 @@ const char *get_system_type(void) void prom_putchar(char c) { @@ -90,7 +90,7 @@ { char buf[CL_SIZE]; -@@ -146,9 +122,12 @@ +@@ -146,9 +122,12 @@ static __init void prom_init_mem(void) void __init prom_init(void) { |