Skip to content

Commit 4c43a41

Browse files
Konstantin Porotchkingclement
authored andcommitted
arm64: dts: cn913x: add device trees for topology B boards
The CN913x DB with topology B is similar to a regular setup (A) boards, but uses NAND flash as a boot device, while topology A boards are booting from SPI flash. Since NAND and SPI on CN913x DB boards share some wires, they cannot be activated simultaneously. The DTS files for setup "B" are based on setup "A", in which the CP0 NAND controller enabled and CP0 SPI1 disabled. Signed-off-by: Konstantin Porotchkin <[email protected]> Signed-off-by: Gregory CLEMENT <[email protected]>
1 parent e73f0f0 commit 4c43a41

File tree

10 files changed

+930
-800
lines changed

10 files changed

+930
-800
lines changed

arch/arm64/boot/dts/marvell/Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,8 @@ dtb-$(CONFIG_ARCH_MVEBU) += armada-8040-mcbin-singleshot.dtb
1616
dtb-$(CONFIG_ARCH_MVEBU) += armada-8040-puzzle-m801.dtb
1717
dtb-$(CONFIG_ARCH_MVEBU) += armada-8080-db.dtb
1818
dtb-$(CONFIG_ARCH_MVEBU) += cn9130-db.dtb
19+
dtb-$(CONFIG_ARCH_MVEBU) += cn9130-db-B.dtb
1920
dtb-$(CONFIG_ARCH_MVEBU) += cn9131-db.dtb
21+
dtb-$(CONFIG_ARCH_MVEBU) += cn9131-db-B.dtb
2022
dtb-$(CONFIG_ARCH_MVEBU) += cn9132-db.dtb
23+
dtb-$(CONFIG_ARCH_MVEBU) += cn9132-db-B.dtb
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
2+
/*
3+
* Copyright (C) 2020 Marvell International Ltd.
4+
*
5+
* Device tree for the CN9130-DB board (setup "B").
6+
*/
7+
8+
#include "cn9130-db.dtsi"
9+
10+
/ {
11+
model = "Marvell Armada CN9130-DB setup B";
12+
};
13+
14+
/* Setup B has NAND flash as a boot device, while regular setup uses SPI flash.
15+
* Since CP0 SPI1 and CP0 NAND are sharing some pins, they cannot be activated
16+
* simultaneously. When NAND controller is enabled, SPI1 should be disabled.
17+
*/
18+
19+
&cp0_nand_controller {
20+
status = "okay";
21+
};
22+

0 commit comments

Comments
 (0)