diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2013-05-15 15:37:00 +0200 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2013-05-27 16:02:12 +0000 |
| commit | 259e234608dbc6c6a673efb5d58a1c036eb9b47a (patch) | |
| tree | 887dd8af056760b43e52f74382e7a99c0135623c /arch/arm/boot | |
| parent | 40fa8e5da25b35fea0bcea113c61d72ae31f20fd (diff) | |
| download | op-kernel-dev-259e234608dbc6c6a673efb5d58a1c036eb9b47a.zip op-kernel-dev-259e234608dbc6c6a673efb5d58a1c036eb9b47a.tar.gz | |
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>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/kirkwood-ts219-6281.dts | 3 | ||||
| -rw-r--r-- | arch/arm/boot/dts/kirkwood-ts219-6282.dts | 3 | ||||
| -rw-r--r-- | 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"; + }; + }; }; }; |
