projects
/
openwrt
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: bump 5.4 to 5.4.60
[openwrt/openwrt.git]
/
target
/
linux
/
ipq806x
/
patches-5.4
/
093-3-v5.8-ipq806x-PCI-qcom-Add-missing-reset-for-ipq806x.patch
diff --git
a/target/linux/ipq806x/patches-5.4/093-3-v5.8-ipq806x-PCI-qcom-Add-missing-reset-for-ipq806x.patch
b/target/linux/ipq806x/patches-5.4/093-3-v5.8-ipq806x-PCI-qcom-Add-missing-reset-for-ipq806x.patch
index e9595dc2a944852a0020f5cf64f54748f1b8ed2d..fe31e55de3f951302c9f3e54c6478abb8d902dcc 100644
(file)
--- a/
target/linux/ipq806x/patches-5.4/093-3-v5.8-ipq806x-PCI-qcom-Add-missing-reset-for-ipq806x.patch
+++ b/
target/linux/ipq806x/patches-5.4/093-3-v5.8-ipq806x-PCI-qcom-Add-missing-reset-for-ipq806x.patch
@@
-20,7
+20,7
@@
Cc: stable@vger.kernel.org # v4.5+
--- a/drivers/pci/controller/dwc/pcie-qcom.c
+++ b/drivers/pci/controller/dwc/pcie-qcom.c
--- 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 {
+@@ -
110,6 +110
,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 *ahb_reset;
struct reset_control *por_reset;
struct reset_control *phy_reset;
@@
-28,7
+28,7
@@
Cc: stable@vger.kernel.org # v4.5+
struct regulator_bulk_data supplies[QCOM_PCIE_2_1_0_MAX_SUPPLY];
};
struct regulator_bulk_data supplies[QCOM_PCIE_2_1_0_MAX_SUPPLY];
};
-@@ -2
61,6 +262
,10 @@ static int qcom_pcie_get_resources_2_1_0
+@@ -2
79,6 +280
,10 @@ static int qcom_pcie_get_resources_2_1_0
if (IS_ERR(res->por_reset))
return PTR_ERR(res->por_reset);
if (IS_ERR(res->por_reset))
return PTR_ERR(res->por_reset);
@@
-39,7
+39,7
@@
Cc: stable@vger.kernel.org # v4.5+
res->phy_reset = devm_reset_control_get_exclusive(dev, "phy");
return PTR_ERR_OR_ZERO(res->phy_reset);
}
res->phy_reset = devm_reset_control_get_exclusive(dev, "phy");
return PTR_ERR_OR_ZERO(res->phy_reset);
}
-@@ -2
74,6 +279
,7 @@ static void qcom_pcie_deinit_2_1_0(struc
+@@ -2
92,6 +297
,7 @@ static void qcom_pcie_deinit_2_1_0(struc
reset_control_assert(res->axi_reset);
reset_control_assert(res->ahb_reset);
reset_control_assert(res->por_reset);
reset_control_assert(res->axi_reset);
reset_control_assert(res->ahb_reset);
reset_control_assert(res->por_reset);
@@
-47,7
+47,7
@@
Cc: stable@vger.kernel.org # v4.5+
reset_control_assert(res->phy_reset);
clk_disable_unprepare(res->iface_clk);
clk_disable_unprepare(res->core_clk);
reset_control_assert(res->phy_reset);
clk_disable_unprepare(res->iface_clk);
clk_disable_unprepare(res->core_clk);
-@@ -3
32,6 +338
,12 @@ static int qcom_pcie_init_2_1_0(struct q
+@@ -3
51,6 +357
,12 @@ static int qcom_pcie_init_2_1_0(struct q
goto err_deassert_ahb;
}
goto err_deassert_ahb;
}