Merge "tspp: use device name when getting clock" into msm-3.4