ipq806x: refresh 4.19 patches

[openwrt/staging/stintel.git] / target / linux / ipq806x / patches-4.19 / 0071-8-pcie-qcom-Fixed-pcie_phy_clk-branch-issue.patch

diff --git a/target/linux/ipq806x/patches-4.19/0071-8-pcie-qcom-Fixed-pcie_phy_clk-branch-issue.patch b/target/linux/ipq806x/patches-4.19/0071-8-pcie-qcom-Fixed-pcie_phy_clk-branch-issue.patch
index 88bd7730c1f402255c6cddf14675759b45a132de..7cbeb3bed7a2f53ab815ca1d2c6244d32ebc7abf 100644 (file)
--- a/target/linux/ipq806x/patches-4.19/0071-8-pcie-qcom-Fixed-pcie_phy_clk-branch-issue.patch
+++ b/target/linux/ipq806x/patches-4.19/0071-8-pcie-qcom-Fixed-pcie_phy_clk-branch-issue.patch
@@ -36,9 +36,9 @@ Signed-off-by: Abhishek Sahu <absahu@codeaurora.org>
  drivers/pci/host/pcie-qcom.c | 16 +++++++---------
  1 file changed, 7 insertions(+), 9 deletions(-)
 
---- a/drivers/pci/dwc/pcie-qcom.c
-+++ b/drivers/pci/dwc/pcie-qcom.c
-@@ -407,6 +407,7 @@ static void qcom_pcie_deinit_2_1_0(struc
+--- a/drivers/pci/controller/dwc/pcie-qcom.c
++++ b/drivers/pci/controller/dwc/pcie-qcom.c
+@@ -393,6 +393,7 @@ static void qcom_pcie_deinit_2_1_0(struc
  {
        struct qcom_pcie_resources_2_1_0 *res = &pcie->res.v2_1_0;
  
@@ -46,15 +46,15 @@ Signed-off-by: Abhishek Sahu <absahu@codeaurora.org>
        reset_control_assert(res->pci_reset);
        reset_control_assert(res->axi_reset);
        reset_control_assert(res->ahb_reset);
-@@ -415,7 +416,6 @@ static void qcom_pcie_deinit_2_1_0(struc
+@@ -401,7 +402,6 @@ static void qcom_pcie_deinit_2_1_0(struc
        reset_control_assert(res->ext_reset);
        clk_disable_unprepare(res->iface_clk);
        clk_disable_unprepare(res->core_clk);
 -      clk_disable_unprepare(res->phy_clk);
        clk_disable_unprepare(res->aux_clk);
        clk_disable_unprepare(res->ref_clk);
-       regulator_disable(res->vdda);
-@@ -472,12 +472,6 @@ static int qcom_pcie_init_2_1_0(struct q
+       regulator_bulk_disable(ARRAY_SIZE(res->supplies), res->supplies);
+@@ -444,12 +444,6 @@ static int qcom_pcie_init_2_1_0(struct q
                goto err_clk_core;
        }
  
@@ -67,7 +67,7 @@ Signed-off-by: Abhishek Sahu <absahu@codeaurora.org>
        ret = clk_prepare_enable(res->aux_clk);
        if (ret) {
                dev_err(dev, "cannot prepare/enable aux clock\n");
-@@ -541,6 +535,12 @@ static int qcom_pcie_init_2_1_0(struct q
+@@ -513,6 +507,12 @@ static int qcom_pcie_init_2_1_0(struct q
                return ret;
        }
  
@@ -80,7 +80,7 @@ Signed-off-by: Abhishek Sahu <absahu@codeaurora.org>
        /* wait for clock acquisition */
        usleep_range(1000, 1500);
        if (pcie->force_gen1) {
-@@ -566,8 +566,6 @@ err_deassert_ahb:
+@@ -538,8 +538,6 @@ err_deassert_ahb:
  err_clk_ref:
        clk_disable_unprepare(res->aux_clk);
  err_clk_aux: