aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2014-06-24 18:13:22 +0000
committerJohn Crispin <john@openwrt.org>2014-06-24 18:13:22 +0000
commit1dab970e8b30d077a9a35d0b98702e910f7cf4d7 (patch)
tree50f36e782323a657bcaff20a9f39410aad98ede8 /target
parent79b4598a7f7f5cd1ec4fd9544777d34dc4642a48 (diff)
downloadupstream-1dab970e8b30d077a9a35d0b98702e910f7cf4d7.tar.gz
upstream-1dab970e8b30d077a9a35d0b98702e910f7cf4d7.tar.bz2
upstream-1dab970e8b30d077a9a35d0b98702e910f7cf4d7.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> SVN-Revision: 41319
Diffstat (limited to 'target')
-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);
+