summaryrefslogtreecommitdiffstats
path: root/arch/arm64/boot
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2018-01-02 15:55:54 +0100
committerGregory CLEMENT <gregory.clement@free-electrons.com>2018-01-05 17:02:39 +0100
commit4003e96a7b94903c11b6f1f4edffaf2fc2c8ad48 (patch)
tree333c1671090d1c2a79f9d7d76ae741cdc8b69c1d /arch/arm64/boot
parentab8637ed3096ab10b6589f92139080f50aaca186 (diff)
downloadop-kernel-dev-4003e96a7b94903c11b6f1f4edffaf2fc2c8ad48.zip
op-kernel-dev-4003e96a7b94903c11b6f1f4edffaf2fc2c8ad48.tar.gz
arm64: dts: marvell: fix compatible string list for Armada CP110 slave NAND
The Armada CP110 slave NAND controller Device Tree description lists the compatible string in the wrong order: marvell,armada-8k-nand should come first. This commit alignes the slave CP110 description with the master CP110 description from that respect. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Diffstat (limited to 'arch/arm64/boot')
-rw-r--r--arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
index bfe19a6..64848a1 100644
--- a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
@@ -325,8 +325,8 @@
* this controller is only usable on the CPM
* for A7K and on the CPS for A8K.
*/
- compatible = "marvell,armada370-nand",
- "marvell,armada-8k-nand";
+ compatible = "marvell,armada-8k-nand",
+ "marvell,armada370-nand";
reg = <0x720000 0x54>;
#address-cells = <1>;
#size-cells = <1>;
OpenPOWER on IntegriCloud