Merge remote-tracking branch 'korg_arm-soc/timer/cleanup' into cleanup