aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/adm8668/patches-3.3
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2012-12-06 22:40:12 +0000
committerFlorian Fainelli <florian@openwrt.org>2012-12-06 22:40:12 +0000
commitb516c8d89da65e57820f0a6e0f19eab1c5dd0736 (patch)
tree2780da5c394c7aebe811e75194f6ea340f496bb7 /target/linux/adm8668/patches-3.3
parent1ed763b8887616fbac8532895b764daf4d5d4f25 (diff)
downloadupstream-b516c8d89da65e57820f0a6e0f19eab1c5dd0736.tar.gz
upstream-b516c8d89da65e57820f0a6e0f19eab1c5dd0736.tar.bz2
upstream-b516c8d89da65e57820f0a6e0f19eab1c5dd0736.zip
cleanup PCI controller code
At some point we should make the ADM5120 PCI controller driver a real platform driver and share that one between the two targets. Signed-off-by: Florian Fainelli <florian@openwrt.org> SVN-Revision: 34553
Diffstat (limited to 'target/linux/adm8668/patches-3.3')
-rw-r--r--target/linux/adm8668/patches-3.3/001-adm8668_arch.patch2
-rw-r--r--target/linux/adm8668/patches-3.3/002-adm8668_pci.patch22
2 files changed, 23 insertions, 1 deletions
diff --git a/target/linux/adm8668/patches-3.3/001-adm8668_arch.patch b/target/linux/adm8668/patches-3.3/001-adm8668_arch.patch
index 541b0bff59..66be46c8d0 100644
--- a/target/linux/adm8668/patches-3.3/001-adm8668_arch.patch
+++ b/target/linux/adm8668/patches-3.3/001-adm8668_arch.patch
@@ -36,7 +36,7 @@
config BCM63XX
bool "Broadcom BCM63XX based boards"
select CEVT_R4K
-@@ -813,6 +833,7 @@ config NLM_XLP_BOARD
+@@ -813,6 +832,7 @@ config NLM_XLP_BOARD
endchoice
diff --git a/target/linux/adm8668/patches-3.3/002-adm8668_pci.patch b/target/linux/adm8668/patches-3.3/002-adm8668_pci.patch
new file mode 100644
index 0000000000..17be86489d
--- /dev/null
+++ b/target/linux/adm8668/patches-3.3/002-adm8668_pci.patch
@@ -0,0 +1,22 @@
+--- a/arch/mips/pci/Makefile
++++ b/arch/mips/pci/Makefile
+@@ -57,6 +57,7 @@ obj-$(CONFIG_WR_PPMC) += fixup-wrppmc.o
+ obj-$(CONFIG_MIKROTIK_RB532) += pci-rc32434.o ops-rc32434.o fixup-rc32434.o
+ obj-$(CONFIG_CPU_CAVIUM_OCTEON) += pci-octeon.o pcie-octeon.o
+ obj-$(CONFIG_CPU_XLR) += pci-xlr.o
++obj-$(CONFIG_ADM8668) += pci-adm8668.o
+
+ ifdef CONFIG_PCI_MSI
+ obj-$(CONFIG_CPU_CAVIUM_OCTEON) += msi-octeon.o
+--- a/include/linux/pci_ids.h
++++ b/include/linux/pci_ids.h
+@@ -1803,6 +1803,9 @@
+ #define PCI_VENDOR_ID_ESDGMBH 0x12fe
+ #define PCI_DEVICE_ID_ESDGMBH_CPCIASIO4 0x0111
+
++#define PCI_VENDOR_ADMTEK 0x1317
++#define PCI_DEVICE_ID_ADM8668 0x8688
++
+ #define PCI_VENDOR_ID_SIIG 0x131f
+ #define PCI_SUBVENDOR_ID_SIIG 0x131f
+ #define PCI_DEVICE_ID_SIIG_1S_10x_550 0x1000