ipq806x: refresh 4.19 patches

[openwrt/staging/ynezz.git] / target / linux / ipq806x / patches-4.19 / 0071-6-PCI-qcom-Force-GEN1-support.patch

diff --git a/target/linux/ipq806x/patches-4.19/0071-6-PCI-qcom-Force-GEN1-support.patch b/target/linux/ipq806x/patches-4.19/0071-6-PCI-qcom-Force-GEN1-support.patch
index 5dea084bfa8c6556941e9896f737382de966de08..90b232f8b7e86ae3eddc1d1f41e4e7c26cfe3dec 100644 (file)
--- a/target/linux/ipq806x/patches-4.19/0071-6-PCI-qcom-Force-GEN1-support.patch
+++ b/target/linux/ipq806x/patches-4.19/0071-6-PCI-qcom-Force-GEN1-support.patch
@@ -6,29 +6,27 @@ Subject: PCI: qcom: Force GEN1 support
 Change-Id: Ica54ddb737d7b851469deab1745f54bf431bd3f0
 Signed-off-by: Sham Muthayyan <smuthayy@codeaurora.org>
 ---
- drivers/pci/host/pcie-qcom.c | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
 
---- a/drivers/pci/dwc/pcie-qcom.c
-+++ b/drivers/pci/dwc/pcie-qcom.c
-@@ -129,6 +129,8 @@
+--- a/drivers/pci/controller/dwc/pcie-qcom.c
++++ b/drivers/pci/controller/dwc/pcie-qcom.c
+@@ -122,6 +122,8 @@
  #define PCIE20_v3_PARF_SLV_ADDR_SPACE_SIZE    0x358
  #define SLV_ADDR_SPACE_SZ                     0x10000000
  
 +#define PCIE20_LNK_CONTROL2_LINK_STATUS2        0xA0
 +
+ #define QCOM_PCIE_2_1_0_MAX_SUPPLY    3
  struct qcom_pcie_resources_2_1_0 {
        struct clk *iface_clk;
-       struct clk *core_clk;
-@@ -218,6 +220,7 @@ struct qcom_pcie {
+@@ -212,6 +214,7 @@ struct qcom_pcie {
        struct phy *phy;
        struct gpio_desc *reset;
-       struct qcom_pcie_ops *ops;
+       const struct qcom_pcie_ops *ops;
 +      uint32_t force_gen1;
  };
  
  #define to_qcom_pcie(x)               dev_get_drvdata((x)->dev)
-@@ -532,6 +535,11 @@ static int qcom_pcie_init_2_1_0(struct q
+@@ -504,6 +507,11 @@ static int qcom_pcie_init_2_1_0(struct q
  
        /* wait for clock acquisition */
        usleep_range(1000, 1500);
@@ -40,7 +38,7 @@ Signed-off-by: Sham Muthayyan <smuthayy@codeaurora.org>
  
  
        /* Set the Max TLP size to 2K, instead of using default of 4K */
-@@ -1382,6 +1390,8 @@ static int qcom_pcie_probe(struct platfo
+@@ -1369,6 +1377,8 @@ static int qcom_pcie_probe(struct platfo
        struct dw_pcie *pci;
        struct qcom_pcie *pcie;
        int ret;
@@ -49,7 +47,7 @@ Signed-off-by: Sham Muthayyan <smuthayy@codeaurora.org>
  
        pcie = devm_kzalloc(dev, sizeof(*pcie), GFP_KERNEL);
        if (!pcie)
-@@ -1403,6 +1413,9 @@ static int qcom_pcie_probe(struct platfo
+@@ -1391,6 +1401,9 @@ static int qcom_pcie_probe(struct platfo
        if (IS_ERR(pcie->reset))
                return PTR_ERR(pcie->reset);