Merge branch 'omap-for-v4.13/clkctrl' into omap-for-v4.13/soc-v4