Commit 2ada9593 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'qcom-drivers-for-4.10-2' of... 

Merge tag 'qcom-drivers-for-4.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/drivers

Pull "Qualcomm ARM Based Driver Updates for v4.10 - Part 2" from Andy Gross:

* Fixup QCOM SCM to support MSM8996

* tag 'qcom-drivers-for-4.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux:
  firmware: qcom: scm: Return PTR_ERR when devm_clk_get fails
  firmware: qcom: scm: Remove core, iface and bus clocks dependency
  dt-bindings: firmware: scm: Add MSM8996 DT bindings
parents ba9cb7b9 ed19b86e

Documentation/devicetree/bindings/firmware/qcom,scm.txt

+2 −0
Original line number Diff line number Diff line
@@ -10,8 +10,10 @@ Required properties: 
 * "qcom,scm-apq8064" for APQ8064 platforms

 * "qcom,scm-msm8660" for MSM8660 platforms

 * "qcom,scm-msm8690" for MSM8690 platforms

 * "qcom,scm-msm8996" for MSM8996 platforms

 * "qcom,scm" for later processors (MSM8916, APQ8084, MSM8974, etc)

- clocks: One to three clocks may be required based on compatible.

 * No clock required for "qcom,scm-msm8996"

 * Only core clock required for "qcom,scm-apq8064", "qcom,scm-msm8660", and "qcom,scm-msm8960"

 * Core, iface, and bus clocks required for "qcom,scm"

- clock-names: Must contain "core" for the core clock, "iface" for the interface

drivers/firmware/qcom_scm.c

+37 −12
Original line number Diff line number Diff line
@@ -28,6 +28,10 @@ 


#include "qcom_scm.h"



#define SCM_HAS_CORE_CLK	BIT(0)

#define SCM_HAS_IFACE_CLK	BIT(1)

#define SCM_HAS_BUS_CLK		BIT(2)



struct qcom_scm {

	struct device *dev;

	struct clk *core_clk;
@@ -323,32 +327,40 @@ EXPORT_SYMBOL(qcom_scm_is_available); 
static int qcom_scm_probe(struct platform_device *pdev)

{

	struct qcom_scm *scm;

	unsigned long clks;

	int ret;



	scm = devm_kzalloc(&pdev->dev, sizeof(*scm), GFP_KERNEL);

	if (!scm)

		return -ENOMEM;



	clks = (unsigned long)of_device_get_match_data(&pdev->dev);

	if (clks & SCM_HAS_CORE_CLK) {

		scm->core_clk = devm_clk_get(&pdev->dev, "core");

		if (IS_ERR(scm->core_clk)) {

		if (PTR_ERR(scm->core_clk) == -EPROBE_DEFER)

			if (PTR_ERR(scm->core_clk) != -EPROBE_DEFER)

				dev_err(&pdev->dev,

					"failed to acquire core clk\n");

			return PTR_ERR(scm->core_clk);



		scm->core_clk = NULL;

		}

	}



	if (of_device_is_compatible(pdev->dev.of_node, "qcom,scm")) {

	if (clks & SCM_HAS_IFACE_CLK) {

		scm->iface_clk = devm_clk_get(&pdev->dev, "iface");

		if (IS_ERR(scm->iface_clk)) {

			if (PTR_ERR(scm->iface_clk) != -EPROBE_DEFER)

				dev_err(&pdev->dev, "failed to acquire iface clk\n");

				dev_err(&pdev->dev,

					"failed to acquire iface clk\n");

			return PTR_ERR(scm->iface_clk);

		}

	}



	if (clks & SCM_HAS_BUS_CLK) {

		scm->bus_clk = devm_clk_get(&pdev->dev, "bus");

		if (IS_ERR(scm->bus_clk)) {

			if (PTR_ERR(scm->bus_clk) != -EPROBE_DEFER)

				dev_err(&pdev->dev, "failed to acquire bus clk\n");

				dev_err(&pdev->dev,

					"failed to acquire bus clk\n");

			return PTR_ERR(scm->bus_clk);

		}

	}
@@ -374,10 +386,23 @@ static int qcom_scm_probe(struct platform_device *pdev) 
}



static const struct of_device_id qcom_scm_dt_match[] = {

	{ .compatible = "qcom,scm-apq8064",},

	{ .compatible = "qcom,scm-msm8660",},

	{ .compatible = "qcom,scm-msm8960",},

	{ .compatible = "qcom,scm",},

	{ .compatible = "qcom,scm-apq8064",

	  .data = (void *) SCM_HAS_CORE_CLK,

	},

	{ .compatible = "qcom,scm-msm8660",

	  .data = (void *) SCM_HAS_CORE_CLK,

	},

	{ .compatible = "qcom,scm-msm8960",

	  .data = (void *) SCM_HAS_CORE_CLK,

	},

	{ .compatible = "qcom,scm-msm8996",

	  .data = NULL, /* no clocks */

	},

	{ .compatible = "qcom,scm",

	  .data = (void *)(SCM_HAS_CORE_CLK

			   | SCM_HAS_IFACE_CLK

			   | SCM_HAS_BUS_CLK),

	},

	{}

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE