X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/604a456cbc2b11cf1b40d7c59c797a09942cbfb5..82afa919d533b25244f7c1245924b75d37ab4878:/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 389a0ec21..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 */
@@ -258,7 +257,7 @@
 --- a/arch/mips/ar231x/ar2315.c
 +++ b/arch/mips/ar231x/ar2315.c
 @@ -61,6 +61,27 @@ static inline void ar2315_gpio_irq(void)
- 	do_IRQ(AR531X_GPIO_IRQ_BASE + fls(pend) - 1);
+ 		do_IRQ(AR531X_GPIO_IRQ_BASE + bit);
  }
  
 +#ifdef CONFIG_ATHEROS_AR2315_PCI