redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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>
hifive-unleashed-5.1
Thomas Petazzoni 2013-05-15 15:37:00 +02:00 committed by Jason Cooper
parent 40fa8e5da2
commit 259e234608
4 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/boot/dts/kirkwood-ts219-6281.dts
View File

@ -1,7 +1,8 @@
/dts-v1/;
/include/ "kirkwood-ts219.dtsi"
/include/ "kirkwood.dtsi"
/include/ "kirkwood-6281.dtsi"
/include/ "kirkwood-ts219.dtsi"
/ {
ocp@f1000000 {

3
arch/arm/boot/dts/kirkwood-ts219-6282.dts
View File

@ -1,7 +1,8 @@
/dts-v1/;
/include/ "kirkwood-ts219.dtsi"
/include/ "kirkwood.dtsi"
/include/ "kirkwood-6282.dtsi"
/include/ "kirkwood-ts219.dtsi"
/ {
ocp@f1000000 {

9
arch/arm/boot/dts/kirkwood-ts219.dtsi
View File

@ -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";
};
};
};
};

10
arch/arm/mach-kirkwood/board-ts219.c
View File

@ -41,13 +41,3 @@ void __init qnap_dt_ts219_init(void)
pm_power_off = qnap_tsx1x_power_off;
}
/* FIXME: Will not work with DT. Maybe use MPP40_GPIO? */
static int __init ts219_pci_init(void)
{
if (machine_is_ts219())
kirkwood_pcie_init(KW_PCIE0);
return 0;
}
subsys_initcall(ts219_pci_init);