Merge back earlier cpufreq material for 5.20.