X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/cc6a33cf19bc80cd38322e0ea2de9e1051d0dfc7..2ce2426f48ee78ddc9e802c80742c107b0768719:/target/linux/atheros/patches-2.6.28/105-ar2315_pci.patch

diff --git a/target/linux/atheros/patches-2.6.28/105-ar2315_pci.patch b/target/linux/atheros/patches-2.6.28/105-ar2315_pci.patch
index 69c334923..7c5afbdb8 100644
--- a/target/linux/atheros/patches-2.6.28/105-ar2315_pci.patch
+++ b/target/linux/atheros/patches-2.6.28/105-ar2315_pci.patch
@@ -7,7 +7,7 @@
 +obj-$(CONFIG_ATHEROS_AR2315_PCI) += pci.o
 --- /dev/null
 +++ b/arch/mips/ar231x/pci.c
-@@ -0,0 +1,231 @@
+@@ -0,0 +1,230 @@
 +/*
 + * This program is free software; you can redistribute it and/or
 + * modify it under the terms of the GNU General Public License
@@ -39,13 +39,12 @@
 +#include <ar231x_platform.h>
 +#include <ar231x.h>
 +#include <ar2315_regs.h>
++#include "devices.h"
 +
 +#define AR531X_MEM_BASE    0x80800000UL
 +#define AR531X_MEM_SIZE    0x00ffffffUL
 +#define AR531X_IO_SIZE     0x00007fffUL
 +
-+#define IS_2315() (current_cpu_data.cputype == CPU_4KEC)
-+
 +static unsigned long configspace;
 +
 +static int config_access(int devfn, int where, int size, u32 *ptr, bool write)
@@ -184,7 +183,7 @@
 +{
 +	u32 reg;
 +
-+	if (!IS_2315())
++	if (ar231x_devtype != DEV_TYPE_AR2315)
 +		return -ENODEV;
 +
 +	configspace = (unsigned long) ioremap_nocache(0x80000000, 1*1024*1024); /* Remap PCI config space */
@@ -257,7 +256,7 @@
 +	default y
 --- a/arch/mips/ar231x/ar2315.c
 +++ b/arch/mips/ar231x/ar2315.c
-@@ -63,6 +63,27 @@ static inline void ar2315_gpio_irq(void)
+@@ -61,6 +61,27 @@ static inline void ar2315_gpio_irq(void)
  		do_IRQ(AR531X_GPIO_IRQ_BASE + bit);
  }
  
@@ -285,7 +284,7 @@
  
  /*
   * Called when an interrupt is received, this function
-@@ -81,6 +102,10 @@ ar2315_irq_dispatch(void)
+@@ -79,6 +100,10 @@ ar2315_irq_dispatch(void)
  		do_IRQ(AR2315_IRQ_WLAN0_INTRS);
  	else if (pending & CAUSEF_IP4)
  		do_IRQ(AR2315_IRQ_ENET0_INTRS);