Merge branch 'watchdog-fix' into omap-for-v5.5/ti-sysc