Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97c8f0a6 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "qcom-cpufreq: Register cpufreq driver in driver probe"

parents 764fbbc7 d9d6c809

arch/arm64/configs/vendor/kona-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y 
CONFIG_CPU_BOOST=y

CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y

CONFIG_ARM_QCOM_CPUFREQ_HW=y

CONFIG_CPU_FREQ_MSM=y

CONFIG_ARM64_CRYPTO=y

CONFIG_CRYPTO_SHA1_ARM64_CE=y

CONFIG_CRYPTO_SHA2_ARM64_CE=y

arch/arm64/configs/vendor/kona_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y 
CONFIG_CPU_BOOST=y

CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y

CONFIG_ARM_QCOM_CPUFREQ_HW=y

CONFIG_CPU_FREQ_MSM=y

CONFIG_ARM64_CRYPTO=y

CONFIG_CRYPTO_SHA1_ARM64_CE=y

CONFIG_CRYPTO_SHA2_ARM64_CE=y

drivers/cpufreq/qcom-cpufreq.c

+11 −4
Original line number Diff line number Diff line
@@ -343,7 +343,7 @@ static int msm_cpufreq_probe(struct platform_device *pdev) 
	char clk_name[] = "cpu??_clk";

	char tbl_name[] = "qcom,cpufreq-table-??";

	struct clk *c;

	int cpu;

	int cpu, ret;

	struct cpufreq_frequency_table *ftbl;



	l2_clk = devm_clk_get(dev, "l2_clk");
@@ -410,7 +410,15 @@ static int msm_cpufreq_probe(struct platform_device *pdev) 
		per_cpu(freq_table, cpu) = ftbl;

	}



	return 0;

	ret = register_pm_notifier(&msm_cpufreq_pm_notifier);

	if (ret)

		return ret;



	ret = cpufreq_register_driver(&msm_cpufreq_driver);

	if (ret)

		unregister_pm_notifier(&msm_cpufreq_pm_notifier);



	return ret;

}



static const struct of_device_id msm_cpufreq_match_table[] = {
@@ -446,8 +454,7 @@ static int __init msm_cpufreq_register(void) 
		return rc;

	}



	register_pm_notifier(&msm_cpufreq_pm_notifier);

	return cpufreq_register_driver(&msm_cpufreq_driver);

	return 0;

}



subsys_initcall(msm_cpufreq_register);