summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2013-05-15 15:36:58 +0200
committerJason Cooper <jason@lakedaemon.net>2013-05-27 16:02:12 +0000
commit9470fbfb8d15350ac54770ccf921cbcffcdbc24f (patch)
tree6f630c0cc82fc8dd8adf7c46a27b8f3e5036d21c
parent36e5722089ad757e9d15cd3b394389042cb28003 (diff)
downloadop-kernel-dev-9470fbfb8d15350ac54770ccf921cbcffcdbc24f.zip
op-kernel-dev-9470fbfb8d15350ac54770ccf921cbcffcdbc24f.tar.gz
arm: kirkwood: convert MPL CEC4 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> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
-rw-r--r--arch/arm/boot/dts/kirkwood-mplcec4.dts8
-rw-r--r--arch/arm/mach-kirkwood/board-mplcec4.c1
2 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/kirkwood-mplcec4.dts b/arch/arm/boot/dts/kirkwood-mplcec4.dts
index 7588241..90501cf 100644
--- a/arch/arm/boot/dts/kirkwood-mplcec4.dts
+++ b/arch/arm/boot/dts/kirkwood-mplcec4.dts
@@ -139,6 +139,14 @@
cd-gpios = <&gpio1 15 0>;
/* No WP GPIO */
};
+
+ pcie-controller {
+ status = "okay";
+
+ pcie@1,0 {
+ status = "okay";
+ };
+ };
};
gpio-leds {
diff --git a/arch/arm/mach-kirkwood/board-mplcec4.c b/arch/arm/mach-kirkwood/board-mplcec4.c
index 7d6dc66..938712e 100644
--- a/arch/arm/mach-kirkwood/board-mplcec4.c
+++ b/arch/arm/mach-kirkwood/board-mplcec4.c
@@ -29,7 +29,6 @@ void __init mplcec4_init(void)
*/
kirkwood_ge00_init(&mplcec4_ge00_data);
kirkwood_ge01_init(&mplcec4_ge01_data);
- kirkwood_pcie_init(KW_PCIE0);
}
OpenPOWER on IntegriCloud