[PATCH] bcma: fix watchdog on some ARM chipsets

[PATCH] bcma: fix watchdog on some ARM chipsets

[Rafał Miłecki]

These chipsets don't need changing clock mode.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
---
This patch adds one line with more than 80 columns, I hope it's OK, IMO it
improves readability.
---
 drivers/bcma/driver_chipcommon.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/drivers/bcma/driver_chipcommon.c b/drivers/bcma/driver_chipcommon.c
index 84d4a95..b7c8a8d 100644
--- a/drivers/bcma/driver_chipcommon.c
+++ b/drivers/bcma/driver_chipcommon.c
@@ -178,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) {
@@ -188,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 */
-- 
1.8.4.5

Re: [PATCH] bcma: fix watchdog on some ARM chipsets

[Kalle Valo]

Rafał Miłecki <zajec5@gmail.com> writes:

> These chipsets don't need changing clock mode.
>
> Signed-off-by: Rafał Miłecki <zajec5@gmail.com>

Thanks, applied to wireless-drivers-next.git.

Rafał, as I need to apply your patches manually until patchwork is fixed
I'm not going to send the usual "Thanks, applied" email from now on.
It's just too much work for me. But I will mark your patch as Accepted
in patchwork. I hope this is ok.

-- 
Kalle Valo

Re: [PATCH] bcma: fix watchdog on some ARM chipsets

[Rafał Miłecki]

On 29 January 2015 at 09:48, Kalle Valo <kvalo@codeaurora.org> wrote:
> Rafał, as I need to apply your patches manually until patchwork is fixed
> I'm not going to send the usual "Thanks, applied" email from now on.
> It's just too much work for me. But I will mark your patch as Accepted
> in patchwork. I hope this is ok.

Sure! Thanks for your efforts.

-- 
Rafał