kernel: bump 5.4 to 5.4.150

[openwrt/staging/wigyori.git] / target / linux / bcm27xx / patches-5.4 / 950-0441-PCI-of-Add-inbound-resource-parsing-to-helpers.patch

diff --git a/target/linux/bcm27xx/patches-5.4/950-0441-PCI-of-Add-inbound-resource-parsing-to-helpers.patch b/target/linux/bcm27xx/patches-5.4/950-0441-PCI-of-Add-inbound-resource-parsing-to-helpers.patch
index 86ef1212302bae852f90fe3ba7eea59d5a883b22..bbcb3aeeda2580750563ff9ea4583426ff7f21a7 100644 (file)
--- a/target/linux/bcm27xx/patches-5.4/950-0441-PCI-of-Add-inbound-resource-parsing-to-helpers.patch
+++ b/target/linux/bcm27xx/patches-5.4/950-0441-PCI-of-Add-inbound-resource-parsing-to-helpers.patch
@@ -82,7 +82,7 @@ Cc: linux-rockchip@lists.infradead.org
  
 --- a/drivers/pci/controller/pci-aardvark.c
 +++ b/drivers/pci/controller/pci-aardvark.c
-@@ -1060,7 +1060,8 @@ static int advk_pcie_probe(struct platfo
+@@ -1176,7 +1176,8 @@ static int advk_pcie_probe(struct platfo
                return ret;
        }
  
@@ -249,7 +249,7 @@ Cc: linux-rockchip@lists.infradead.org
  
 --- a/drivers/pci/controller/pcie-xilinx-nwl.c
 +++ b/drivers/pci/controller/pcie-xilinx-nwl.c
-@@ -845,8 +845,8 @@ static int nwl_pcie_probe(struct platfor
+@@ -857,8 +857,8 @@ static int nwl_pcie_probe(struct platfor
                return err;
        }
  
@@ -402,7 +402,7 @@ Cc: linux-rockchip@lists.infradead.org
  }
 --- a/include/linux/pci.h
 +++ b/include/linux/pci.h
-@@ -2278,6 +2278,7 @@ struct irq_domain;
+@@ -2279,6 +2279,7 @@ struct irq_domain;
  struct irq_domain *pci_host_bridge_of_msi_domain(struct pci_bus *bus);
  int pci_parse_request_of_pci_ranges(struct device *dev,
                                    struct list_head *resources,
@@ -410,7 +410,7 @@ Cc: linux-rockchip@lists.infradead.org
                                    struct resource **bus_range);
  
  /* Arch may override this (weak) */
-@@ -2286,9 +2287,11 @@ struct device_node *pcibios_get_phb_of_n
+@@ -2287,9 +2288,11 @@ struct device_node *pcibios_get_phb_of_n
  #else /* CONFIG_OF */
  static inline struct irq_domain *
  pci_host_bridge_of_msi_domain(struct pci_bus *bus) { return NULL; }