diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-08-17 00:22:41 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-08-17 00:22:41 +0300 |
| commit | cf828ecc706463022b08ef1b87cda25d7d567199 (patch) | |
| tree | e50be7b58a3932bac0f2f939a03b7179fe707cd8 /arch/arm/boot/dts/armada-388-db.dts | |
| parent | 92a2a8cbc141d99192ef3008062bf7ef3951cbb0 (diff) | |
| parent | 0f015017a95c279a050ed953284451d2a0d29fb2 (diff) | |
| download | linux-cf828ecc706463022b08ef1b87cda25d7d567199.tar.xz | |
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/armada-388-db.dts')
| -rw-r--r-- | arch/arm/boot/dts/armada-388-db.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/armada-388-db.dts b/arch/arm/boot/dts/armada-388-db.dts index 1ac923826445..a4ec1fa37529 100644 --- a/arch/arm/boot/dts/armada-388-db.dts +++ b/arch/arm/boot/dts/armada-388-db.dts @@ -172,7 +172,7 @@ status = "okay"; }; - pcie-controller { + pcie { status = "okay"; /* * The two PCIe units are accessible through |