atheros: do not attempt to start pci on ar2317

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14982 3c298f89-4303-0410-b956-a3cf2f4a3e73

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 69c3349..9b76dfe 100644 (file)
--- 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
 +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
 +/*
 + * 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 <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 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)
 +static unsigned long configspace;
 +
 +static int config_access(int devfn, int where, int size, u32 *ptr, bool write)


@@ -184,7 +183,7 @@
 +{
 +      u32 reg;
 +
 +{
 +      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 */
 +              return -ENODEV;
 +
 +      configspace = (unsigned long) ioremap_nocache(0x80000000, 1*1024*1024); /* Remap PCI config space */