diff options
| author | Arnd Bergmann | 2017-08-16 23:22:41 +0200 |
|---|---|---|
| committer | Arnd Bergmann | 2017-08-16 23:22:41 +0200 |
| commit | cf828ecc706463022b08ef1b87cda25d7d567199 (patch) | |
| tree | e50be7b58a3932bac0f2f939a03b7179fe707cd8 /arch/arm/boot/dts/kirkwood-6281.dtsi | |
| parent | Merge tag 'gemini-dts-1' of git://git.kernel.org/pub/scm/linux/kernel/git/lin... (diff) | |
| parent | ARM: dts: armada-38x: Add arm_global_timer node (diff) | |
| download | kernel-qcow2-linux-cf828ecc706463022b08ef1b87cda25d7d567199.tar.gz kernel-qcow2-linux-cf828ecc706463022b08ef1b87cda25d7d567199.tar.xz kernel-qcow2-linux-cf828ecc706463022b08ef1b87cda25d7d567199.zip | |
Merge tag 'mvebu-dt-4.14-1' of git://git.infradead.org/linux-mvebu into next/dt
Pull "mvebu dt for 4.14 (part 1)" from Gregory CLEMENT:
Add arm_global_timer node on Armada 38x
Fix PCI bus dtc warnings on mvebu 32 bits device tree files
* tag 'mvebu-dt-4.14-1' of git://git.infradead.org/linux-mvebu:
ARM: dts: armada-38x: Add arm_global_timer node
ARM: dts: marvell: fix PCI bus dtc warnings
Diffstat (limited to 'arch/arm/boot/dts/kirkwood-6281.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/kirkwood-6281.dtsi | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/kirkwood-6281.dtsi b/arch/arm/boot/dts/kirkwood-6281.dtsi index 748d0b62f233..47d4b3d3d9e9 100644 --- a/arch/arm/boot/dts/kirkwood-6281.dtsi +++ b/arch/arm/boot/dts/kirkwood-6281.dtsi @@ -1,6 +1,6 @@ / { mbus@f1000000 { - pciec: pcie-controller@82000000 { + pciec: pcie@82000000 { compatible = "marvell,kirkwood-pcie"; status = "disabled"; device_type = "pci"; @@ -24,6 +24,7 @@ #interrupt-cells = <1>; ranges = <0x82000000 0 0 0x82000000 0x1 0 1 0 0x81000000 0 0 0x81000000 0x1 0 1 0>; + bus-range = <0x00 0xff>; interrupt-map-mask = <0 0 0 0>; interrupt-map = <0 0 0 0 &intc 9>; marvell,pcie-port = <0>; |