Merge "clk: qcom: clk-cpu-osm: Move the speedbin logic to after resource init" (6eb79127) · Commits · e / devices / android_kernel_fairphone_FP3

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

+8 −8

Original line number	Diff line number	Diff line
		@@ -3021,6 +3021,14 @@ static int clk_cpu_osm_driver_probe(struct platform_device *pdev)

		clk_data->clk_num = num_clks;

		rc = clk_osm_resources_init(pdev);
		if (rc) {
		if (rc != -EPROBE_DEFER)
		dev_err(&pdev->dev, "OSM resources init failed, rc=%d\n",
		rc);
		return rc;
		}

		if (l3_clk.vbases[EFUSE_BASE]) {
		/* Multiple speed-bins are supported */
		pte_efuse = readl_relaxed(l3_clk.vbases[EFUSE_BASE]);
		@@ -3092,14 +3100,6 @@ static int clk_cpu_osm_driver_probe(struct platform_device *pdev)
		return rc;
		}

		rc = clk_osm_resources_init(pdev);
		if (rc) {
		if (rc != -EPROBE_DEFER)
		dev_err(&pdev->dev, "OSM resources init failed, rc=%d\n",
		rc);
		return rc;
		}

		rc = clk_osm_acd_resources_init(pdev);
		if (rc) {
		dev_err(&pdev->dev, "ACD resources init failed, rc=%d\n",