kernel: bump 4.14 to 4.14.41

[openwrt/staging/chunkeey.git] / target / linux / ath79 / patches-4.14 / 0020-MIPS-ath79-turn-pci-ar71xx-driver-into-a-pure-OF-dri.patch

diff --git a/target/linux/ath79/patches-4.14/0020-MIPS-ath79-turn-pci-ar71xx-driver-into-a-pure-OF-dri.patch b/target/linux/ath79/patches-4.14/0020-MIPS-ath79-turn-pci-ar71xx-driver-into-a-pure-OF-dri.patch
index d25f265d8423503833d5a96d6a717c4ccf5cc696..2d9ddf4a2c55bf07d2b7aac17ea11711f012e552 100644 (file)
--- a/target/linux/ath79/patches-4.14/0020-MIPS-ath79-turn-pci-ar71xx-driver-into-a-pure-OF-dri.patch
+++ b/target/linux/ath79/patches-4.14/0020-MIPS-ath79-turn-pci-ar71xx-driver-into-a-pure-OF-dri.patch
@@ -9,8 +9,6 @@ Signed-off-by: John Crispin <john@phrozen.org>
  arch/mips/pci/pci-ar71xx.c | 81 +++++++++++++++++++++++-----------------------
  1 file changed, 40 insertions(+), 41 deletions(-)
 
-diff --git a/arch/mips/pci/pci-ar71xx.c b/arch/mips/pci/pci-ar71xx.c
-index bdf87b43633f..1dc9f01a495d 100644
 --- a/arch/mips/pci/pci-ar71xx.c
 +++ b/arch/mips/pci/pci-ar71xx.c
 @@ -18,8 +18,11 @@
@@ -78,7 +76,7 @@ index bdf87b43633f..1dc9f01a495d 100644
  }
  
  static void ar71xx_pci_irq_unmask(struct irq_data *d)
-@@ -261,7 +266,7 @@ static void ar71xx_pci_irq_unmask(struct irq_data *d)
+@@ -261,7 +266,7 @@ static void ar71xx_pci_irq_unmask(struct
        u32 t;
  
        apc = irq_data_get_irq_chip_data(d);
@@ -87,7 +85,7 @@ index bdf87b43633f..1dc9f01a495d 100644
  
        t = __raw_readl(base + AR71XX_RESET_REG_PCI_INT_ENABLE);
        __raw_writel(t | (1 << irq), base + AR71XX_RESET_REG_PCI_INT_ENABLE);
-@@ -278,7 +283,7 @@ static void ar71xx_pci_irq_mask(struct irq_data *d)
+@@ -278,7 +283,7 @@ static void ar71xx_pci_irq_mask(struct i
        u32 t;
  
        apc = irq_data_get_irq_chip_data(d);
@@ -96,7 +94,7 @@ index bdf87b43633f..1dc9f01a495d 100644
  
        t = __raw_readl(base + AR71XX_RESET_REG_PCI_INT_ENABLE);
        __raw_writel(t & ~(1 << irq), base + AR71XX_RESET_REG_PCI_INT_ENABLE);
-@@ -294,24 +299,30 @@ static struct irq_chip ar71xx_pci_irq_chip = {
+@@ -294,24 +299,30 @@ static struct irq_chip ar71xx_pci_irq_ch
        .irq_mask_ack   = ar71xx_pci_irq_mask,
  };
  
@@ -150,7 +148,7 @@ index bdf87b43633f..1dc9f01a495d 100644
  static int ar71xx_pci_probe(struct platform_device *pdev)
  {
        struct ar71xx_pci_controller *apc;
-@@ -348,26 +364,6 @@ static int ar71xx_pci_probe(struct platform_device *pdev)
+@@ -348,26 +364,6 @@ static int ar71xx_pci_probe(struct platf
        if (apc->irq < 0)
                return -EINVAL;
  
@@ -177,7 +175,7 @@ index bdf87b43633f..1dc9f01a495d 100644
        ar71xx_pci_reset();
  
        /* setup COMMAND register */
-@@ -380,9 +376,11 @@ static int ar71xx_pci_probe(struct platform_device *pdev)
+@@ -380,9 +376,11 @@ static int ar71xx_pci_probe(struct platf
  
        ar71xx_pci_irq_init(apc);
  
@@ -189,7 +187,7 @@ index bdf87b43633f..1dc9f01a495d 100644
  
        register_pci_controller(&apc->pci_ctrl);
  
-@@ -393,6 +391,7 @@ static struct platform_driver ar71xx_pci_driver = {
+@@ -393,6 +391,7 @@ static struct platform_driver ar71xx_pci
        .probe = ar71xx_pci_probe,
        .driver = {
                .name = "ar71xx-pci",
@@ -197,6 +195,3 @@ index bdf87b43633f..1dc9f01a495d 100644
        },
  };
  
--- 
-2.11.0
-