You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
55 lines
1.5 KiB
Diff
55 lines
1.5 KiB
Diff
11 years ago
|
From b7031bd802336c77a6b330f79b275ccbb55fdc96 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||
|
|
Date: Wed, 10 Apr 2013 21:22:13 +0200
|
||
|
|
Subject: [PATCH 12/29] arm: kirkwood: convert Iomega Iconnect to use DT for
|
||
|
|
the PCIe interface
|
||
|
|
|
||
|
|
Now that the PCIe mvebu driver is usable on Kirkwood, use it instead
|
||
|
|
of the legacy PCIe code, since it allows to describe the PCIe
|
||
|
|
interfaces in the Device Tree.
|
||
|
|
|
||
|
|
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||
|
|
---
|
||
|
|
arch/arm/boot/dts/kirkwood-iconnect.dts | 8 ++++++++
|
||
|
|
arch/arm/mach-kirkwood/board-iconnect.c | 8 --------
|
||
|
|
2 files changed, 8 insertions(+), 8 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/arch/arm/boot/dts/kirkwood-iconnect.dts b/arch/arm/boot/dts/kirkwood-iconnect.dts
|
||
|
|
index 12ccf74..e591d5d 100644
|
||
|
|
--- a/arch/arm/boot/dts/kirkwood-iconnect.dts
|
||
|
|
+++ b/arch/arm/boot/dts/kirkwood-iconnect.dts
|
||
|
|
@@ -109,6 +109,14 @@
|
||
|
|
reg = <0x980000 0x1f400000>;
|
||
|
|
};
|
||
|
|
};
|
||
|
|
+
|
||
|
|
+ pcie-controller {
|
||
|
|
+ status = "okay";
|
||
|
|
+
|
||
|
|
+ pcie@1,0 {
|
||
|
|
+ status = "okay";
|
||
|
|
+ };
|
||
|
|
+ };
|
||
|
|
};
|
||
|
|
|
||
|
|
gpio-leds {
|
||
|
|
diff --git a/arch/arm/mach-kirkwood/board-iconnect.c b/arch/arm/mach-kirkwood/board-iconnect.c
|
||
|
|
index c8ebde4..98b5ad1 100644
|
||
|
|
--- a/arch/arm/mach-kirkwood/board-iconnect.c
|
||
|
|
+++ b/arch/arm/mach-kirkwood/board-iconnect.c
|
||
|
|
@@ -22,11 +22,3 @@ void __init iconnect_init(void)
|
||
|
|
{
|
||
|
|
kirkwood_ge00_init(&iconnect_ge00_data);
|
||
|
|
}
|
||
|
|
-
|
||
|
|
-static int __init iconnect_pci_init(void)
|
||
|
|
-{
|
||
|
|
- if (of_machine_is_compatible("iom,iconnect"))
|
||
|
|
- kirkwood_pcie_init(KW_PCIE0);
|
||
|
|
- return 0;
|
||
|
|
-}
|
||
|
|
-subsys_initcall(iconnect_pci_init);
|
||
|
|
--
|
||
|
|
1.8.4.rc1
|
||
|
|
|