1 From 490d103232287eb51c92c49a4ef8865fd0a9d59e Mon Sep 17 00:00:00 2001
2 From: Sham Muthayyan <smuthayy@codeaurora.org>
3 Date: Tue, 19 Jul 2016 18:58:18 +0530
4 Subject: PCI: qcom: Fixed IPQ806x PCIE reset changes
6 Change-Id: Ia6590e960b9754b1e8b7a51f318788cd63e9e321
7 Signed-off-by: Sham Muthayyan <smuthayy@codeaurora.org>
9 drivers/pci/host/pcie-qcom.c | 24 +++++++++++++++++++-----
10 1 file changed, 19 insertions(+), 5 deletions(-)
12 --- a/drivers/pci/dwc/pcie-qcom.c
13 +++ b/drivers/pci/dwc/pcie-qcom.c
14 @@ -98,6 +98,7 @@ struct qcom_pcie_resources_2_1_0 {
15 struct reset_control *ahb_reset;
16 struct reset_control *por_reset;
17 struct reset_control *phy_reset;
18 + struct reset_control *ext_reset;
19 struct regulator *vdda;
20 struct regulator *vdda_phy;
21 struct regulator *vdda_refclk;
22 @@ -275,6 +276,10 @@ static int qcom_pcie_get_resources_2_1_0
23 if (IS_ERR(res->por_reset))
24 return PTR_ERR(res->por_reset);
26 + res->ext_reset = devm_reset_control_get(dev, "ext");
27 + if (IS_ERR(res->ext_reset))
28 + return PTR_ERR(res->ext_reset);
30 res->phy_reset = devm_reset_control_get_exclusive(dev, "phy");
31 return PTR_ERR_OR_ZERO(res->phy_reset);
33 @@ -288,6 +293,7 @@ static void qcom_pcie_deinit_2_1_0(struc
34 reset_control_assert(res->ahb_reset);
35 reset_control_assert(res->por_reset);
36 reset_control_assert(res->pci_reset);
37 + reset_control_assert(res->ext_reset);
38 clk_disable_unprepare(res->iface_clk);
39 clk_disable_unprepare(res->core_clk);
40 clk_disable_unprepare(res->phy_clk);
41 @@ -306,6 +312,12 @@ static int qcom_pcie_init_2_1_0(struct q
45 + ret = reset_control_assert(res->ahb_reset);
47 + dev_err(dev, "cannot assert ahb reset\n");
51 ret = regulator_enable(res->vdda);
53 dev_err(dev, "cannot enable vdda regulator\n");
54 @@ -324,16 +336,16 @@ static int qcom_pcie_init_2_1_0(struct q
58 - ret = reset_control_assert(res->ahb_reset);
59 + ret = reset_control_deassert(res->ext_reset);
61 - dev_err(dev, "cannot assert ahb reset\n");
62 - goto err_assert_ahb;
63 + dev_err(dev, "cannot assert ext reset\n");
67 ret = clk_prepare_enable(res->iface_clk);
69 dev_err(dev, "cannot prepare/enable iface clock\n");
70 - goto err_assert_ahb;
74 ret = clk_prepare_enable(res->core_clk);
75 @@ -422,7 +434,9 @@ err_clk_phy:
76 clk_disable_unprepare(res->core_clk);
78 clk_disable_unprepare(res->iface_clk);
81 + reset_control_assert(res->ext_reset);
83 regulator_disable(res->vdda_phy);
85 regulator_disable(res->vdda_refclk);