73 lines
2 KiB
Diff
73 lines
2 KiB
Diff
|
From 0f75608615894c9707e40c0dd3383193fb6c09f6 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||
|
|
Date: Sat, 13 Apr 2013 13:03:56 +0200
|
||
|
|
Subject: [PATCH 15/29] arm: kirkwood: convert QNAP TS219 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: Andrew Lunn <andrew@lunn.ch>
|
||
|
|
---
|
||
|
|
arch/arm/boot/dts/kirkwood-ts219-6281.dts | 3 ++-
|
||
|
|
arch/arm/boot/dts/kirkwood-ts219-6282.dts | 3 ++-
|
||
|
|
arch/arm/boot/dts/kirkwood-ts219.dtsi | 9 +++++++--
|
||
|
|
3 files changed, 11 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/arch/arm/boot/dts/kirkwood-ts219-6281.dts b/arch/arm/boot/dts/kirkwood-ts219-6281.dts
|
||
|
|
index 8295c83..42648ab 100644
|
||
|
|
--- a/arch/arm/boot/dts/kirkwood-ts219-6281.dts
|
||
|
|
+++ b/arch/arm/boot/dts/kirkwood-ts219-6281.dts
|
||
|
|
@@ -1,7 +1,8 @@
|
||
|
|
/dts-v1/;
|
||
|
|
|
||
|
|
-/include/ "kirkwood-ts219.dtsi"
|
||
|
|
+/include/ "kirkwood.dtsi"
|
||
|
|
/include/ "kirkwood-6281.dtsi"
|
||
|
|
+/include/ "kirkwood-ts219.dtsi"
|
||
|
|
|
||
|
|
/ {
|
||
|
|
ocp@f1000000 {
|
||
|
|
diff --git a/arch/arm/boot/dts/kirkwood-ts219-6282.dts b/arch/arm/boot/dts/kirkwood-ts219-6282.dts
|
||
|
|
index df3f95d..95ceeb9 100644
|
||
|
|
--- a/arch/arm/boot/dts/kirkwood-ts219-6282.dts
|
||
|
|
+++ b/arch/arm/boot/dts/kirkwood-ts219-6282.dts
|
||
|
|
@@ -1,7 +1,8 @@
|
||
|
|
/dts-v1/;
|
||
|
|
|
||
|
|
-/include/ "kirkwood-ts219.dtsi"
|
||
|
|
+/include/ "kirkwood.dtsi"
|
||
|
|
/include/ "kirkwood-6282.dtsi"
|
||
|
|
+/include/ "kirkwood-ts219.dtsi"
|
||
|
|
|
||
|
|
/ {
|
||
|
|
ocp@f1000000 {
|
||
|
|
diff --git a/arch/arm/boot/dts/kirkwood-ts219.dtsi b/arch/arm/boot/dts/kirkwood-ts219.dtsi
|
||
|
|
index 64ea27c..7c022fd 100644
|
||
|
|
--- a/arch/arm/boot/dts/kirkwood-ts219.dtsi
|
||
|
|
+++ b/arch/arm/boot/dts/kirkwood-ts219.dtsi
|
||
|
|
@@ -1,5 +1,3 @@
|
||
|
|
-/include/ "kirkwood.dtsi"
|
||
|
|
-
|
||
|
|
/ {
|
||
|
|
model = "QNAP TS219 family";
|
||
|
|
compatible = "qnap,ts219", "marvell,kirkwood";
|
||
|
|
@@ -74,5 +72,12 @@
|
||
|
|
status = "okay";
|
||
|
|
nr-ports = <2>;
|
||
|
|
};
|
||
|
|
+ pcie-controller {
|
||
|
|
+ status = "okay";
|
||
|
|
+
|
||
|
|
+ pcie@1,0 {
|
||
|
|
+ status = "okay";
|
||
|
|
+ };
|
||
|
|
+ };
|
||
|
|
};
|
||
|
|
};
|
||
|
|
--
|
||
|
|
1.8.4.rc1
|
||
|
|
|