aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2009-10-05 18:44:06 +0000
committerGabor Juhos <juhosg@openwrt.org>2009-10-05 18:44:06 +0000
commitf72d43415a62bac471a79c4519a32a836c843aeb (patch)
treecd9790038f1f5b08bc1facfc24fe5e4837633098
parent59c181a38edd58ac2e0dfffdf1c4169b8739bc8d (diff)
downloadupstream-f72d43415a62bac471a79c4519a32a836c843aeb.tar.gz
upstream-f72d43415a62bac471a79c4519a32a836c843aeb.tar.bz2
upstream-f72d43415a62bac471a79c4519a32a836c843aeb.zip
ramips: merge ops-rt288x.c and rt288x_pci.h into pci-rt288x.c
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17914 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt288x_pci.h19
-rw-r--r--target/linux/ramips/files/arch/mips/pci/ops-rt288x.c62
-rw-r--r--target/linux/ramips/files/arch/mips/pci/pci-rt288x.c73
-rw-r--r--target/linux/ramips/patches-2.6.30/102-rt288x-pci-driver-hook.patch2
4 files changed, 71 insertions, 85 deletions
diff --git a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt288x_pci.h b/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt288x_pci.h
deleted file mode 100644
index f73d7ac151..0000000000
--- a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt288x_pci.h
+++ /dev/null
@@ -1,19 +0,0 @@
-
-#ifdef CONFIG_PCI
-
-#define RT2880_PCI_SLOT1_BASE 0x20000000
-#define RALINK_PCI_BASE 0xA0440000
-#define RT2880_PCI_PCICFG_ADDR ((unsigned long*)(RALINK_PCI_BASE + 0x0000))
-#define RT2880_PCI_ARBCTL ((unsigned long*)(RALINK_PCI_BASE + 0x0080))
-#define RT2880_PCI_BAR0SETUP_ADDR ((unsigned long*)(RALINK_PCI_BASE + 0x0010))
-#define RT2880_PCI_CONFIG_ADDR ((unsigned long*)(RALINK_PCI_BASE + 0x0020))
-#define RT2880_PCI_CONFIG_DATA ((unsigned long*)(RALINK_PCI_BASE + 0x0024))
-#define RT2880_PCI_MEMBASE ((unsigned long*)(RALINK_PCI_BASE + 0x0028))
-#define RT2880_PCI_IOBASE ((unsigned long*)(RALINK_PCI_BASE + 0x002C))
-#define RT2880_PCI_IMBASEBAR0_ADDR ((unsigned long*)(RALINK_PCI_BASE + 0x0018))
-#define RT2880_PCI_ID ((unsigned long*)(RALINK_PCI_BASE + 0x0030))
-#define RT2880_PCI_CLASS ((unsigned long*)(RALINK_PCI_BASE + 0x0034))
-#define RT2880_PCI_SUBID ((unsigned long*)(RALINK_PCI_BASE + 0x0038))
-#define RT2880_PCI_PCIMSK_ADDR ((unsigned long*)(RALINK_PCI_BASE + 0x000C))
-
-#endif
diff --git a/target/linux/ramips/files/arch/mips/pci/ops-rt288x.c b/target/linux/ramips/files/arch/mips/pci/ops-rt288x.c
deleted file mode 100644
index c851e522ca..0000000000
--- a/target/linux/ramips/files/arch/mips/pci/ops-rt288x.c
+++ /dev/null
@@ -1,62 +0,0 @@
-#include <linux/types.h>
-#include <linux/pci.h>
-#include <linux/io.h>
-
-#include <asm/mach-ralink/rt288x.h>
-#include <asm/mach-ralink/rt288x_pci.h>
-
-#define PCI_ACCESS_READ 0
-#define PCI_ACCESS_WRITE 1
-
-static int config_access(unsigned char access_type, struct pci_bus *bus,
- unsigned int devfn, unsigned char where, u32 * data)
-{
- unsigned int slot = PCI_SLOT(devfn);
- unsigned int address;
- u8 func = PCI_FUNC(devfn);
- address = (bus->number << 16) | (slot << 11) | (func << 8) | (where& 0xfc) | 0x80000000;
- writel(address, RT2880_PCI_CONFIG_ADDR);
- if (access_type == PCI_ACCESS_WRITE)
- writel(*data, RT2880_PCI_CONFIG_DATA);
- else
- *data = readl(RT2880_PCI_CONFIG_DATA);
- return 0;
-}
-
-int
-pci_config_read(struct pci_bus *bus, unsigned int devfn, int where, int size, u32 * val)
-{
- u32 data = 0;
- if(config_access(PCI_ACCESS_READ, bus, devfn, where, &data))
- return PCIBIOS_DEVICE_NOT_FOUND;
- if(size == 1)
- *val = (data >> ((where & 3) << 3)) & 0xff;
- else if(size == 2)
- *val = (data >> ((where & 3) << 3)) & 0xffff;
- else
- *val = data;
- return PCIBIOS_SUCCESSFUL;
-}
-
-int
-pci_config_write(struct pci_bus *bus, unsigned int devfn,
- int where, int size, u32 val)
-{
- u32 data = 0;
- if(size == 4)
- {
- data = val;
- } else {
- if(config_access(PCI_ACCESS_READ, bus, devfn, where, &data))
- return PCIBIOS_DEVICE_NOT_FOUND;
- if(size == 1)
- data = (data & ~(0xff << ((where & 3) << 3))) |
- (val << ((where & 3) << 3));
- else if(size == 2)
- data = (data & ~(0xffff << ((where & 3) << 3))) |
- (val << ((where & 3) << 3));
- }
- if(config_access(PCI_ACCESS_WRITE, bus, devfn, where, &data))
- return PCIBIOS_DEVICE_NOT_FOUND;
- return PCIBIOS_SUCCESSFUL;
-}
diff --git a/target/linux/ramips/files/arch/mips/pci/pci-rt288x.c b/target/linux/ramips/files/arch/mips/pci/pci-rt288x.c
index 6bf4f4f489..f6b6806098 100644
--- a/target/linux/ramips/files/arch/mips/pci/pci-rt288x.c
+++ b/target/linux/ramips/files/arch/mips/pci/pci-rt288x.c
@@ -4,10 +4,77 @@
#include <linux/init.h>
#include <asm/mach-ralink/rt288x.h>
-#include <asm/mach-ralink/rt288x_pci.h>
-extern int pci_config_read(struct pci_bus *bus, unsigned int devfn, int where, int size, u32 *val);
-extern int pci_config_write(struct pci_bus *bus, unsigned int devfn, int where, int size, u32 val);
+#define RT2880_PCI_SLOT1_BASE 0x20000000
+#define RALINK_PCI_BASE 0xA0440000
+#define RT2880_PCI_PCICFG_ADDR ((unsigned long*)(RALINK_PCI_BASE + 0x0000))
+#define RT2880_PCI_ARBCTL ((unsigned long*)(RALINK_PCI_BASE + 0x0080))
+#define RT2880_PCI_BAR0SETUP_ADDR ((unsigned long*)(RALINK_PCI_BASE + 0x0010))
+#define RT2880_PCI_CONFIG_ADDR ((unsigned long*)(RALINK_PCI_BASE + 0x0020))
+#define RT2880_PCI_CONFIG_DATA ((unsigned long*)(RALINK_PCI_BASE + 0x0024))
+#define RT2880_PCI_MEMBASE ((unsigned long*)(RALINK_PCI_BASE + 0x0028))
+#define RT2880_PCI_IOBASE ((unsigned long*)(RALINK_PCI_BASE + 0x002C))
+#define RT2880_PCI_IMBASEBAR0_ADDR ((unsigned long*)(RALINK_PCI_BASE + 0x0018))
+#define RT2880_PCI_ID ((unsigned long*)(RALINK_PCI_BASE + 0x0030))
+#define RT2880_PCI_CLASS ((unsigned long*)(RALINK_PCI_BASE + 0x0034))
+#define RT2880_PCI_SUBID ((unsigned long*)(RALINK_PCI_BASE + 0x0038))
+#define RT2880_PCI_PCIMSK_ADDR ((unsigned long*)(RALINK_PCI_BASE + 0x000C))
+
+#define PCI_ACCESS_READ 0
+#define PCI_ACCESS_WRITE 1
+
+static int config_access(unsigned char access_type, struct pci_bus *bus,
+ unsigned int devfn, unsigned char where, u32 * data)
+{
+ unsigned int slot = PCI_SLOT(devfn);
+ unsigned int address;
+ u8 func = PCI_FUNC(devfn);
+ address = (bus->number << 16) | (slot << 11) | (func << 8) | (where& 0xfc) | 0x80000000;
+ writel(address, RT2880_PCI_CONFIG_ADDR);
+ if (access_type == PCI_ACCESS_WRITE)
+ writel(*data, RT2880_PCI_CONFIG_DATA);
+ else
+ *data = readl(RT2880_PCI_CONFIG_DATA);
+ return 0;
+}
+
+int
+pci_config_read(struct pci_bus *bus, unsigned int devfn, int where, int size, u32 * val)
+{
+ u32 data = 0;
+ if(config_access(PCI_ACCESS_READ, bus, devfn, where, &data))
+ return PCIBIOS_DEVICE_NOT_FOUND;
+ if(size == 1)
+ *val = (data >> ((where & 3) << 3)) & 0xff;
+ else if(size == 2)
+ *val = (data >> ((where & 3) << 3)) & 0xffff;
+ else
+ *val = data;
+ return PCIBIOS_SUCCESSFUL;
+}
+
+int
+pci_config_write(struct pci_bus *bus, unsigned int devfn,
+ int where, int size, u32 val)
+{
+ u32 data = 0;
+ if(size == 4)
+ {
+ data = val;
+ } else {
+ if(config_access(PCI_ACCESS_READ, bus, devfn, where, &data))
+ return PCIBIOS_DEVICE_NOT_FOUND;
+ if(size == 1)
+ data = (data & ~(0xff << ((where & 3) << 3))) |
+ (val << ((where & 3) << 3));
+ else if(size == 2)
+ data = (data & ~(0xffff << ((where & 3) << 3))) |
+ (val << ((where & 3) << 3));
+ }
+ if(config_access(PCI_ACCESS_WRITE, bus, devfn, where, &data))
+ return PCIBIOS_DEVICE_NOT_FOUND;
+ return PCIBIOS_SUCCESSFUL;
+}
struct pci_ops rt2880_pci_ops = {
.read = pci_config_read,
diff --git a/target/linux/ramips/patches-2.6.30/102-rt288x-pci-driver-hook.patch b/target/linux/ramips/patches-2.6.30/102-rt288x-pci-driver-hook.patch
index a1adbb53f3..40520181d6 100644
--- a/target/linux/ramips/patches-2.6.30/102-rt288x-pci-driver-hook.patch
+++ b/target/linux/ramips/patches-2.6.30/102-rt288x-pci-driver-hook.patch
@@ -4,4 +4,4 @@
obj-$(CONFIG_ZAO_CAPCELLA) += fixup-capcella.o
obj-$(CONFIG_WR_PPMC) += fixup-wrppmc.o
obj-$(CONFIG_MIKROTIK_RB532) += pci-rc32434.o ops-rc32434.o fixup-rc32434.o
-+obj-$(CONFIG_SOC_RT288X) += pci-rt288x.o ops-rt288x.o
++obj-$(CONFIG_SOC_RT288X) += pci-rt288x.o