ipq806x: replace pci patchset with upstream version

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

diff --git a/target/linux/ipq806x/patches-5.4/0071-1-PCI-qcom-Fixed-IPQ806x-specific-clocks.patch b/target/linux/ipq806x/patches-5.4/0071-1-PCI-qcom-Fixed-IPQ806x-specific-clocks.patch
deleted file mode 100644 (file)
index 3a3e0a0..0000000
--- a/target/linux/ipq806x/patches-5.4/0071-1-PCI-qcom-Fixed-IPQ806x-specific-clocks.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 86655aa14304ca88a8ce8847276147dbc1a83238 Mon Sep 17 00:00:00 2001
-From: Sham Muthayyan <smuthayy@codeaurora.org>
-Date: Tue, 19 Jul 2016 18:44:49 +0530
-Subject: PCI: qcom: Fixed IPQ806x specific clocks
-
-Change-Id: I488e1bc707d6a22b37a338f41935e3922009ba5e
-Signed-off-by: Sham Muthayyan <smuthayy@codeaurora.org>
----
-
---- 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;
-+      struct clk *aux_clk;
-+      struct clk *ref_clk;
-       struct reset_control *pci_reset;
-       struct reset_control *axi_reset;
-       struct reset_control *ahb_reset;
-@@ -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);
- 
-+      res->aux_clk = devm_clk_get(dev, "aux");
-+      if (IS_ERR(res->aux_clk))
-+              return PTR_ERR(res->aux_clk);
-+
-+      res->ref_clk = devm_clk_get(dev, "ref");
-+      if (IS_ERR(res->ref_clk))
-+              return PTR_ERR(res->ref_clk);
-+
-       res->pci_reset = devm_reset_control_get_exclusive(dev, "pci");
-       if (IS_ERR(res->pci_reset))
-               return PTR_ERR(res->pci_reset);
-@@ -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_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;
-       }
- 
-+      ret = clk_prepare_enable(res->core_clk);
-+      if (ret) {
-+              dev_err(dev, "cannot prepare/enable core clock\n");
-+              goto err_clk_core;
-+      }
-+
-       ret = clk_prepare_enable(res->phy_clk);
-       if (ret) {
-               dev_err(dev, "cannot prepare/enable phy clock\n");
-               goto err_clk_phy;
-       }
- 
--      ret = clk_prepare_enable(res->core_clk);
-+      ret = clk_prepare_enable(res->aux_clk);
-       if (ret) {
--              dev_err(dev, "cannot prepare/enable core clock\n");
--              goto err_clk_core;
-+              dev_err(dev, "cannot prepare/enable aux clock\n");
-+              goto err_clk_aux;
-+      }
-+
-+      ret = clk_prepare_enable(res->ref_clk);
-+      if (ret) {
-+              dev_err(dev, "cannot prepare/enable ref clock\n");
-+              goto err_clk_ref;
-       }
- 
-       ret = reset_control_deassert(res->ahb_reset);
-@@ -361,10 +385,14 @@ static int qcom_pcie_init_2_1_0(struct q
-       return 0;
- 
- err_deassert_ahb:
--      clk_disable_unprepare(res->core_clk);
--err_clk_core:
-+      clk_disable_unprepare(res->ref_clk);
-+err_clk_ref:
-+      clk_disable_unprepare(res->aux_clk);
-+err_clk_aux:
-       clk_disable_unprepare(res->phy_clk);
- err_clk_phy:
-+      clk_disable_unprepare(res->core_clk);
-+err_clk_core:
-       clk_disable_unprepare(res->iface_clk);
- err_assert_ahb:
-       regulator_bulk_disable(ARRAY_SIZE(res->supplies), res->supplies);