Merge branch 'hwmod-cleanup' into omap-for-v4.12/soc