From bf02882bea49815672fb06e8cbb185b008f6f756 Mon Sep 17 00:00:00 2001 From: hauke Date: Wed, 25 Jul 2012 14:52:00 +0000 Subject: brcm47xx: reorder patches so that the patches already in mainline linux will be applied at first. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32845 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../252-bcma-add-boardinfo-struct.patch | 41 ---------------------- 1 file changed, 41 deletions(-) delete mode 100644 target/linux/brcm47xx/patches-3.3/252-bcma-add-boardinfo-struct.patch (limited to 'target/linux/brcm47xx/patches-3.3/252-bcma-add-boardinfo-struct.patch') diff --git a/target/linux/brcm47xx/patches-3.3/252-bcma-add-boardinfo-struct.patch b/target/linux/brcm47xx/patches-3.3/252-bcma-add-boardinfo-struct.patch deleted file mode 100644 index 31ed817cc..000000000 --- a/target/linux/brcm47xx/patches-3.3/252-bcma-add-boardinfo-struct.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- a/arch/mips/bcm47xx/setup.c -+++ b/arch/mips/bcm47xx/setup.c -@@ -297,6 +297,8 @@ static void __init bcm47xx_register_bcma - - if (bcm47xx_bus.bcma.bus.drv_cc.flash_type == BCMA_NFLASH) - bcm47xx_nflash_struct_bcma_init(&bcm47xx_nflash, &bcm47xx_bus.bcma.bus.drv_cc); -+ -+ bcm47xx_fill_bcma_boardinfo(&bcm47xx_bus.bcma.bus.boardinfo, NULL); - } - - static int __init bcm47xx_register_flash_bcma(void) ---- a/arch/mips/bcm47xx/sprom.c -+++ b/arch/mips/bcm47xx/sprom.c -@@ -628,3 +628,15 @@ void bcm47xx_fill_ssb_boardinfo(struct s - nvram_read_u16(prefix, NULL, "boardtype", &boardinfo->type, 0); - } - #endif -+ -+#ifdef CONFIG_BCM47XX_BCMA -+void bcm47xx_fill_bcma_boardinfo(struct bcma_boardinfo *boardinfo, -+ const char *prefix) -+{ -+ nvram_read_u16(prefix, NULL, "boardvendor", &boardinfo->vendor, 0); -+ if (!boardinfo->vendor) -+ boardinfo->vendor = SSB_BOARDVENDOR_BCM; -+ -+ nvram_read_u16(prefix, NULL, "boardtype", &boardinfo->type, 0); -+} -+#endif ---- a/arch/mips/include/asm/mach-bcm47xx/bcm47xx.h -+++ b/arch/mips/include/asm/mach-bcm47xx/bcm47xx.h -@@ -51,5 +51,9 @@ void bcm47xx_fill_sprom_ethernet(struct - void bcm47xx_fill_ssb_boardinfo(struct ssb_boardinfo *boardinfo, - const char *prefix); - #endif -+#ifdef CONFIG_BCM47XX_BCMA -+void bcm47xx_fill_bcma_boardinfo(struct bcma_boardinfo *boardinfo, -+ const char *prefix); -+#endif - - #endif /* __ASM_BCM47XX_H */ -- cgit v1.2.3