kernel: bump 4.14 to 4.14.41

[openwrt/openwrt.git] / target / linux / ath79 / patches-4.14 / 0019-MIPS-ath79-get-PCIe-controller-out-of-reset.patch

diff --git a/target/linux/ath79/patches-4.14/0019-MIPS-ath79-get-PCIe-controller-out-of-reset.patch b/target/linux/ath79/patches-4.14/0019-MIPS-ath79-get-PCIe-controller-out-of-reset.patch
index 2148637f9b8ad6b8caadd4c307e2d8b3f2286552..f435e9bc1cdd2709a47dc74b7cc4658ddacc15d3 100644 (file)
--- a/target/linux/ath79/patches-4.14/0019-MIPS-ath79-get-PCIe-controller-out-of-reset.patch
+++ b/target/linux/ath79/patches-4.14/0019-MIPS-ath79-get-PCIe-controller-out-of-reset.patch
@@ -25,8 +25,6 @@ Signed-off-by: Mathias Kresin <dev@kresin.me>
  arch/mips/pci/pci-ar724x.c | 42 ++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 42 insertions(+)
 
  arch/mips/pci/pci-ar724x.c | 42 ++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 42 insertions(+)
 

-diff --git a/arch/mips/pci/pci-ar724x.c b/arch/mips/pci/pci-ar724x.c
-index 1e23c8d587bd..64b58cc48a91 100644

 --- a/arch/mips/pci/pci-ar724x.c
 +++ b/arch/mips/pci/pci-ar724x.c
 @@ -12,14 +12,18 @@
 --- a/arch/mips/pci/pci-ar724x.c
 +++ b/arch/mips/pci/pci-ar724x.c
 @@ -12,14 +12,18 @@


@@ -48,7 +46,7 @@ index 1e23c8d587bd..64b58cc48a91 100644
  #define AR724X_PCI_RESET_LINK_UP      BIT(0)
  
  #define AR724X_PCI_INT_DEV0           BIT(14)
  #define AR724X_PCI_RESET_LINK_UP      BIT(0)
  
  #define AR724X_PCI_INT_DEV0           BIT(14)

-@@ -325,6 +329,37 @@ static void ar724x_pci_irq_init(struct ar724x_pci_controller *apc,
+@@ -325,6 +329,37 @@ static void ar724x_pci_irq_init(struct a

                                         apc);
  }
  
                                         apc);
  }
  


@@ -86,7 +84,7 @@ index 1e23c8d587bd..64b58cc48a91 100644
  static int ar724x_pci_probe(struct platform_device *pdev)
  {
        struct ar724x_pci_controller *apc;
  static int ar724x_pci_probe(struct platform_device *pdev)
  {
        struct ar724x_pci_controller *apc;

-@@ -383,6 +418,13 @@ static int ar724x_pci_probe(struct platform_device *pdev)
+@@ -383,6 +418,13 @@ static int ar724x_pci_probe(struct platf

        apc->pci_controller.io_resource = &apc->io_res;
        apc->pci_controller.mem_resource = &apc->mem_res;
  
        apc->pci_controller.io_resource = &apc->io_res;
        apc->pci_controller.mem_resource = &apc->mem_res;
  


@@ -100,6 +98,3 @@ index 1e23c8d587bd..64b58cc48a91 100644
        apc->link_up = ar724x_pci_check_link(apc);
        if (!apc->link_up)
                dev_warn(&pdev->dev, "PCIe link is down\n");
        apc->link_up = ar724x_pci_check_link(apc);
        if (!apc->link_up)
                dev_warn(&pdev->dev, "PCIe link is down\n");

--- 
-2.11.0
-