diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2012-07-25 14:52:00 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2012-07-25 14:52:00 +0000 |
| commit | e0837a51f0deb1c30b26076779ca7a19ad8ada79 (patch) | |
| tree | 7e17f8c0309a8f8ef6dd164a6ecad804d4b81ff9 /target/linux/brcm47xx/patches-3.3/007-bcma-add-boardinfo-struct.patch | |
| parent | ab2cb9ce613c0f9de0d436926ea58ab25cff5074 (diff) | |
| download | upstream-e0837a51f0deb1c30b26076779ca7a19ad8ada79.tar.gz upstream-e0837a51f0deb1c30b26076779ca7a19ad8ada79.tar.bz2 upstream-e0837a51f0deb1c30b26076779ca7a19ad8ada79.zip | |
brcm47xx: reorder patches so that the patches already in mainline linux will be applied at first.
SVN-Revision: 32845
Diffstat (limited to 'target/linux/brcm47xx/patches-3.3/007-bcma-add-boardinfo-struct.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-3.3/007-bcma-add-boardinfo-struct.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/target/linux/brcm47xx/patches-3.3/007-bcma-add-boardinfo-struct.patch b/target/linux/brcm47xx/patches-3.3/007-bcma-add-boardinfo-struct.patch new file mode 100644 index 0000000000..b3514c682f --- /dev/null +++ b/target/linux/brcm47xx/patches-3.3/007-bcma-add-boardinfo-struct.patch @@ -0,0 +1,41 @@ +--- a/arch/mips/bcm47xx/setup.c ++++ b/arch/mips/bcm47xx/setup.c +@@ -190,6 +190,8 @@ static void __init bcm47xx_register_bcma + err = bcma_host_soc_register(&bcm47xx_bus.bcma); + if (err) + panic("Failed to initialize BCMA bus (err %d)", err); ++ ++ bcm47xx_fill_bcma_boardinfo(&bcm47xx_bus.bcma.bus.boardinfo, NULL); + } + #endif + +--- a/arch/mips/bcm47xx/sprom.c ++++ b/arch/mips/bcm47xx/sprom.c +@@ -630,3 +630,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 */ |