Merge remote-tracking branch 'arm-soc/clksrc/cleanup' into sunxi/core-for-3.10