From: Hauke Mehrtens Date: Thu, 14 Aug 2014 21:21:27 +0000 (+0000) Subject: brcm47xx: fix brcm47xx.legacy build X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=254b4df66f796d1746149017963a1bed50a4bc8c;p=openwrt%2Fstaging%2Fluka.git brcm47xx: fix brcm47xx.legacy build we should check for ssb here. Signed-off-by: Hauke Mehrtens SVN-Revision: 42164 --- 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 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 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"