kernel: bump 5.10 to 5.10.115
[openwrt/staging/chunkeey.git] / target / linux / generic / backport-5.10 / 850-v5.17-0003-PCI-aardvark-Add-support-for-DEVCAP2-DEVCTL2-LNKCAP2.patch
index 0d506657415f423fa4ea6708a4b9555042b8ce57..4d1135bf6c45d86136b7d812b5b1bc39ca9b4b34 100644 (file)
@@ -21,7 +21,7 @@ Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
 
 --- a/drivers/pci/controller/pci-aardvark.c
 +++ b/drivers/pci/controller/pci-aardvark.c
-@@ -883,8 +883,13 @@ advk_pci_bridge_emul_pcie_conf_read(stru
+@@ -885,8 +885,13 @@ advk_pci_bridge_emul_pcie_conf_read(stru
  
        case PCI_EXP_DEVCAP:
        case PCI_EXP_DEVCTL:
@@ -35,7 +35,7 @@ Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
        default:
                return PCI_BRIDGE_EMUL_NOT_HANDLED;
        }
-@@ -898,10 +903,6 @@ advk_pci_bridge_emul_pcie_conf_write(str
+@@ -900,10 +905,6 @@ advk_pci_bridge_emul_pcie_conf_write(str
        struct advk_pcie *pcie = bridge->data;
  
        switch (reg) {
@@ -46,7 +46,7 @@ Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
        case PCI_EXP_LNKCTL:
                advk_writel(pcie, new, PCIE_CORE_PCIEXP_CAP + reg);
                if (new & PCI_EXP_LNKCTL_RL)
-@@ -923,6 +924,12 @@ advk_pci_bridge_emul_pcie_conf_write(str
+@@ -925,6 +926,12 @@ advk_pci_bridge_emul_pcie_conf_write(str
                advk_writel(pcie, new, PCIE_ISR0_REG);
                break;