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

Commit ebe8fc67 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

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

parents 2427f88f f68f0e75

Documentation/devicetree/bindings/arm/msm/qcom,osm.txt

+3 −2
Original line number Diff line number Diff line
@@ -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

drivers/clk/qcom/clk-cpu-osm.c

+9 −0
Original line number Diff line number Diff line
@@ -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" },

	{}

};