diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2014-08-14 21:21:27 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2014-08-14 21:21:27 +0000 |
| commit | 685e756873e53d605a086c2178e1f7717970d3f2 (patch) | |
| tree | 9b397991681223ec88926e1219290480c0ac3819 /target/linux | |
| parent | 8cc51ba777ac3f16d8dab9ecd56420e7a4fa8c43 (diff) | |
| download | upstream-685e756873e53d605a086c2178e1f7717970d3f2.tar.gz upstream-685e756873e53d605a086c2178e1f7717970d3f2.tar.bz2 upstream-685e756873e53d605a086c2178e1f7717970d3f2.zip | |
brcm47xx: fix brcm47xx.legacy build
we should check for ssb here.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42164 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/brcm47xx/patches-3.10/144-make-reboot-more-reliable.patch | 4 | ||||
| -rw-r--r-- | target/linux/brcm47xx/patches-3.14/144-make-reboot-more-reliable.patch | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/brcm47xx/patches-3.10/144-make-reboot-more-reliable.patch b/target/linux/brcm47xx/patches-3.10/144-make-reboot-more-reliable.patch index f1a343a0cc..50431de040 100644 --- a/target/linux/brcm47xx/patches-3.10/144-make-reboot-more-reliable.patch +++ b/target/linux/brcm47xx/patches-3.10/144-make-reboot-more-reliable.patch @@ -25,10 +25,10 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> switch (bcm47xx_bus_type) { #ifdef CONFIG_BCM47XX_SSB case BCM47XX_BUS_TYPE_SSB: -+ if (bcm47xx_bus.bcma.bus.chipinfo.id == 0x4785) ++ if (bcm47xx_bus.ssb.chip_id == 0x4785) + write_c0_diag4(1 << 22); ssb_watchdog_timer_set(&bcm47xx_bus.ssb, 1); -+ if (bcm47xx_bus.bcma.bus.chipinfo.id == 0x4785) { ++ if (bcm47xx_bus.ssb.chip_id == 0x4785) { + __asm__ __volatile__( + ".set\tmips3\n\t" + "sync\n\t" diff --git a/target/linux/brcm47xx/patches-3.14/144-make-reboot-more-reliable.patch b/target/linux/brcm47xx/patches-3.14/144-make-reboot-more-reliable.patch index 7c30a9c54a..3e1a4bb56a 100644 --- a/target/linux/brcm47xx/patches-3.14/144-make-reboot-more-reliable.patch +++ b/target/linux/brcm47xx/patches-3.14/144-make-reboot-more-reliable.patch @@ -25,10 +25,10 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> switch (bcm47xx_bus_type) { #ifdef CONFIG_BCM47XX_SSB case BCM47XX_BUS_TYPE_SSB: -+ if (bcm47xx_bus.bcma.bus.chipinfo.id == 0x4785) ++ if (bcm47xx_bus.ssb.chip_id == 0x4785) + write_c0_diag4(1 << 22); ssb_watchdog_timer_set(&bcm47xx_bus.ssb, 1); -+ if (bcm47xx_bus.bcma.bus.chipinfo.id == 0x4785) { ++ if (bcm47xx_bus.ssb.chip_id == 0x4785) { + __asm__ __volatile__( + ".set\tmips3\n\t" + "sync\n\t" |