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/armada-xp-db.dts | |
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/armada-xp-db.dts')
-rw-r--r-- | arch/arm/boot/dts/armada-xp-db.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/armada-xp-db.dts b/arch/arm/boot/dts/armada-xp-db.dts index a33974254d8c..065282c21789 100644 --- a/arch/arm/boot/dts/armada-xp-db.dts +++ b/arch/arm/boot/dts/armada-xp-db.dts @@ -242,7 +242,7 @@ /* Port 2, Lane 0 */ status = "okay"; }; - pcie@10,0 { + pcie@a,0 { /* Port 3, Lane 0 */ status = "okay"; }; |