brcm47xx: fix brcm47xx.legacy build
authorHauke Mehrtens <hauke@openwrt.org>
Thu, 14 Aug 2014 21:21:27 +0000 (21:21 +0000)
committerHauke Mehrtens <hauke@openwrt.org>
Thu, 14 Aug 2014 21:21:27 +0000 (21:21 +0000)
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

target/linux/brcm47xx/patches-3.10/144-make-reboot-more-reliable.patch
target/linux/brcm47xx/patches-3.14/144-make-reboot-more-reliable.patch

index f1a343a..50431de 100644 (file)
@@ -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"
index 7c30a9c..3e1a4bb 100644 (file)
@@ -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"