1 files changed, 14 insertions, 6 deletions

diff --git a/drivers/bcma/driver_chipcommon.c b/drivers/bcma/driver_chipcommon.c
index 19f679667ca4..b7c8a8d4e6d1 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)
 
         if (cc->capabilities & BCMA_CC_CAP_PMU) {
                 if (bus->chipinfo.id == BCMA_CHIP_ID_BCM4706)
-                        /* 4706 CC and PMU watchdogs are clocked at 1/4 of ALP clock */
+                        /* 4706 CC and PMU watchdogs are clocked at 1/4 of ALP
+                         * clock
+                         */
                         return bcma_chipco_get_alp_clock(cc) / 4000;
                 else
                         /* based on 32KHz ILP clock */
@@ -97,7 +99,8 @@ int bcma_chipco_watchdog_register(struct bcma_drv_cc *cc)
         wdt.driver_data = cc;
         wdt.timer_set = bcma_chipco_watchdog_timer_set_wdt;
         wdt.timer_set_ms = bcma_chipco_watchdog_timer_set_ms_wdt;
-        wdt.max_timer_ms = bcma_chipco_watchdog_get_max_timer(cc) / cc->ticks_per_ms;
+        wdt.max_timer_ms =
+                bcma_chipco_watchdog_get_max_timer(cc) / cc->ticks_per_ms;
 
         pdev = platform_device_register_data(NULL, "bcm47xx-wdt",
                                              cc->core->bus->num, &wdt,
@@ -175,7 +178,6 @@ void bcma_core_chipcommon_init(struct bcma_drv_cc *cc)
 u32 bcma_chipco_watchdog_timer_set(struct bcma_drv_cc *cc, u32 ticks)
 {
         u32 maxt;
-        enum bcma_clkmode clkmode;
 
         maxt = bcma_chipco_watchdog_get_max_timer(cc);
         if (cc->capabilities & BCMA_CC_CAP_PMU) {
@@ -185,8 +187,13 @@ u32 bcma_chipco_watchdog_timer_set(struct bcma_drv_cc *cc, u32 ticks)
                         ticks = maxt;
                 bcma_cc_write32(cc, BCMA_CC_PMU_WATCHDOG, ticks);
         } else {
-                clkmode = ticks ? BCMA_CLKMODE_FAST : BCMA_CLKMODE_DYNAMIC;
-                bcma_core_set_clockmode(cc->core, clkmode);
+                struct bcma_bus *bus = cc->core->bus;
+
+                if (bus->chipinfo.id != BCMA_CHIP_ID_BCM4707 &&
+                    bus->chipinfo.id != BCMA_CHIP_ID_BCM53018)
+                        bcma_core_set_clockmode(cc->core,
+                                                ticks ? BCMA_CLKMODE_FAST : BCMA_CLKMODE_DYNAMIC);
+
                 if (ticks > maxt)
                         ticks = maxt;
                 /* instant NMI */
@@ -335,7 +342,8 @@ void bcma_chipco_serial_init(struct bcma_drv_cc *cc)
                                        | BCMA_CC_CORECTL_UARTCLKEN);
                 }
         } else {
-                bcma_err(cc->core->bus, "serial not supported on this device ccrev: 0x%x\n", ccrev);
+                bcma_err(cc->core->bus, "serial not supported on this device ccrev: 0x%x\n",
+                         ccrev);
                 return;
         }