From: Srinivas Kandagatla <[email protected]>
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: Srinivas Kandagatla <[email protected]>
---
Changes since v1:
- specify only one vddpe as suggested by Stan
.../devicetree/bindings/pci/qcom,pcie.txt | 4 ++++
drivers/pci/dwc/pcie-qcom.c | 24 ++++++++++++++++++++--
2 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/Documentation/devicetree/bindings/pci/qcom,pcie.txt b/Documentation/devicetree/bindings/pci/qcom,pcie.txt
index 3c9d321b3d3b..1fd703bd73e0 100644
--- a/Documentation/devicetree/bindings/pci/qcom,pcie.txt
+++ b/Documentation/devicetree/bindings/pci/qcom,pcie.txt
@@ -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
diff --git a/drivers/pci/dwc/pcie-qcom.c b/drivers/pci/dwc/pcie-qcom.c
index 3e89909f8cb9..519a2ae416eb 100644
--- a/drivers/pci/dwc/pcie-qcom.c
+++ b/drivers/pci/dwc/pcie-qcom.c
@@ -101,13 +101,14 @@ struct qcom_pcie_resources_1_0_0 {
struct reset_control *core;
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 +522,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, QCOM_PCIE_2_3_2_MAX_SUPPLY,
+ res->supplies);
+ if (ret)
+ return ret;
res->aux_clk = devm_clk_get(dev, "aux");
if (IS_ERR(res->aux_clk))
@@ -550,6 +559,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(QCOM_PCIE_2_3_2_MAX_SUPPLY, res->supplies);
}
static void qcom_pcie_post_deinit_2_3_2(struct qcom_pcie *pcie)
@@ -567,10 +578,16 @@ static int qcom_pcie_init_2_3_2(struct qcom_pcie *pcie)
u32 val;
int ret;
+ ret = regulator_bulk_enable(QCOM_PCIE_2_3_2_MAX_SUPPLY, 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 +638,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(QCOM_PCIE_2_3_2_MAX_SUPPLY, res->supplies);
+
return ret;
}
--
2.15.1
Hi Srini,
Thanks for the patch!
On 02/14/2018 02:06 PM, [email protected] wrote:
> From: Srinivas Kandagatla <[email protected]>
>
> 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: Srinivas Kandagatla <[email protected]>
> ---
> Changes since v1:
> - specify only one vddpe as suggested by Stan
>
> .../devicetree/bindings/pci/qcom,pcie.txt | 4 ++++
> drivers/pci/dwc/pcie-qcom.c | 24 ++++++++++++++++++++--
> 2 files changed, 26 insertions(+), 2 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/pci/qcom,pcie.txt b/Documentation/devicetree/bindings/pci/qcom,pcie.txt
> index 3c9d321b3d3b..1fd703bd73e0 100644
> --- a/Documentation/devicetree/bindings/pci/qcom,pcie.txt
> +++ b/Documentation/devicetree/bindings/pci/qcom,pcie.txt
> @@ -189,6 +189,10 @@
> Value type: <phandle>
> Definition: A phandle to the analog power supply for IC which generates
> reference clock
> +- vddpe-3v3-supply:
shouldn't it be vddpe_3v3-supply to be aligned with the other supplies?
> + Usage: optional
> + Value type: <phandle>
> + Definition: A phandle to the PCIe endpoint power supply
>
> - phys:
> Usage: required for apq8084
> diff --git a/drivers/pci/dwc/pcie-qcom.c b/drivers/pci/dwc/pcie-qcom.c
> index 3e89909f8cb9..519a2ae416eb 100644
> --- a/drivers/pci/dwc/pcie-qcom.c
> +++ b/drivers/pci/dwc/pcie-qcom.c
> @@ -101,13 +101,14 @@ struct qcom_pcie_resources_1_0_0 {
> struct reset_control *core;
> struct regulator *vdda;
> };
> -
please keep above blank line.
> +#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 +522,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, QCOM_PCIE_2_3_2_MAX_SUPPLY,
> + res->supplies);
> + if (ret)
> + return ret;
>
> res->aux_clk = devm_clk_get(dev, "aux");
> if (IS_ERR(res->aux_clk))
> @@ -550,6 +559,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(QCOM_PCIE_2_3_2_MAX_SUPPLY, res->supplies);
> }
>
> static void qcom_pcie_post_deinit_2_3_2(struct qcom_pcie *pcie)
> @@ -567,10 +578,16 @@ static int qcom_pcie_init_2_3_2(struct qcom_pcie *pcie)
> u32 val;
> int ret;
>
> + ret = regulator_bulk_enable(QCOM_PCIE_2_3_2_MAX_SUPPLY, 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 +638,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(QCOM_PCIE_2_3_2_MAX_SUPPLY, res->supplies);
> +
> return ret;
> }
>
>
--
regards,
Stan
On 14/02/18 16:00, Stanimir Varbanov wrote:
>> .../devicetree/bindings/pci/qcom,pcie.txt | 4 ++++
>> drivers/pci/dwc/pcie-qcom.c | 24 ++++++++++++++++++++--
>> 2 files changed, 26 insertions(+), 2 deletions(-)
>>
>> diff --git a/Documentation/devicetree/bindings/pci/qcom,pcie.txt b/Documentation/devicetree/bindings/pci/qcom,pcie.txt
>> index 3c9d321b3d3b..1fd703bd73e0 100644
>> --- a/Documentation/devicetree/bindings/pci/qcom,pcie.txt
>> +++ b/Documentation/devicetree/bindings/pci/qcom,pcie.txt
>> @@ -189,6 +189,10 @@
>> Value type: <phandle>
>> Definition: A phandle to the analog power supply for IC which generates
>> reference clock
>> +- vddpe-3v3-supply:
> shouldn't it be vddpe_3v3-supply to be aligned with the other supplies?
>
I noticed that, I had to do it intentionally
As dt properties should follow - instead of _
>> + Usage: optional
>> + Value type: <phandle>
>> + Definition: A phandle to the PCIe endpoint power supply
>>
>> - phys:
>> Usage: required for apq8084
>> diff --git a/drivers/pci/dwc/pcie-qcom.c b/drivers/pci/dwc/pcie-qcom.c
>> index 3e89909f8cb9..519a2ae416eb 100644
>> --- a/drivers/pci/dwc/pcie-qcom.c
>> +++ b/drivers/pci/dwc/pcie-qcom.c
>> @@ -101,13 +101,14 @@ struct qcom_pcie_resources_1_0_0 {
>> struct reset_control *core;
>> struct regulator *vdda;
>> };
>> -
> please keep above blank line.
Will fix it.
>
>> +#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;
On 02/14/2018 06:14 PM, Srinivas Kandagatla wrote:
>
>
> On 14/02/18 16:00, Stanimir Varbanov wrote:
>>> .../devicetree/bindings/pci/qcom,pcie.txt | 4 ++++
>>> drivers/pci/dwc/pcie-qcom.c | 24
>>> ++++++++++++++++++++--
>>> 2 files changed, 26 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/Documentation/devicetree/bindings/pci/qcom,pcie.txt
>>> b/Documentation/devicetree/bindings/pci/qcom,pcie.txt
>>> index 3c9d321b3d3b..1fd703bd73e0 100644
>>> --- a/Documentation/devicetree/bindings/pci/qcom,pcie.txt
>>> +++ b/Documentation/devicetree/bindings/pci/qcom,pcie.txt
>>> @@ -189,6 +189,10 @@
>>> Value type: <phandle>
>>> Definition: A phandle to the analog power supply for IC which
>>> generates
>>> reference clock
>>> +- vddpe-3v3-supply:
>> shouldn't it be vddpe_3v3-supply to be aligned with the other supplies?
>>
> I noticed that, I had to do it intentionally
> As dt properties should follow - instead of _
I don't agree with that. If the supply name is more than one word it
should be separated by underscore ('git grep \-supply' in dts files).
--
regards,
Stan