diff options
author | Tom Rini <trini@konsulko.com> | 2019-08-12 18:47:53 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2019-08-12 18:47:53 -0400 |
commit | 9c6115822e894ead72fa4c094bf718eaabb9e103 (patch) | |
tree | 4f8843a5cfbe2895a168d96dee111dd31e443b2a /arch/arm/include | |
parent | 5939afc9611e8ba4a86b96e67670b765ee27668e (diff) | |
parent | 0805fe151d8c47cfbcfddf71c0891ed4f3c10b56 (diff) |
Merge branch '2019-08-11-ti-imports'
- More DaVinci updates and fixes
- PCIe support on am65x
- Watchdog converted to DM
- Assorted other bugfixes
Diffstat (limited to 'arch/arm/include')
-rw-r--r-- | arch/arm/include/asm/ti-common/omap_wdt.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/include/asm/ti-common/omap_wdt.h b/arch/arm/include/asm/ti-common/omap_wdt.h index 7d72e3af02..fbc421b630 100644 --- a/arch/arm/include/asm/ti-common/omap_wdt.h +++ b/arch/arm/include/asm/ti-common/omap_wdt.h @@ -56,4 +56,9 @@ struct wd_timer { unsigned int wdt_unfr; /* offset 0x100 */ }; +struct omap3_wdt_priv { + struct wd_timer *regs; + unsigned int wdt_trgr_pattern; +}; + #endif /* __OMAP_WDT_H__ */ |