ipq806x: refresh 4.19 patches

[oweals/openwrt.git] / target / linux / ipq806x / patches-4.19 / 0071-2-PCI-qcom-Fixed-IPQ806x-PCIE-reset-changes.patch

diff --git a/target/linux/ipq806x/patches-4.19/0071-2-PCI-qcom-Fixed-IPQ806x-PCIE-reset-changes.patch b/target/linux/ipq806x/patches-4.19/0071-2-PCI-qcom-Fixed-IPQ806x-PCIE-reset-changes.patch
index 8b9e5ff5d11be20075a426d93b6fd2719b03fcaa..5bd865a42eb821656a89c465f951a319e488dc92 100644 (file)
--- a/target/linux/ipq806x/patches-4.19/0071-2-PCI-qcom-Fixed-IPQ806x-PCIE-reset-changes.patch
+++ b/target/linux/ipq806x/patches-4.19/0071-2-PCI-qcom-Fixed-IPQ806x-PCIE-reset-changes.patch
@@ -6,20 +6,18 @@ Subject: PCI: qcom: Fixed IPQ806x PCIE reset changes
 Change-Id: Ia6590e960b9754b1e8b7a51f318788cd63e9e321
 Signed-off-by: Sham Muthayyan <smuthayy@codeaurora.org>
 ---
- drivers/pci/host/pcie-qcom.c | 24 +++++++++++++++++++-----
- 1 file changed, 19 insertions(+), 5 deletions(-)
 
---- a/drivers/pci/dwc/pcie-qcom.c
-+++ b/drivers/pci/dwc/pcie-qcom.c
-@@ -98,6 +98,7 @@ struct qcom_pcie_resources_2_1_0 {
+--- a/drivers/pci/controller/dwc/pcie-qcom.c
++++ b/drivers/pci/controller/dwc/pcie-qcom.c
+@@ -92,6 +92,7 @@ struct qcom_pcie_resources_2_1_0 {
        struct reset_control *ahb_reset;
        struct reset_control *por_reset;
        struct reset_control *phy_reset;
 +      struct reset_control *ext_reset;
-       struct regulator *vdda;
-       struct regulator *vdda_phy;
-       struct regulator *vdda_refclk;
-@@ -275,6 +276,10 @@ static int qcom_pcie_get_resources_2_1_0
+       struct regulator_bulk_data supplies[QCOM_PCIE_2_1_0_MAX_SUPPLY];
+ };
+ 
+@@ -261,6 +262,10 @@ static int qcom_pcie_get_resources_2_1_0
        if (IS_ERR(res->por_reset))
                return PTR_ERR(res->por_reset);
  
@@ -30,7 +28,7 @@ Signed-off-by: Sham Muthayyan <smuthayy@codeaurora.org>
        res->phy_reset = devm_reset_control_get_exclusive(dev, "phy");
        return PTR_ERR_OR_ZERO(res->phy_reset);
  }
-@@ -288,6 +293,7 @@ static void qcom_pcie_deinit_2_1_0(struc
+@@ -274,6 +279,7 @@ static void qcom_pcie_deinit_2_1_0(struc
        reset_control_assert(res->ahb_reset);
        reset_control_assert(res->por_reset);
        reset_control_assert(res->pci_reset);
@@ -38,7 +36,7 @@ Signed-off-by: Sham Muthayyan <smuthayy@codeaurora.org>
        clk_disable_unprepare(res->iface_clk);
        clk_disable_unprepare(res->core_clk);
        clk_disable_unprepare(res->phy_clk);
-@@ -306,6 +312,12 @@ static int qcom_pcie_init_2_1_0(struct q
+@@ -290,15 +296,21 @@ static int qcom_pcie_init_2_1_0(struct q
        u32 val;
        int ret;
  
@@ -48,38 +46,17 @@ Signed-off-by: Sham Muthayyan <smuthayy@codeaurora.org>
 +              return ret;
 +      }
 +
-       ret = regulator_enable(res->vdda);
-       if (ret) {
-               dev_err(dev, "cannot enable vdda regulator\n");
-@@ -324,16 +336,16 @@ static int qcom_pcie_init_2_1_0(struct q
-               goto err_vdda_phy;
+       ret = regulator_bulk_enable(ARRAY_SIZE(res->supplies), res->supplies);
+       if (ret < 0) {
+               dev_err(dev, "cannot enable regulators\n");
+               return ret;
        }
  
 -      ret = reset_control_assert(res->ahb_reset);
 +      ret = reset_control_deassert(res->ext_reset);
        if (ret) {
 -              dev_err(dev, "cannot assert ahb reset\n");
--              goto err_assert_ahb;
 +              dev_err(dev, "cannot assert ext reset\n");
-+              goto err_reset_ext;
-       }
- 
-       ret = clk_prepare_enable(res->iface_clk);
-       if (ret) {
-               dev_err(dev, "cannot prepare/enable iface clock\n");
--              goto err_assert_ahb;
-+              goto err_iface;
+               goto err_assert_ahb;
        }
  
-       ret = clk_prepare_enable(res->core_clk);
-@@ -422,7 +434,9 @@ err_clk_phy:
-       clk_disable_unprepare(res->core_clk);
- err_clk_core:
-       clk_disable_unprepare(res->iface_clk);
--err_assert_ahb:
-+err_iface:
-+      reset_control_assert(res->ext_reset);
-+err_reset_ext:
-       regulator_disable(res->vdda_phy);
- err_vdda_phy:
-       regulator_disable(res->vdda_refclk);