You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
317 lines
8.4 KiB
Diff
317 lines
8.4 KiB
Diff
From 36dfdaa097ee1b12139187dc89cfa23fbb92b53b Mon Sep 17 00:00:00 2001
|
|
From: Gabor Juhos <juhosg@openwrt.org>
|
|
Date: Wed, 14 Mar 2012 10:29:25 +0100
|
|
Subject: [PATCH 09/47] MIPS: ath79: rename pci-ath724x.c to make it reflect the real SoC name
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
|
Acked-by: René Bolldorf <xsecute@googlemail.com>
|
|
Cc: linux-mips@linux-mips.org
|
|
Patchwork: https://patchwork.linux-mips.org/patch/3489/
|
|
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
|
|
---
|
|
arch/mips/pci/Makefile | 2 +-
|
|
arch/mips/pci/pci-ar724x.c | 139 +++++++++++++++++++++++++++++++++++++++++++
|
|
arch/mips/pci/pci-ath724x.c | 139 -------------------------------------------
|
|
3 files changed, 140 insertions(+), 140 deletions(-)
|
|
create mode 100644 arch/mips/pci/pci-ar724x.c
|
|
delete mode 100644 arch/mips/pci/pci-ath724x.c
|
|
|
|
--- a/arch/mips/pci/Makefile
|
|
+++ b/arch/mips/pci/Makefile
|
|
@@ -19,7 +19,7 @@ obj-$(CONFIG_BCM47XX) += pci-bcm47xx.o
|
|
obj-$(CONFIG_BCM63XX) += pci-bcm63xx.o fixup-bcm63xx.o \
|
|
ops-bcm63xx.o
|
|
obj-$(CONFIG_MIPS_ALCHEMY) += pci-alchemy.o
|
|
-obj-$(CONFIG_SOC_AR724X) += pci-ath724x.o
|
|
+obj-$(CONFIG_SOC_AR724X) += pci-ar724x.o
|
|
|
|
#
|
|
# These are still pretty much in the old state, watch, go blind.
|
|
--- /dev/null
|
|
+++ b/arch/mips/pci/pci-ar724x.c
|
|
@@ -0,0 +1,139 @@
|
|
+/*
|
|
+ * Atheros 724x PCI support
|
|
+ *
|
|
+ * Copyright (C) 2011 René Bolldorf <xsecute@googlemail.com>
|
|
+ *
|
|
+ * This program is free software; you can redistribute it and/or modify it
|
|
+ * under the terms of the GNU General Public License version 2 as published
|
|
+ * by the Free Software Foundation.
|
|
+ */
|
|
+
|
|
+#include <linux/pci.h>
|
|
+#include <asm/mach-ath79/pci.h>
|
|
+
|
|
+#define reg_read(_phys) (*(unsigned int *) KSEG1ADDR(_phys))
|
|
+#define reg_write(_phys, _val) ((*(unsigned int *) KSEG1ADDR(_phys)) = (_val))
|
|
+
|
|
+#define ATH724X_PCI_DEV_BASE 0x14000000
|
|
+#define ATH724X_PCI_MEM_BASE 0x10000000
|
|
+#define ATH724X_PCI_MEM_SIZE 0x08000000
|
|
+
|
|
+static DEFINE_SPINLOCK(ath724x_pci_lock);
|
|
+
|
|
+static int ath724x_pci_read(struct pci_bus *bus, unsigned int devfn, int where,
|
|
+ int size, uint32_t *value)
|
|
+{
|
|
+ unsigned long flags, addr, tval, mask;
|
|
+
|
|
+ if (devfn)
|
|
+ return PCIBIOS_DEVICE_NOT_FOUND;
|
|
+
|
|
+ if (where & (size - 1))
|
|
+ return PCIBIOS_BAD_REGISTER_NUMBER;
|
|
+
|
|
+ spin_lock_irqsave(&ath724x_pci_lock, flags);
|
|
+
|
|
+ switch (size) {
|
|
+ case 1:
|
|
+ addr = where & ~3;
|
|
+ mask = 0xff000000 >> ((where % 4) * 8);
|
|
+ tval = reg_read(ATH724X_PCI_DEV_BASE + addr);
|
|
+ tval = tval & ~mask;
|
|
+ *value = (tval >> ((4 - (where % 4))*8));
|
|
+ break;
|
|
+ case 2:
|
|
+ addr = where & ~3;
|
|
+ mask = 0xffff0000 >> ((where % 4)*8);
|
|
+ tval = reg_read(ATH724X_PCI_DEV_BASE + addr);
|
|
+ tval = tval & ~mask;
|
|
+ *value = (tval >> ((4 - (where % 4))*8));
|
|
+ break;
|
|
+ case 4:
|
|
+ *value = reg_read(ATH724X_PCI_DEV_BASE + where);
|
|
+ break;
|
|
+ default:
|
|
+ spin_unlock_irqrestore(&ath724x_pci_lock, flags);
|
|
+
|
|
+ return PCIBIOS_BAD_REGISTER_NUMBER;
|
|
+ }
|
|
+
|
|
+ spin_unlock_irqrestore(&ath724x_pci_lock, flags);
|
|
+
|
|
+ return PCIBIOS_SUCCESSFUL;
|
|
+}
|
|
+
|
|
+static int ath724x_pci_write(struct pci_bus *bus, unsigned int devfn, int where,
|
|
+ int size, uint32_t value)
|
|
+{
|
|
+ unsigned long flags, tval, addr, mask;
|
|
+
|
|
+ if (devfn)
|
|
+ return PCIBIOS_DEVICE_NOT_FOUND;
|
|
+
|
|
+ if (where & (size - 1))
|
|
+ return PCIBIOS_BAD_REGISTER_NUMBER;
|
|
+
|
|
+ spin_lock_irqsave(&ath724x_pci_lock, flags);
|
|
+
|
|
+ switch (size) {
|
|
+ case 1:
|
|
+ addr = (ATH724X_PCI_DEV_BASE + where) & ~3;
|
|
+ mask = 0xff000000 >> ((where % 4)*8);
|
|
+ tval = reg_read(addr);
|
|
+ tval = tval & ~mask;
|
|
+ tval |= (value << ((4 - (where % 4))*8)) & mask;
|
|
+ reg_write(addr, tval);
|
|
+ break;
|
|
+ case 2:
|
|
+ addr = (ATH724X_PCI_DEV_BASE + where) & ~3;
|
|
+ mask = 0xffff0000 >> ((where % 4)*8);
|
|
+ tval = reg_read(addr);
|
|
+ tval = tval & ~mask;
|
|
+ tval |= (value << ((4 - (where % 4))*8)) & mask;
|
|
+ reg_write(addr, tval);
|
|
+ break;
|
|
+ case 4:
|
|
+ reg_write((ATH724X_PCI_DEV_BASE + where), value);
|
|
+ break;
|
|
+ default:
|
|
+ spin_unlock_irqrestore(&ath724x_pci_lock, flags);
|
|
+
|
|
+ return PCIBIOS_BAD_REGISTER_NUMBER;
|
|
+ }
|
|
+
|
|
+ spin_unlock_irqrestore(&ath724x_pci_lock, flags);
|
|
+
|
|
+ return PCIBIOS_SUCCESSFUL;
|
|
+}
|
|
+
|
|
+static struct pci_ops ath724x_pci_ops = {
|
|
+ .read = ath724x_pci_read,
|
|
+ .write = ath724x_pci_write,
|
|
+};
|
|
+
|
|
+static struct resource ath724x_io_resource = {
|
|
+ .name = "PCI IO space",
|
|
+ .start = 0,
|
|
+ .end = 0,
|
|
+ .flags = IORESOURCE_IO,
|
|
+};
|
|
+
|
|
+static struct resource ath724x_mem_resource = {
|
|
+ .name = "PCI memory space",
|
|
+ .start = ATH724X_PCI_MEM_BASE,
|
|
+ .end = ATH724X_PCI_MEM_BASE + ATH724X_PCI_MEM_SIZE - 1,
|
|
+ .flags = IORESOURCE_MEM,
|
|
+};
|
|
+
|
|
+static struct pci_controller ath724x_pci_controller = {
|
|
+ .pci_ops = &ath724x_pci_ops,
|
|
+ .io_resource = &ath724x_io_resource,
|
|
+ .mem_resource = &ath724x_mem_resource,
|
|
+};
|
|
+
|
|
+int __init ath724x_pcibios_init(void)
|
|
+{
|
|
+ register_pci_controller(&ath724x_pci_controller);
|
|
+
|
|
+ return PCIBIOS_SUCCESSFUL;
|
|
+}
|
|
--- a/arch/mips/pci/pci-ath724x.c
|
|
+++ /dev/null
|
|
@@ -1,139 +0,0 @@
|
|
-/*
|
|
- * Atheros 724x PCI support
|
|
- *
|
|
- * Copyright (C) 2011 René Bolldorf <xsecute@googlemail.com>
|
|
- *
|
|
- * This program is free software; you can redistribute it and/or modify it
|
|
- * under the terms of the GNU General Public License version 2 as published
|
|
- * by the Free Software Foundation.
|
|
- */
|
|
-
|
|
-#include <linux/pci.h>
|
|
-#include <asm/mach-ath79/pci.h>
|
|
-
|
|
-#define reg_read(_phys) (*(unsigned int *) KSEG1ADDR(_phys))
|
|
-#define reg_write(_phys, _val) ((*(unsigned int *) KSEG1ADDR(_phys)) = (_val))
|
|
-
|
|
-#define ATH724X_PCI_DEV_BASE 0x14000000
|
|
-#define ATH724X_PCI_MEM_BASE 0x10000000
|
|
-#define ATH724X_PCI_MEM_SIZE 0x08000000
|
|
-
|
|
-static DEFINE_SPINLOCK(ath724x_pci_lock);
|
|
-
|
|
-static int ath724x_pci_read(struct pci_bus *bus, unsigned int devfn, int where,
|
|
- int size, uint32_t *value)
|
|
-{
|
|
- unsigned long flags, addr, tval, mask;
|
|
-
|
|
- if (devfn)
|
|
- return PCIBIOS_DEVICE_NOT_FOUND;
|
|
-
|
|
- if (where & (size - 1))
|
|
- return PCIBIOS_BAD_REGISTER_NUMBER;
|
|
-
|
|
- spin_lock_irqsave(&ath724x_pci_lock, flags);
|
|
-
|
|
- switch (size) {
|
|
- case 1:
|
|
- addr = where & ~3;
|
|
- mask = 0xff000000 >> ((where % 4) * 8);
|
|
- tval = reg_read(ATH724X_PCI_DEV_BASE + addr);
|
|
- tval = tval & ~mask;
|
|
- *value = (tval >> ((4 - (where % 4))*8));
|
|
- break;
|
|
- case 2:
|
|
- addr = where & ~3;
|
|
- mask = 0xffff0000 >> ((where % 4)*8);
|
|
- tval = reg_read(ATH724X_PCI_DEV_BASE + addr);
|
|
- tval = tval & ~mask;
|
|
- *value = (tval >> ((4 - (where % 4))*8));
|
|
- break;
|
|
- case 4:
|
|
- *value = reg_read(ATH724X_PCI_DEV_BASE + where);
|
|
- break;
|
|
- default:
|
|
- spin_unlock_irqrestore(&ath724x_pci_lock, flags);
|
|
-
|
|
- return PCIBIOS_BAD_REGISTER_NUMBER;
|
|
- }
|
|
-
|
|
- spin_unlock_irqrestore(&ath724x_pci_lock, flags);
|
|
-
|
|
- return PCIBIOS_SUCCESSFUL;
|
|
-}
|
|
-
|
|
-static int ath724x_pci_write(struct pci_bus *bus, unsigned int devfn, int where,
|
|
- int size, uint32_t value)
|
|
-{
|
|
- unsigned long flags, tval, addr, mask;
|
|
-
|
|
- if (devfn)
|
|
- return PCIBIOS_DEVICE_NOT_FOUND;
|
|
-
|
|
- if (where & (size - 1))
|
|
- return PCIBIOS_BAD_REGISTER_NUMBER;
|
|
-
|
|
- spin_lock_irqsave(&ath724x_pci_lock, flags);
|
|
-
|
|
- switch (size) {
|
|
- case 1:
|
|
- addr = (ATH724X_PCI_DEV_BASE + where) & ~3;
|
|
- mask = 0xff000000 >> ((where % 4)*8);
|
|
- tval = reg_read(addr);
|
|
- tval = tval & ~mask;
|
|
- tval |= (value << ((4 - (where % 4))*8)) & mask;
|
|
- reg_write(addr, tval);
|
|
- break;
|
|
- case 2:
|
|
- addr = (ATH724X_PCI_DEV_BASE + where) & ~3;
|
|
- mask = 0xffff0000 >> ((where % 4)*8);
|
|
- tval = reg_read(addr);
|
|
- tval = tval & ~mask;
|
|
- tval |= (value << ((4 - (where % 4))*8)) & mask;
|
|
- reg_write(addr, tval);
|
|
- break;
|
|
- case 4:
|
|
- reg_write((ATH724X_PCI_DEV_BASE + where), value);
|
|
- break;
|
|
- default:
|
|
- spin_unlock_irqrestore(&ath724x_pci_lock, flags);
|
|
-
|
|
- return PCIBIOS_BAD_REGISTER_NUMBER;
|
|
- }
|
|
-
|
|
- spin_unlock_irqrestore(&ath724x_pci_lock, flags);
|
|
-
|
|
- return PCIBIOS_SUCCESSFUL;
|
|
-}
|
|
-
|
|
-static struct pci_ops ath724x_pci_ops = {
|
|
- .read = ath724x_pci_read,
|
|
- .write = ath724x_pci_write,
|
|
-};
|
|
-
|
|
-static struct resource ath724x_io_resource = {
|
|
- .name = "PCI IO space",
|
|
- .start = 0,
|
|
- .end = 0,
|
|
- .flags = IORESOURCE_IO,
|
|
-};
|
|
-
|
|
-static struct resource ath724x_mem_resource = {
|
|
- .name = "PCI memory space",
|
|
- .start = ATH724X_PCI_MEM_BASE,
|
|
- .end = ATH724X_PCI_MEM_BASE + ATH724X_PCI_MEM_SIZE - 1,
|
|
- .flags = IORESOURCE_MEM,
|
|
-};
|
|
-
|
|
-static struct pci_controller ath724x_pci_controller = {
|
|
- .pci_ops = &ath724x_pci_ops,
|
|
- .io_resource = &ath724x_io_resource,
|
|
- .mem_resource = &ath724x_mem_resource,
|
|
-};
|
|
-
|
|
-int __init ath724x_pcibios_init(void)
|
|
-{
|
|
- register_pci_controller(&ath724x_pci_controller);
|
|
-
|
|
- return PCIBIOS_SUCCESSFUL;
|
|
-}
|