aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2014-08-14 21:21:27 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2014-08-14 21:21:27 +0000
commit254b4df66f796d1746149017963a1bed50a4bc8c (patch)
tree17f4548632406e4fe39b10309441e18debb98996 /target/linux/brcm47xx
parent006cdbfdbcb28e32bf336eafd66d5aeba4c45e15 (diff)
downloadupstream-254b4df66f796d1746149017963a1bed50a4bc8c.tar.gz
upstream-254b4df66f796d1746149017963a1bed50a4bc8c.tar.bz2
upstream-254b4df66f796d1746149017963a1bed50a4bc8c.zip
brcm47xx: fix brcm47xx.legacy build
we should check for ssb here. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 42164
Diffstat (limited to 'target/linux/brcm47xx')
-rw-r--r--target/linux/brcm47xx/patches-3.10/144-make-reboot-more-reliable.patch4
-rw-r--r--target/linux/brcm47xx/patches-3.14/144-make-reboot-more-reliable.patch4
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"