63066d3006
Reworked: - 0034 patchset update Added: - 080 Add support for pinctrl-msm framework Removed: - 0074-ipq806x-usb-Control-USB-master-reset.patch (we now have a dedicated driver for qcom usb) - 0047-mtd-nand-Create-a-BBT-flag-to-access-bad-block-marke (merged upstream) - 310-msm-adhoc-bus-support (it looks like it was never actually used in any dts) Signed-off-by: Christian Lamparter <chunkeey@gmail.com> Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com> [commit subject and description facelift, SoB fix] Signed-off-by: Petr Štetiar <ynezz@true.cz>
26 lines
949 B
Diff
26 lines
949 B
Diff
From 1a9c48123bd09f75562b6a2ee0f0a7b2d533cd45 Mon Sep 17 00:00:00 2001
|
|
From: Abhishek Sahu <absahu@codeaurora.org>
|
|
Date: Thu, 22 Dec 2016 11:50:49 +0530
|
|
Subject: pcie: qcom: change duplicate pci reset to phy reset
|
|
|
|
The deinit issues reset_control_assert for pci twice and
|
|
does not contain phy reset.
|
|
|
|
Change-Id: Iba849963c7e5f9a2a1063f0e2e89635df70b8a99
|
|
Signed-off-by: Abhishek Sahu <absahu@codeaurora.org>
|
|
---
|
|
drivers/pci/host/pcie-qcom.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
--- a/drivers/pci/controller/dwc/pcie-qcom.c
|
|
+++ b/drivers/pci/controller/dwc/pcie-qcom.c
|
|
@@ -394,7 +394,7 @@ static void qcom_pcie_deinit_2_1_0(struc
|
|
struct qcom_pcie_resources_2_1_0 *res = &pcie->res.v2_1_0;
|
|
|
|
clk_disable_unprepare(res->phy_clk);
|
|
- reset_control_assert(res->pci_reset);
|
|
+ reset_control_assert(res->phy_reset);
|
|
reset_control_assert(res->axi_reset);
|
|
reset_control_assert(res->ahb_reset);
|
|
reset_control_assert(res->por_reset);
|