diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2011-08-04 20:04:54 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2011-08-04 20:04:54 +0000 |
| commit | 8428ebd8e84d4adef3267fc66c5d94105f79db15 (patch) | |
| tree | 4c80f88d2fc88cb7f3c7e365eb58e8ad293dc3e3 /target/linux/brcm47xx/patches-3.0/900-bcm47xx_wdt-noprescale.patch | |
| parent | 85b858fae67e4659cb990601b13ccc2078c1dffd (diff) | |
| download | upstream-8428ebd8e84d4adef3267fc66c5d94105f79db15.tar.gz upstream-8428ebd8e84d4adef3267fc66c5d94105f79db15.tar.bz2 upstream-8428ebd8e84d4adef3267fc66c5d94105f79db15.zip | |
brcm47xx: update patches
* this adds sflash support for ssb devices
* the flash is now a platform device
* minor updates
SVN-Revision: 27902
Diffstat (limited to 'target/linux/brcm47xx/patches-3.0/900-bcm47xx_wdt-noprescale.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-3.0/900-bcm47xx_wdt-noprescale.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/brcm47xx/patches-3.0/900-bcm47xx_wdt-noprescale.patch b/target/linux/brcm47xx/patches-3.0/900-bcm47xx_wdt-noprescale.patch index d259dcf160..d60247e91a 100644 --- a/target/linux/brcm47xx/patches-3.0/900-bcm47xx_wdt-noprescale.patch +++ b/target/linux/brcm47xx/patches-3.0/900-bcm47xx_wdt-noprescale.patch @@ -18,7 +18,7 @@ +static inline void bcm47xx_wdt_hw_start(u32 ticks) { - /* this is 2,5s on 100Mhz clock and 2s on 133 Mhz */ - switch (bcm47xx_active_bus_type) { + switch (bcm47xx_bus_type) { #ifdef CONFIG_BCM47XX_SSB case BCM47XX_BUS_TYPE_SSB: - ssb_watchdog_timer_set(&bcm47xx_bus.ssb, 0xfffffff); @@ -87,7 +87,7 @@ - setup_timer(&wdt_timer, bcm47xx_timer_tick, 0L); + /* FIXME Other cores */ +#ifdef BCM47XX_BUS_TYPE_BCMA -+ if(bcm47xx_active_bus_type == BCM47XX_BUS_TYPE_BCMA && ++ if(bcm47xx_bus_type == BCM47XX_BUS_TYPE_BCMA && + bcm47xx_bus.ssb.chip_id == 0x5354) { + /* Slow WDT clock, no pre-scaling */ + needs_sw_scale = 0; |