Merge "msm: clock-8960: cleanup of clock_pre_init function"