kernel: backport NVMEM patches queued for the v6.4

[openwrt/openwrt.git] / target / linux / generic / backport-5.10 / 850-v5.17-0003-PCI-aardvark-Add-support-for-DEVCAP2-DEVCTL2-LNKCAP2.patch

diff --git a/target/linux/generic/backport-5.10/850-v5.17-0003-PCI-aardvark-Add-support-for-DEVCAP2-DEVCTL2-LNKCAP2.patch b/target/linux/generic/backport-5.10/850-v5.17-0003-PCI-aardvark-Add-support-for-DEVCAP2-DEVCTL2-LNKCAP2.patch
index 57940bdb79556d5134c673c6ba14453a71a4f53d..4d1135bf6c45d86136b7d812b5b1bc39ca9b4b34 100644 (file)
--- a/target/linux/generic/backport-5.10/850-v5.17-0003-PCI-aardvark-Add-support-for-DEVCAP2-DEVCTL2-LNKCAP2.patch
+++ b/target/linux/generic/backport-5.10/850-v5.17-0003-PCI-aardvark-Add-support-for-DEVCAP2-DEVCTL2-LNKCAP2.patch
@@ -19,12 +19,10 @@ Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
  drivers/pci/controller/pci-aardvark.c | 15 +++++++++++----
  1 file changed, 11 insertions(+), 4 deletions(-)
 
-diff --git a/drivers/pci/controller/pci-aardvark.c b/drivers/pci/controller/pci-aardvark.c
-index c5300d49807a..25af189a1052 100644
 --- a/drivers/pci/controller/pci-aardvark.c
 +++ b/drivers/pci/controller/pci-aardvark.c
-@@ -884,8 +884,13 @@ advk_pci_bridge_emul_pcie_conf_read(struct pci_bridge_emul *bridge,
-       case PCI_CAP_LIST_ID:
+@@ -885,8 +885,13 @@ advk_pci_bridge_emul_pcie_conf_read(stru
+ 
        case PCI_EXP_DEVCAP:
        case PCI_EXP_DEVCTL:
 +      case PCI_EXP_DEVCAP2:
@@ -37,7 +35,7 @@ index c5300d49807a..25af189a1052 100644
        default:
                return PCI_BRIDGE_EMUL_NOT_HANDLED;
        }
-@@ -899,10 +904,6 @@ advk_pci_bridge_emul_pcie_conf_write(struct pci_bridge_emul *bridge,
+@@ -900,10 +905,6 @@ advk_pci_bridge_emul_pcie_conf_write(str
        struct advk_pcie *pcie = bridge->data;
  
        switch (reg) {
@@ -48,7 +46,7 @@ index c5300d49807a..25af189a1052 100644
        case PCI_EXP_LNKCTL:
                advk_writel(pcie, new, PCIE_CORE_PCIEXP_CAP + reg);
                if (new & PCI_EXP_LNKCTL_RL)
-@@ -924,6 +925,12 @@ advk_pci_bridge_emul_pcie_conf_write(struct pci_bridge_emul *bridge,
+@@ -925,6 +926,12 @@ advk_pci_bridge_emul_pcie_conf_write(str
                advk_writel(pcie, new, PCIE_ISR0_REG);
                break;
  
@@ -61,6 +59,3 @@ index c5300d49807a..25af189a1052 100644
        default:
                break;
        }
--- 
-2.34.1
-