diff options
Diffstat (limited to 'drivers/bcma')
-rw-r--r-- | drivers/bcma/driver_chipcommon.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/bcma/driver_chipcommon.c b/drivers/bcma/driver_chipcommon.c index 19f679667ca4..84d4a95e6caf 100644 --- a/drivers/bcma/driver_chipcommon.c +++ b/drivers/bcma/driver_chipcommon.c | |||
@@ -79,7 +79,9 @@ static int bcma_chipco_watchdog_ticks_per_ms(struct bcma_drv_cc *cc) | |||
79 | 79 | ||
80 | if (cc->capabilities & BCMA_CC_CAP_PMU) { | 80 | if (cc->capabilities & BCMA_CC_CAP_PMU) { |
81 | if (bus->chipinfo.id == BCMA_CHIP_ID_BCM4706) | 81 | if (bus->chipinfo.id == BCMA_CHIP_ID_BCM4706) |
82 | /* 4706 CC and PMU watchdogs are clocked at 1/4 of ALP clock */ | 82 | /* 4706 CC and PMU watchdogs are clocked at 1/4 of ALP |
83 | * clock | ||
84 | */ | ||
83 | return bcma_chipco_get_alp_clock(cc) / 4000; | 85 | return bcma_chipco_get_alp_clock(cc) / 4000; |
84 | else | 86 | else |
85 | /* based on 32KHz ILP clock */ | 87 | /* based on 32KHz ILP clock */ |
@@ -97,7 +99,8 @@ int bcma_chipco_watchdog_register(struct bcma_drv_cc *cc) | |||
97 | wdt.driver_data = cc; | 99 | wdt.driver_data = cc; |
98 | wdt.timer_set = bcma_chipco_watchdog_timer_set_wdt; | 100 | wdt.timer_set = bcma_chipco_watchdog_timer_set_wdt; |
99 | wdt.timer_set_ms = bcma_chipco_watchdog_timer_set_ms_wdt; | 101 | wdt.timer_set_ms = bcma_chipco_watchdog_timer_set_ms_wdt; |
100 | wdt.max_timer_ms = bcma_chipco_watchdog_get_max_timer(cc) / cc->ticks_per_ms; | 102 | wdt.max_timer_ms = |
103 | bcma_chipco_watchdog_get_max_timer(cc) / cc->ticks_per_ms; | ||
101 | 104 | ||
102 | pdev = platform_device_register_data(NULL, "bcm47xx-wdt", | 105 | pdev = platform_device_register_data(NULL, "bcm47xx-wdt", |
103 | cc->core->bus->num, &wdt, | 106 | cc->core->bus->num, &wdt, |
@@ -335,7 +338,8 @@ void bcma_chipco_serial_init(struct bcma_drv_cc *cc) | |||
335 | | BCMA_CC_CORECTL_UARTCLKEN); | 338 | | BCMA_CC_CORECTL_UARTCLKEN); |
336 | } | 339 | } |
337 | } else { | 340 | } else { |
338 | bcma_err(cc->core->bus, "serial not supported on this device ccrev: 0x%x\n", ccrev); | 341 | bcma_err(cc->core->bus, "serial not supported on this device ccrev: 0x%x\n", |
342 | ccrev); | ||
339 | return; | 343 | return; |
340 | } | 344 | } |
341 | 345 | ||