summaryrefslogtreecommitdiff
path: root/target/linux/kirkwood/patches-3.10/0009-pci-mvebu-enable-driver-usage-on-Kirkwood.patch
diff options
context:
space:
mode:
authorluka <luka@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-10-02 00:33:47 +0000
committerluka <luka@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-10-02 00:33:47 +0000
commit7730eb8430d5e708c1b649173045bdf3c4056b9c (patch)
tree46a17cfdfe54d9f96fdfb53263ba377c738d1bff /target/linux/kirkwood/patches-3.10/0009-pci-mvebu-enable-driver-usage-on-Kirkwood.patch
parentd8eb02a921fa2c06118347231f3fd69285b8a5c7 (diff)
kirkwood: add linux 3.10 support
Backport appropriate patches to allow using device tree only board defintions. Signed-off-by: Jonas Gorski <jogo@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38280 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/kirkwood/patches-3.10/0009-pci-mvebu-enable-driver-usage-on-Kirkwood.patch')
-rw-r--r--target/linux/kirkwood/patches-3.10/0009-pci-mvebu-enable-driver-usage-on-Kirkwood.patch56
1 files changed, 56 insertions, 0 deletions
diff --git a/target/linux/kirkwood/patches-3.10/0009-pci-mvebu-enable-driver-usage-on-Kirkwood.patch b/target/linux/kirkwood/patches-3.10/0009-pci-mvebu-enable-driver-usage-on-Kirkwood.patch
new file mode 100644
index 0000000000..c1f4b1ccbd
--- /dev/null
+++ b/target/linux/kirkwood/patches-3.10/0009-pci-mvebu-enable-driver-usage-on-Kirkwood.patch
@@ -0,0 +1,56 @@
+From 3b93e75d1b66353b8f8ad7d965e17aad68982c55 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Wed, 27 Mar 2013 18:48:13 +0100
+Subject: [PATCH 09/29] pci: mvebu: enable driver usage on Kirkwood
+
+We allow the pci-mvebu driver to be compiled on the Kirkwood platform,
+and add the 'marvell,kirkwood-pcie' as a compatible string supported
+by the driver.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Tested-by: Andrew Lunn <andrew@lunn.ch>
+---
+ Documentation/devicetree/bindings/pci/mvebu-pci.txt | 1 +
+ drivers/pci/host/Kconfig | 2 +-
+ drivers/pci/host/pci-mvebu.c | 1 +
+ 3 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/Documentation/devicetree/bindings/pci/mvebu-pci.txt b/Documentation/devicetree/bindings/pci/mvebu-pci.txt
+index eb69d92..f8d4058 100644
+--- a/Documentation/devicetree/bindings/pci/mvebu-pci.txt
++++ b/Documentation/devicetree/bindings/pci/mvebu-pci.txt
+@@ -4,6 +4,7 @@ Mandatory properties:
+ - compatible: one of the following values:
+ marvell,armada-370-pcie
+ marvell,armada-xp-pcie
++ marvell,kirkwood-pcie
+ - #address-cells, set to <3>
+ - #size-cells, set to <2>
+ - #interrupt-cells, set to <1>
+diff --git a/drivers/pci/host/Kconfig b/drivers/pci/host/Kconfig
+index 6918fbc..1f1d67f 100644
+--- a/drivers/pci/host/Kconfig
++++ b/drivers/pci/host/Kconfig
+@@ -3,6 +3,6 @@ menu "PCI host controller drivers"
+
+ config PCI_MVEBU
+ bool "Marvell EBU PCIe controller"
+- depends on ARCH_MVEBU
++ depends on ARCH_MVEBU || ARCH_KIRKWOOD
+
+ endmenu
+diff --git a/drivers/pci/host/pci-mvebu.c b/drivers/pci/host/pci-mvebu.c
+index b0ee63b..6fe8b90 100644
+--- a/drivers/pci/host/pci-mvebu.c
++++ b/drivers/pci/host/pci-mvebu.c
+@@ -853,6 +853,7 @@ static int __init mvebu_pcie_probe(struct platform_device *pdev)
+ static const struct of_device_id mvebu_pcie_of_match_table[] = {
+ { .compatible = "marvell,armada-xp-pcie", },
+ { .compatible = "marvell,armada-370-pcie", },
++ { .compatible = "marvell,kirkwood-pcie", },
+ {},
+ };
+ MODULE_DEVICE_TABLE(of, mvebu_pcie_of_match_table);
+--
+1.8.4.rc1
+