kernel: bump 4.14 to 4.14.41

[openwrt/staging/dedeckeh.git] / target / linux / ath79 / patches-4.14 / 0021-MIPS-ath79-turn-pci-ar724x-driver-into-a-pure-OF-dri.patch

diff --git a/target/linux/ath79/patches-4.14/0021-MIPS-ath79-turn-pci-ar724x-driver-into-a-pure-OF-dri.patch b/target/linux/ath79/patches-4.14/0021-MIPS-ath79-turn-pci-ar724x-driver-into-a-pure-OF-dri.patch
index e3eba5a5f64723d355648f1dcd8cce291ec98a30..d5ebeb87aec0c34368d2a95e2d125ca372267c32 100644 (file)
--- a/target/linux/ath79/patches-4.14/0021-MIPS-ath79-turn-pci-ar724x-driver-into-a-pure-OF-dri.patch
+++ b/target/linux/ath79/patches-4.14/0021-MIPS-ath79-turn-pci-ar724x-driver-into-a-pure-OF-dri.patch
@@ -9,8 +9,6 @@ Signed-off-by: John Crispin <john@phrozen.org>
  arch/mips/pci/pci-ar724x.c | 86 +++++++++++++++++++++-------------------------
  1 file changed, 40 insertions(+), 46 deletions(-)
 
-diff --git a/arch/mips/pci/pci-ar724x.c b/arch/mips/pci/pci-ar724x.c
-index 64b58cc48a91..7eb9b0999c8c 100644
 --- a/arch/mips/pci/pci-ar724x.c
 +++ b/arch/mips/pci/pci-ar724x.c
 @@ -14,8 +14,11 @@
@@ -91,7 +89,7 @@ index 64b58cc48a91..7eb9b0999c8c 100644
        case 0:
                t = __raw_readl(base + AR724X_PCI_REG_INT_MASK);
                __raw_writel(t | AR724X_PCI_INT_DEV0,
-@@ -273,14 +275,12 @@ static void ar724x_pci_irq_mask(struct irq_data *d)
+@@ -273,14 +275,12 @@ static void ar724x_pci_irq_mask(struct i
  {
        struct ar724x_pci_controller *apc;
        void __iomem *base;
@@ -107,7 +105,7 @@ index 64b58cc48a91..7eb9b0999c8c 100644
        case 0:
                t = __raw_readl(base + AR724X_PCI_REG_INT_MASK);
                __raw_writel(t & ~AR724X_PCI_INT_DEV0,
-@@ -305,26 +305,32 @@ static struct irq_chip ar724x_pci_irq_chip = {
+@@ -305,26 +305,32 @@ static struct irq_chip ar724x_pci_irq_ch
        .irq_mask_ack   = ar724x_pci_irq_mask,
  };
  
@@ -150,7 +148,7 @@ index 64b58cc48a91..7eb9b0999c8c 100644
        irq_set_chained_handler_and_data(apc->irq, ar724x_pci_irq_handler,
                                         apc);
  }
-@@ -394,29 +400,11 @@ static int ar724x_pci_probe(struct platform_device *pdev)
+@@ -394,29 +400,11 @@ static int ar724x_pci_probe(struct platf
        if (apc->irq < 0)
                return -EINVAL;
  
@@ -182,7 +180,7 @@ index 64b58cc48a91..7eb9b0999c8c 100644
  
        /*
         * Do the full PCIE Root Complex Initialization Sequence if the PCIe
-@@ -438,10 +426,16 @@ static int ar724x_pci_probe(struct platform_device *pdev)
+@@ -438,10 +426,16 @@ static int ar724x_pci_probe(struct platf
        return 0;
  }
  
@@ -199,6 +197,3 @@ index 64b58cc48a91..7eb9b0999c8c 100644
        },
  };
  
--- 
-2.11.0
-