aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/atheros
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2014-06-24 18:13:22 +0000
committerJohn Crispin <blogic@openwrt.org>2014-06-24 18:13:22 +0000
commit477a08a4da08f5b4e83cfa92e318219b8871e442 (patch)
tree762e961edf2fdcf54861aadb4571caf55220424b /target/linux/atheros
parent859fb40fa11a27e6bb3f262baaad80d63275d22d (diff)
downloadmaster-187ad058-477a08a4da08f5b4e83cfa92e318219b8871e442.tar.gz
master-187ad058-477a08a4da08f5b4e83cfa92e318219b8871e442.tar.bz2
master-187ad058-477a08a4da08f5b4e83cfa92e318219b8871e442.zip
atheros[ar231x-pci]: do not touch iomem_resource ranges
Moving the start of IO mem to 0x10000000 leads to allocation conflict with SPI flash memory region, which starts at 0x08000000. Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41319 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/atheros')
-rw-r--r--target/linux/atheros/patches-3.10/105-ar2315_pci.patch4
1 files changed, 1 insertions, 3 deletions
diff --git a/target/linux/atheros/patches-3.10/105-ar2315_pci.patch b/target/linux/atheros/patches-3.10/105-ar2315_pci.patch
index 7108d6c75f..733d6ad1bb 100644
--- a/target/linux/atheros/patches-3.10/105-ar2315_pci.patch
+++ b/target/linux/atheros/patches-3.10/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,236 @@
+@@ -0,0 +1,234 @@
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
@@ -235,8 +235,6 @@
+ /* dirty hack - anyone with a datasheet that knows the memory map ? */
+ ioport_resource.start = 0x10000000;
+ ioport_resource.end = 0xffffffff;
-+ iomem_resource.start = 0x10000000;
-+ iomem_resource.end = 0xffffffff;
+
+ register_pci_controller(&ar231x_pci_controller);
+