atheros: ar2315-pci: rename configuration symbol

Rename configuration symbol to be consistent with other MIPS machines.

Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>

SVN-Revision: 42505
This commit is contained in:
John Crispin 2014-09-12 06:53:27 +00:00
parent fb4196ec2a
commit 4156c9734a
2 changed files with 7 additions and 6 deletions

View File

@ -12,7 +12,6 @@ CONFIG_ARCH_REQUIRE_GPIOLIB=y
CONFIG_ARCH_SUSPEND_POSSIBLE=y CONFIG_ARCH_SUSPEND_POSSIBLE=y
CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
CONFIG_ATHEROS_AR2315=y CONFIG_ATHEROS_AR2315=y
CONFIG_ATHEROS_AR2315_PCI=y
CONFIG_ATHEROS_AR231X=y CONFIG_ATHEROS_AR231X=y
CONFIG_ATHEROS_AR5312=y CONFIG_ATHEROS_AR5312=y
CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y
@ -115,6 +114,7 @@ CONFIG_NET_RX_BUSY_POLL=y
CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y
CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_PAGEFLAGS_EXTENDED=y
CONFIG_PCI=y CONFIG_PCI=y
CONFIG_PCI_AR2315=y
CONFIG_PCI_DISABLE_COMMON_QUIRKS=y CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
CONFIG_PCI_DOMAINS=y CONFIG_PCI_DOMAINS=y
CONFIG_PERF_USE_VMALLOC=y CONFIG_PERF_USE_VMALLOC=y

View File

@ -1,10 +1,11 @@
--- a/arch/mips/ar231x/Makefile --- a/arch/mips/ar231x/Makefile
+++ b/arch/mips/ar231x/Makefile +++ b/arch/mips/ar231x/Makefile
@@ -14,3 +14,4 @@ obj-$(CONFIG_EARLY_PRINTK) += early_prin @@ -14,3 +14,5 @@ obj-$(CONFIG_EARLY_PRINTK) += early_prin
obj-$(CONFIG_ATHEROS_AR5312) += ar5312.o obj-$(CONFIG_ATHEROS_AR5312) += ar5312.o
obj-$(CONFIG_ATHEROS_AR2315) += ar2315.o obj-$(CONFIG_ATHEROS_AR2315) += ar2315.o
+obj-$(CONFIG_ATHEROS_AR2315_PCI) += pci.o +obj-$(CONFIG_PCI_AR2315) += pci.o
+
--- /dev/null --- /dev/null
+++ b/arch/mips/ar231x/pci.c +++ b/arch/mips/ar231x/pci.c
@@ -0,0 +1,340 @@ @@ -0,0 +1,340 @@
@ -355,8 +356,8 @@
depends on ATHEROS_AR231X depends on ATHEROS_AR231X
default y default y
+ +
+config ATHEROS_AR2315_PCI +config PCI_AR2315
+ bool "PCI support" + bool "AR2315 PCI controller support"
+ depends on ATHEROS_AR2315 + depends on ATHEROS_AR2315
+ select HW_HAS_PCI + select HW_HAS_PCI
+ select PCI + select PCI
@ -367,7 +368,7 @@
do_IRQ(AR2315_IRQ_WLAN0_INTRS); do_IRQ(AR2315_IRQ_WLAN0_INTRS);
else if (pending & CAUSEF_IP4) else if (pending & CAUSEF_IP4)
do_IRQ(AR2315_IRQ_ENET0_INTRS); do_IRQ(AR2315_IRQ_ENET0_INTRS);
+#ifdef CONFIG_ATHEROS_AR2315_PCI +#ifdef CONFIG_PCI_AR2315
+ else if (pending & CAUSEF_IP5) + else if (pending & CAUSEF_IP5)
+ do_IRQ(AR2315_IRQ_LCBUS_PCI); + do_IRQ(AR2315_IRQ_LCBUS_PCI);
+#endif +#endif