Re: [PATCH] PCI: qcom: use regulator bluk api for apq8064 supplies

2018-02-14 Thread Srinivas Kandagatla 



On 14/02/18 15:35, Bjorn Andersson wrote:

+   res->supplies[1].supply = "vdda_phy";
+   res->supplies[1].supply = "vdda_refclk";

2


+   ret = devm_regulator_bulk_get(dev, QCOM_PCIE_2_1_0_MAX_SUPPLY,

Use ARRAY_SIZE(res->supplies) instead.

Thanks, Will fix it and send a new one.

--srini



+ res->supplies);
+   if (ret)
+   return ret;
  

Other than that, this looks good.

Re: [PATCH] PCI: qcom: use regulator bluk api for apq8064 supplies

2018-02-14 Thread Srinivas Kandagatla 



On 14/02/18 15:35, Bjorn Andersson wrote:

+   res->supplies[1].supply = "vdda_phy";
+   res->supplies[1].supply = "vdda_refclk";

2


+   ret = devm_regulator_bulk_get(dev, QCOM_PCIE_2_1_0_MAX_SUPPLY,

Use ARRAY_SIZE(res->supplies) instead.

Thanks, Will fix it and send a new one.

--srini



+ res->supplies);
+   if (ret)
+   return ret;
  

Other than that, this looks good.

Re: [PATCH] PCI: qcom: use regulator bluk api for apq8064 supplies

2018-02-14 Thread Bjorn Andersson 
On Wed 14 Feb 04:23 PST 2018, Srinivas Kandagatla wrote:
> @@ -217,18 +216,15 @@ static int qcom_pcie_get_resources_2_1_0(struct 
> qcom_pcie *pcie)
>   struct qcom_pcie_resources_2_1_0 *res = >res.v2_1_0;
>   struct dw_pcie *pci = pcie->pci;
>   struct device *dev = pci->dev;
> + int ret;
>  
> - res->vdda = devm_regulator_get(dev, "vdda");
> - if (IS_ERR(res->vdda))
> - return PTR_ERR(res->vdda);
> -
> - res->vdda_phy = devm_regulator_get(dev, "vdda_phy");
> - if (IS_ERR(res->vdda_phy))
> - return PTR_ERR(res->vdda_phy);
> -
> - res->vdda_refclk = devm_regulator_get(dev, "vdda_refclk");
> - if (IS_ERR(res->vdda_refclk))
> - return PTR_ERR(res->vdda_refclk);
> + res->supplies[0].supply = "vdda";
> + res->supplies[1].supply = "vdda_phy";
> + res->supplies[1].supply = "vdda_refclk";

2

> + ret = devm_regulator_bulk_get(dev, QCOM_PCIE_2_1_0_MAX_SUPPLY,

Use ARRAY_SIZE(res->supplies) instead.

> +   res->supplies);
> + if (ret)
> + return ret;
>  

Other than that, this looks good.

Regards,
Bjorn

Re: [PATCH] PCI: qcom: use regulator bluk api for apq8064 supplies

2018-02-14 Thread Bjorn Andersson 
On Wed 14 Feb 04:23 PST 2018, Srinivas Kandagatla wrote:
> @@ -217,18 +216,15 @@ static int qcom_pcie_get_resources_2_1_0(struct 
> qcom_pcie *pcie)
>   struct qcom_pcie_resources_2_1_0 *res = >res.v2_1_0;
>   struct dw_pcie *pci = pcie->pci;
>   struct device *dev = pci->dev;
> + int ret;
>  
> - res->vdda = devm_regulator_get(dev, "vdda");
> - if (IS_ERR(res->vdda))
> - return PTR_ERR(res->vdda);
> -
> - res->vdda_phy = devm_regulator_get(dev, "vdda_phy");
> - if (IS_ERR(res->vdda_phy))
> - return PTR_ERR(res->vdda_phy);
> -
> - res->vdda_refclk = devm_regulator_get(dev, "vdda_refclk");
> - if (IS_ERR(res->vdda_refclk))
> - return PTR_ERR(res->vdda_refclk);
> + res->supplies[0].supply = "vdda";
> + res->supplies[1].supply = "vdda_phy";
> + res->supplies[1].supply = "vdda_refclk";

2

> + ret = devm_regulator_bulk_get(dev, QCOM_PCIE_2_1_0_MAX_SUPPLY,

Use ARRAY_SIZE(res->supplies) instead.

> +   res->supplies);
> + if (ret)
> + return ret;
>  

Other than that, this looks good.

Regards,
Bjorn

[PATCH] PCI: qcom: use regulator bluk api for apq8064 supplies

2018-02-14 Thread srinivas . kandagatla 
From: Srinivas Kandagatla 

This patch converts existing regulators to use regulator bulk apis,
to make it consistent with msm8996 changes also cut down some redundant code.

Signed-off-by: Srinivas Kandagatla 
---
 drivers/pci/dwc/pcie-qcom.c | 52 +
 1 file changed, 15 insertions(+), 37 deletions(-)

diff --git a/drivers/pci/dwc/pcie-qcom.c b/drivers/pci/dwc/pcie-qcom.c
index 519a2ae416eb..ba923cfeaa25 100644
--- a/drivers/pci/dwc/pcie-qcom.c
+++ b/drivers/pci/dwc/pcie-qcom.c
@@ -79,6 +79,7 @@
 #define PCIE20_v3_PARF_SLV_ADDR_SPACE_SIZE 0x358
 #define SLV_ADDR_SPACE_SZ  0x1000
 
+#define QCOM_PCIE_2_1_0_MAX_SUPPLY 3
 struct qcom_pcie_resources_2_1_0 {
struct clk *iface_clk;
struct clk *core_clk;
@@ -88,9 +89,7 @@ struct qcom_pcie_resources_2_1_0 {
struct reset_control *ahb_reset;
struct reset_control *por_reset;
struct reset_control *phy_reset;
-   struct regulator *vdda;
-   struct regulator *vdda_phy;
-   struct regulator *vdda_refclk;
+   struct regulator_bulk_data supplies[QCOM_PCIE_2_1_0_MAX_SUPPLY];
 };
 
 struct qcom_pcie_resources_1_0_0 {
@@ -217,18 +216,15 @@ static int qcom_pcie_get_resources_2_1_0(struct qcom_pcie 
*pcie)
struct qcom_pcie_resources_2_1_0 *res = >res.v2_1_0;
struct dw_pcie *pci = pcie->pci;
struct device *dev = pci->dev;
+   int ret;
 
-   res->vdda = devm_regulator_get(dev, "vdda");
-   if (IS_ERR(res->vdda))
-   return PTR_ERR(res->vdda);
-
-   res->vdda_phy = devm_regulator_get(dev, "vdda_phy");
-   if (IS_ERR(res->vdda_phy))
-   return PTR_ERR(res->vdda_phy);
-
-   res->vdda_refclk = devm_regulator_get(dev, "vdda_refclk");
-   if (IS_ERR(res->vdda_refclk))
-   return PTR_ERR(res->vdda_refclk);
+   res->supplies[0].supply = "vdda";
+   res->supplies[1].supply = "vdda_phy";
+   res->supplies[1].supply = "vdda_refclk";
+   ret = devm_regulator_bulk_get(dev, QCOM_PCIE_2_1_0_MAX_SUPPLY,
+ res->supplies);
+   if (ret)
+   return ret;
 
res->iface_clk = devm_clk_get(dev, "iface");
if (IS_ERR(res->iface_clk))
@@ -274,9 +270,7 @@ static void qcom_pcie_deinit_2_1_0(struct qcom_pcie *pcie)
clk_disable_unprepare(res->iface_clk);
clk_disable_unprepare(res->core_clk);
clk_disable_unprepare(res->phy_clk);
-   regulator_disable(res->vdda);
-   regulator_disable(res->vdda_phy);
-   regulator_disable(res->vdda_refclk);
+   regulator_bulk_disable(QCOM_PCIE_2_1_0_MAX_SUPPLY, res->supplies);
 }
 
 static int qcom_pcie_init_2_1_0(struct qcom_pcie *pcie)
@@ -287,24 +281,12 @@ static int qcom_pcie_init_2_1_0(struct qcom_pcie *pcie)
u32 val;
int ret;
 
-   ret = regulator_enable(res->vdda);
-   if (ret) {
-   dev_err(dev, "cannot enable vdda regulator\n");
+   ret = regulator_bulk_enable(QCOM_PCIE_2_1_0_MAX_SUPPLY, res->supplies);
+   if (ret < 0) {
+   dev_err(dev, "cannot enable regulators\n");
return ret;
}
 
-   ret = regulator_enable(res->vdda_refclk);
-   if (ret) {
-   dev_err(dev, "cannot enable vdda_refclk regulator\n");
-   goto err_refclk;
-   }
-
-   ret = regulator_enable(res->vdda_phy);
-   if (ret) {
-   dev_err(dev, "cannot enable vdda_phy regulator\n");
-   goto err_vdda_phy;
-   }
-
ret = reset_control_assert(res->ahb_reset);
if (ret) {
dev_err(dev, "cannot assert ahb reset\n");
@@ -388,11 +370,7 @@ static int qcom_pcie_init_2_1_0(struct qcom_pcie *pcie)
 err_clk_phy:
clk_disable_unprepare(res->iface_clk);
 err_assert_ahb:
-   regulator_disable(res->vdda_phy);
-err_vdda_phy:
-   regulator_disable(res->vdda_refclk);
-err_refclk:
-   regulator_disable(res->vdda);
+   regulator_bulk_disable(QCOM_PCIE_2_1_0_MAX_SUPPLY, res->supplies);
 
return ret;
 }
-- 
2.15.1

[PATCH] PCI: qcom: use regulator bluk api for apq8064 supplies

2018-02-14 Thread srinivas . kandagatla 
From: Srinivas Kandagatla 

This patch converts existing regulators to use regulator bulk apis,
to make it consistent with msm8996 changes also cut down some redundant code.

Signed-off-by: Srinivas Kandagatla 
---
 drivers/pci/dwc/pcie-qcom.c | 52 +
 1 file changed, 15 insertions(+), 37 deletions(-)

diff --git a/drivers/pci/dwc/pcie-qcom.c b/drivers/pci/dwc/pcie-qcom.c
index 519a2ae416eb..ba923cfeaa25 100644
--- a/drivers/pci/dwc/pcie-qcom.c
+++ b/drivers/pci/dwc/pcie-qcom.c
@@ -79,6 +79,7 @@
 #define PCIE20_v3_PARF_SLV_ADDR_SPACE_SIZE 0x358
 #define SLV_ADDR_SPACE_SZ  0x1000
 
+#define QCOM_PCIE_2_1_0_MAX_SUPPLY 3
 struct qcom_pcie_resources_2_1_0 {
struct clk *iface_clk;
struct clk *core_clk;
@@ -88,9 +89,7 @@ struct qcom_pcie_resources_2_1_0 {
struct reset_control *ahb_reset;
struct reset_control *por_reset;
struct reset_control *phy_reset;
-   struct regulator *vdda;
-   struct regulator *vdda_phy;
-   struct regulator *vdda_refclk;
+   struct regulator_bulk_data supplies[QCOM_PCIE_2_1_0_MAX_SUPPLY];
 };
 
 struct qcom_pcie_resources_1_0_0 {
@@ -217,18 +216,15 @@ static int qcom_pcie_get_resources_2_1_0(struct qcom_pcie 
*pcie)
struct qcom_pcie_resources_2_1_0 *res = >res.v2_1_0;
struct dw_pcie *pci = pcie->pci;
struct device *dev = pci->dev;
+   int ret;
 
-   res->vdda = devm_regulator_get(dev, "vdda");
-   if (IS_ERR(res->vdda))
-   return PTR_ERR(res->vdda);
-
-   res->vdda_phy = devm_regulator_get(dev, "vdda_phy");
-   if (IS_ERR(res->vdda_phy))
-   return PTR_ERR(res->vdda_phy);
-
-   res->vdda_refclk = devm_regulator_get(dev, "vdda_refclk");
-   if (IS_ERR(res->vdda_refclk))
-   return PTR_ERR(res->vdda_refclk);
+   res->supplies[0].supply = "vdda";
+   res->supplies[1].supply = "vdda_phy";
+   res->supplies[1].supply = "vdda_refclk";
+   ret = devm_regulator_bulk_get(dev, QCOM_PCIE_2_1_0_MAX_SUPPLY,
+ res->supplies);
+   if (ret)
+   return ret;
 
res->iface_clk = devm_clk_get(dev, "iface");
if (IS_ERR(res->iface_clk))
@@ -274,9 +270,7 @@ static void qcom_pcie_deinit_2_1_0(struct qcom_pcie *pcie)
clk_disable_unprepare(res->iface_clk);
clk_disable_unprepare(res->core_clk);
clk_disable_unprepare(res->phy_clk);
-   regulator_disable(res->vdda);
-   regulator_disable(res->vdda_phy);
-   regulator_disable(res->vdda_refclk);
+   regulator_bulk_disable(QCOM_PCIE_2_1_0_MAX_SUPPLY, res->supplies);
 }
 
 static int qcom_pcie_init_2_1_0(struct qcom_pcie *pcie)
@@ -287,24 +281,12 @@ static int qcom_pcie_init_2_1_0(struct qcom_pcie *pcie)
u32 val;
int ret;
 
-   ret = regulator_enable(res->vdda);
-   if (ret) {
-   dev_err(dev, "cannot enable vdda regulator\n");
+   ret = regulator_bulk_enable(QCOM_PCIE_2_1_0_MAX_SUPPLY, res->supplies);
+   if (ret < 0) {
+   dev_err(dev, "cannot enable regulators\n");
return ret;
}
 
-   ret = regulator_enable(res->vdda_refclk);
-   if (ret) {
-   dev_err(dev, "cannot enable vdda_refclk regulator\n");
-   goto err_refclk;
-   }
-
-   ret = regulator_enable(res->vdda_phy);
-   if (ret) {
-   dev_err(dev, "cannot enable vdda_phy regulator\n");
-   goto err_vdda_phy;
-   }
-
ret = reset_control_assert(res->ahb_reset);
if (ret) {
dev_err(dev, "cannot assert ahb reset\n");
@@ -388,11 +370,7 @@ static int qcom_pcie_init_2_1_0(struct qcom_pcie *pcie)
 err_clk_phy:
clk_disable_unprepare(res->iface_clk);
 err_assert_ahb:
-   regulator_disable(res->vdda_phy);
-err_vdda_phy:
-   regulator_disable(res->vdda_refclk);
-err_refclk:
-   regulator_disable(res->vdda);
+   regulator_bulk_disable(QCOM_PCIE_2_1_0_MAX_SUPPLY, res->supplies);
 
return ret;
 }
-- 
2.15.1