target/linux/brcm47xx/patches-3.6/553-ssb-extif-add-methods-for-watchdog-driver.patch

   1 --- a/drivers/ssb/driver_extif.c
   2 +++ b/drivers/ssb/driver_extif.c
   3 @@ -112,11 +112,30 @@ void ssb_extif_get_clockcontrol(struct s
   4         *m = extif_read32(extif, SSB_EXTIF_CLOCK_SB);
   5  }
   6
   7 -void ssb_extif_watchdog_timer_set(struct ssb_extif *extif, u32 ticks)
   8 +u32 ssb_extif_watchdog_timer_set_wdt(struct bcm47xx_wdt *wdt, u32 ticks)
   9 +{
  10 +       struct ssb_extif *extif = bcm47xx_wdt_get_drvdata(wdt);
  11 +
  12 +       return ssb_extif_watchdog_timer_set(extif, ticks);
  13 +}
  14 +
  15 +u32 ssb_extif_watchdog_timer_set_ms(struct bcm47xx_wdt *wdt, u32 ms)
  16 +{
  17 +       struct ssb_extif *extif = bcm47xx_wdt_get_drvdata(wdt);
  18 +       u32 ticks = (SSB_EXTIF_WATCHDOG_CLK / 1000) * ms;
  19 +
  20 +       ticks = ssb_extif_watchdog_timer_set(extif, ticks);
  21 +
  22 +       return (ticks * 1000) / SSB_EXTIF_WATCHDOG_CLK;
  23 +}
  24 +
  25 +u32 ssb_extif_watchdog_timer_set(struct ssb_extif *extif, u32 ticks)
  26  {
  27         if (ticks > SSB_EXTIF_WATCHDOG_MAX_TIMER)
  28                 ticks = SSB_EXTIF_WATCHDOG_MAX_TIMER;
  29         extif_write32(extif, SSB_EXTIF_WATCHDOG, ticks);
  30 +
  31 +       return ticks;
  32  }
  33
  34  u32 ssb_extif_gpio_in(struct ssb_extif *extif, u32 mask)
  35 --- a/drivers/ssb/ssb_private.h
  36 +++ b/drivers/ssb/ssb_private.h
  37 @@ -231,4 +231,19 @@ extern u32 ssb_chipco_watchdog_timer_set
  38                                              u32 ticks);
  39  extern u32 ssb_chipco_watchdog_timer_set_ms(struct bcm47xx_wdt *wdt, u32 ms);
  40
  41 +#ifdef CONFIG_SSB_DRIVER_EXTIF
  42 +extern u32 ssb_extif_watchdog_timer_set_wdt(struct bcm47xx_wdt *wdt, u32 ticks);
  43 +extern u32 ssb_extif_watchdog_timer_set_ms(struct bcm47xx_wdt *wdt, u32 ms);
  44 +#else
  45 +static inline u32 ssb_extif_watchdog_timer_set_wdt(struct bcm47xx_wdt *wdt,
  46 +                                                  u32 ticks)
  47 +{
  48 +       return 0;
  49 +}
  50 +static inline u32 ssb_extif_watchdog_timer_set_ms(struct bcm47xx_wdt *wdt,
  51 +                                                 u32 ms)
  52 +{
  53 +       return 0;
  54 +}
  55 +#endif
  56  #endif /* LINUX_SSB_PRIVATE_H_ */
  57 --- a/include/linux/ssb/ssb_driver_extif.h
  58 +++ b/include/linux/ssb/ssb_driver_extif.h
  59 @@ -153,6 +153,8 @@
  60  #define SSB_EXTIF_WATCHDOG_CLK         48000000        /* Hz */
  61
  62  #define SSB_EXTIF_WATCHDOG_MAX_TIMER   ((1 << 28) - 1)
  63 +#define SSB_EXTIF_WATCHDOG_MAX_TIMER_MS        (SSB_EXTIF_WATCHDOG_MAX_TIMER \
  64 +                                        / (SSB_EXTIF_WATCHDOG_CLK / 1000))
  65
  66
  67  #ifdef CONFIG_SSB_DRIVER_EXTIF
  68 @@ -172,8 +174,7 @@ extern void ssb_extif_get_clockcontrol(s
  69  extern void ssb_extif_timing_init(struct ssb_extif *extif,
  70                                   unsigned long ns);
  71
  72 -extern void ssb_extif_watchdog_timer_set(struct ssb_extif *extif,
  73 -                                        u32 ticks);
  74 +extern u32 ssb_extif_watchdog_timer_set(struct ssb_extif *extif, u32 ticks);
  75
  76  /* Extif GPIO pin access */
  77  u32 ssb_extif_gpio_in(struct ssb_extif *extif, u32 mask);
  78 @@ -206,9 +207,9 @@ void ssb_extif_get_clockcontrol(struct s
  79  }
  80
  81  static inline
  82 -void ssb_extif_watchdog_timer_set(struct ssb_extif *extif,
  83 -                                 u32 ticks)
  84 +u32 ssb_extif_watchdog_timer_set(struct ssb_extif *extif, u32 ticks)
  85  {
  86 +       return 0;
  87  }
  88
  89  #endif /* CONFIG_SSB_DRIVER_EXTIF */