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

Commit f625b1ad authored by Srinivas Kandagatla's avatar Srinivas Kandagatla Committed by Lorenzo Pieralisi
Browse files

PCI: qcom: Add missing supplies required for msm8996 



This patch adds supplies that are required for msm8996. vdda
is analog supply that go in to controller, and vddpe_3v3 is
supply to PCIe endpoint.

Without these supplies PCIe endpoints which require power supplies are
not enumerated at all, as there is no one to power it up.

Signed-off-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Acked-by: default avatarStanimir Varbanov <svarbanov@mm-sol.com>
Reviewed-by: default avatarRob Herring <robh@kernel.org>
parent ae15d863

Documentation/devicetree/bindings/pci/qcom,pcie.txt

+4 −0
Original line number Diff line number Diff line
@@ -189,6 +189,10 @@ 
	Value type: <phandle>

	Definition: A phandle to the analog power supply for IC which generates

		    reference clock

- vddpe-3v3-supply:

	Usage: optional

	Value type: <phandle>

	Definition: A phandle to the PCIe endpoint power supply



- phys:

	Usage: required for apq8084

drivers/pci/dwc/pcie-qcom.c

+22 −1
Original line number Diff line number Diff line
@@ -102,12 +102,14 @@ struct qcom_pcie_resources_1_0_0 { 
	struct regulator *vdda;

};



#define QCOM_PCIE_2_3_2_MAX_SUPPLY	2

struct qcom_pcie_resources_2_3_2 {

	struct clk *aux_clk;

	struct clk *master_clk;

	struct clk *slave_clk;

	struct clk *cfg_clk;

	struct clk *pipe_clk;

	struct regulator_bulk_data supplies[QCOM_PCIE_2_3_2_MAX_SUPPLY];

};



struct qcom_pcie_resources_2_4_0 {
@@ -521,6 +523,14 @@ static int qcom_pcie_get_resources_2_3_2(struct qcom_pcie *pcie) 
	struct qcom_pcie_resources_2_3_2 *res = &pcie->res.v2_3_2;

	struct dw_pcie *pci = pcie->pci;

	struct device *dev = pci->dev;

	int ret;



	res->supplies[0].supply = "vdda";

	res->supplies[1].supply = "vddpe-3v3";

	ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(res->supplies),

				      res->supplies);

	if (ret)

		return ret;



	res->aux_clk = devm_clk_get(dev, "aux");

	if (IS_ERR(res->aux_clk))
@@ -550,6 +560,8 @@ static void qcom_pcie_deinit_2_3_2(struct qcom_pcie *pcie) 
	clk_disable_unprepare(res->master_clk);

	clk_disable_unprepare(res->cfg_clk);

	clk_disable_unprepare(res->aux_clk);



	regulator_bulk_disable(ARRAY_SIZE(res->supplies), res->supplies);

}



static void qcom_pcie_post_deinit_2_3_2(struct qcom_pcie *pcie)
@@ -567,10 +579,16 @@ static int qcom_pcie_init_2_3_2(struct qcom_pcie *pcie) 
	u32 val;

	int ret;



	ret = regulator_bulk_enable(ARRAY_SIZE(res->supplies), res->supplies);

	if (ret < 0) {

		dev_err(dev, "cannot enable regulators\n");

		return ret;

	}



	ret = clk_prepare_enable(res->aux_clk);

	if (ret) {

		dev_err(dev, "cannot prepare/enable aux clock\n");

		return ret;

		goto err_aux_clk;

	}



	ret = clk_prepare_enable(res->cfg_clk);
@@ -621,6 +639,9 @@ static int qcom_pcie_init_2_3_2(struct qcom_pcie *pcie) 
err_cfg_clk:

	clk_disable_unprepare(res->aux_clk);



err_aux_clk:

	regulator_bulk_disable(ARRAY_SIZE(res->supplies), res->supplies);



	return ret;

}