evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "clk: qcom: Add support for cpu clock for sdm630"

Browse source
This commit is contained in:
Linux Build Service Account 2017-02-01 19:23:41 -08:00 • committed by Gerrit - the friendly Code Review server
commit ebe8fc6799
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Documentation/devicetree/bindings/arm/msm/qcom,osm.txt
View file

@ -10,8 +10,9 @@ Properties:
Usage: required
Value type: <string>
Definition: must be "qcom,cpu-clock-osm-msm8998-v1",
"qcom,cpu-clock-osm-msm8998-v2" or
"qcom,clk-cpu-osm".
"qcom,cpu-clock-osm-msm8998-v2",
"qcom,clk-cpu-osm" or
"qcom,clk-cpu-osm-sdm630".
- reg
Usage: required

9
drivers/clk/qcom/clk-cpu-osm.c
View file

@ -3034,6 +3034,7 @@ static int clk_cpu_osm_driver_probe(struct platform_device *pdev)
{
int rc = 0, cpu, i;
int speedbin = 0, pvs_ver = 0;
bool is_sdm630 = 0;
u32 pte_efuse;
int num_clks = ARRAY_SIZE(osm_qcom_clk_hws);
struct clk *clk;
@ -3306,6 +3307,13 @@ static int clk_cpu_osm_driver_probe(struct platform_device *pdev)
"Failed to enable clock for cpu %d\n", cpu);
}
is_sdm630 = of_device_is_compatible(pdev->dev.of_node,
"qcom,clk-cpu-osm-sdm630");
if (is_sdm630) {
pwrcl_boot_rate = 1382400000;
perfcl_boot_rate = 1670400000;
}
/* Set final boot rate */
rc = clk_set_rate(pwrcl_clk.hw.clk, pwrcl_boot_rate);
if (rc) {
@ -3348,6 +3356,7 @@ exit:
static const struct of_device_id match_table[] = {
{ .compatible = "qcom,clk-cpu-osm" },
{ .compatible = "qcom,clk-cpu-osm-sdm630" },
{}
};