Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f640a63 authored by Hauke Mehrtens's avatar Hauke Mehrtens Committed by John W. Linville
Browse files

ssb: extif: add methods for watchdog driver 



The watchdog driver wants to set the watchdog timeout in ms and not in
ticks, add a method converting ms to ticks before setting the watchdog
register. Return the ticks or millisecond the timer was set to in case
the provided value was bigger than the max allowed value.

Signed-off-by: default avatarHauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 7280b51a

drivers/ssb/driver_extif.c

+20 −1
Original line number Diff line number Diff line
@@ -112,11 +112,30 @@ void ssb_extif_get_clockcontrol(struct ssb_extif *extif, 
	*m = extif_read32(extif, SSB_EXTIF_CLOCK_SB);

}



void ssb_extif_watchdog_timer_set(struct ssb_extif *extif, u32 ticks)

u32 ssb_extif_watchdog_timer_set_wdt(struct bcm47xx_wdt *wdt, u32 ticks)

{

	struct ssb_extif *extif = bcm47xx_wdt_get_drvdata(wdt);



	return ssb_extif_watchdog_timer_set(extif, ticks);

}



u32 ssb_extif_watchdog_timer_set_ms(struct bcm47xx_wdt *wdt, u32 ms)

{

	struct ssb_extif *extif = bcm47xx_wdt_get_drvdata(wdt);

	u32 ticks = (SSB_EXTIF_WATCHDOG_CLK / 1000) * ms;



	ticks = ssb_extif_watchdog_timer_set(extif, ticks);



	return (ticks * 1000) / SSB_EXTIF_WATCHDOG_CLK;

}



u32 ssb_extif_watchdog_timer_set(struct ssb_extif *extif, u32 ticks)

{

	if (ticks > SSB_EXTIF_WATCHDOG_MAX_TIMER)

		ticks = SSB_EXTIF_WATCHDOG_MAX_TIMER;

	extif_write32(extif, SSB_EXTIF_WATCHDOG, ticks);



	return ticks;

}



u32 ssb_extif_gpio_in(struct ssb_extif *extif, u32 mask)

drivers/ssb/ssb_private.h

+15 −0
Original line number Diff line number Diff line
@@ -217,4 +217,19 @@ extern u32 ssb_chipco_watchdog_timer_set_wdt(struct bcm47xx_wdt *wdt, 
					     u32 ticks);

extern u32 ssb_chipco_watchdog_timer_set_ms(struct bcm47xx_wdt *wdt, u32 ms);



#ifdef CONFIG_SSB_DRIVER_EXTIF

extern u32 ssb_extif_watchdog_timer_set_wdt(struct bcm47xx_wdt *wdt, u32 ticks);

extern u32 ssb_extif_watchdog_timer_set_ms(struct bcm47xx_wdt *wdt, u32 ms);

#else

static inline u32 ssb_extif_watchdog_timer_set_wdt(struct bcm47xx_wdt *wdt,

						   u32 ticks)

{

	return 0;

}

static inline u32 ssb_extif_watchdog_timer_set_ms(struct bcm47xx_wdt *wdt,

						  u32 ms)

{

	return 0;

}

#endif

#endif /* LINUX_SSB_PRIVATE_H_ */

include/linux/ssb/ssb_driver_extif.h

+5 −4
Original line number Diff line number Diff line
@@ -153,6 +153,8 @@ 
#define SSB_EXTIF_WATCHDOG_CLK		48000000	/* Hz */



#define SSB_EXTIF_WATCHDOG_MAX_TIMER	((1 << 28) - 1)

#define SSB_EXTIF_WATCHDOG_MAX_TIMER_MS	(SSB_EXTIF_WATCHDOG_MAX_TIMER \

					 / (SSB_EXTIF_WATCHDOG_CLK / 1000))





#ifdef CONFIG_SSB_DRIVER_EXTIF
@@ -172,8 +174,7 @@ extern void ssb_extif_get_clockcontrol(struct ssb_extif *extif, 
extern void ssb_extif_timing_init(struct ssb_extif *extif,

				  unsigned long ns);



extern void ssb_extif_watchdog_timer_set(struct ssb_extif *extif,

					 u32 ticks);

extern u32 ssb_extif_watchdog_timer_set(struct ssb_extif *extif, u32 ticks);



/* Extif GPIO pin access */

u32 ssb_extif_gpio_in(struct ssb_extif *extif, u32 mask);
@@ -211,9 +212,9 @@ void ssb_extif_timing_init(struct ssb_extif *extif, unsigned long ns) 
}



static inline

void ssb_extif_watchdog_timer_set(struct ssb_extif *extif,

				  u32 ticks)

u32 ssb_extif_watchdog_timer_set(struct ssb_extif *extif, u32 ticks)

{

	return 0;

}



static inline u32 ssb_extif_gpio_in(struct ssb_extif *extif, u32 mask)