ipq806x: refresh 4.19 patches

[openwrt/staging/ynezz.git] / target / linux / ipq806x / patches-4.19 / 0071-1-PCI-qcom-Fixed-IPQ806x-specific-clocks.patch

diff --git a/target/linux/ipq806x/patches-4.19/0071-1-PCI-qcom-Fixed-IPQ806x-specific-clocks.patch b/target/linux/ipq806x/patches-4.19/0071-1-PCI-qcom-Fixed-IPQ806x-specific-clocks.patch
index b9f6e33be636dcab728915e0d1a85c997f6ef349..3a3e0a0000ab12b32ecc2bd89501795a271e9536 100644 (file)
--- a/target/linux/ipq806x/patches-4.19/0071-1-PCI-qcom-Fixed-IPQ806x-specific-clocks.patch
+++ b/target/linux/ipq806x/patches-4.19/0071-1-PCI-qcom-Fixed-IPQ806x-specific-clocks.patch
@@ -6,12 +6,10 @@ Subject: PCI: qcom: Fixed IPQ806x specific clocks
 Change-Id: I488e1bc707d6a22b37a338f41935e3922009ba5e
 Signed-off-by: Sham Muthayyan <smuthayy@codeaurora.org>
 ---
- drivers/pci/host/pcie-qcom.c | 38 +++++++++++++++++++++++++++++++++-----
- 1 file changed, 33 insertions(+), 5 deletions(-)
 
---- a/drivers/pci/dwc/pcie-qcom.c
-+++ b/drivers/pci/dwc/pcie-qcom.c
-@@ -91,6 +91,8 @@ struct qcom_pcie_resources_2_1_0 {
+--- a/drivers/pci/controller/dwc/pcie-qcom.c
++++ b/drivers/pci/controller/dwc/pcie-qcom.c
+@@ -85,6 +85,8 @@ struct qcom_pcie_resources_2_1_0 {
        struct clk *iface_clk;
        struct clk *core_clk;
        struct clk *phy_clk;
@@ -20,7 +18,7 @@ Signed-off-by: Sham Muthayyan <smuthayy@codeaurora.org>
        struct reset_control *pci_reset;
        struct reset_control *axi_reset;
        struct reset_control *ahb_reset;
-@@ -249,6 +251,14 @@ static int qcom_pcie_get_resources_2_1_0
+@@ -235,6 +237,14 @@ static int qcom_pcie_get_resources_2_1_0
        if (IS_ERR(res->phy_clk))
                return PTR_ERR(res->phy_clk);
  
@@ -35,16 +33,16 @@ Signed-off-by: Sham Muthayyan <smuthayy@codeaurora.org>
        res->pci_reset = devm_reset_control_get_exclusive(dev, "pci");
        if (IS_ERR(res->pci_reset))
                return PTR_ERR(res->pci_reset);
-@@ -281,6 +291,8 @@ static void qcom_pcie_deinit_2_1_0(struc
+@@ -267,6 +277,8 @@ static void qcom_pcie_deinit_2_1_0(struc
        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);
-       regulator_disable(res->vdda_phy);
-       regulator_disable(res->vdda_refclk);
-@@ -324,16 +336,28 @@ static int qcom_pcie_init_2_1_0(struct q
+       regulator_bulk_disable(ARRAY_SIZE(res->supplies), res->supplies);
+ }
+ 
+@@ -296,16 +308,28 @@ static int qcom_pcie_init_2_1_0(struct q
                goto err_assert_ahb;
        }
  
@@ -76,7 +74,7 @@ Signed-off-by: Sham Muthayyan <smuthayy@codeaurora.org>
        }
  
        ret = reset_control_deassert(res->ahb_reset);
-@@ -389,10 +413,14 @@ static int qcom_pcie_init_2_1_0(struct q
+@@ -361,10 +385,14 @@ static int qcom_pcie_init_2_1_0(struct q
        return 0;
  
  err_deassert_ahb:
@@ -92,4 +90,4 @@ Signed-off-by: Sham Muthayyan <smuthayy@codeaurora.org>
 +err_clk_core:
        clk_disable_unprepare(res->iface_clk);
  err_assert_ahb:
-       regulator_disable(res->vdda_phy);
+       regulator_bulk_disable(ARRAY_SIZE(res->supplies), res->supplies);