Merge remote-tracking branch 'arm-soc/clksrc/cleanup' into mxs/cleanup