Skip to contentSkip to conversation

DTS updates for Marvell Armada CN913x platforms

PATCH Superseded [email protected] 2 participants 13 messages Dec 17, 2020 – Dec 21, 2020

Subsystems (3)

v2 of 7 Superseded Latest is v7 →

lore
Share & tools
lore
#0 lore raw

v2 cover DTS updates for Marvell Armada CN913x platforms

From: Konstantin Porotchkin <[email protected]>

This patch series contains the following changes/fixes:
1. Add support for Armada CN913x Development Board topology "B"
2. Add support for Armada CN913x Reference Design boards (CRB)
3. Fixes the CP11X references in PHY binding document
4. Fixes the NAND paritioninig scheme in DTS eliminating gap between consecutive partitions
All above changes are already intergated into Marvell official SDK sources

v2:
- extract common nodes from DB boards to separate DTSI files
- disable eth2 on CRB boards until the required phy mode support is added
- mention the switch part ID in CRB board description

Grzegorz Jaszczyk (1):
Documentation/bindings: phy: update references to cp11x

Konstantin Porotchkin (3):
arch/arm64/boot/dts/marvell: fix NAND partitioning scheme
arm64: dts: cn913x: add device trees for topology B boards
arm64: dts: add support for Marvell cn9130-crb platform

 .../bindings/phy/phy-mvebu-comphy.txt         |  12 +-
 arch/arm64/boot/dts/marvell/Makefile          |  11 +-
 arch/arm64/boot/dts/marvell/cn9130-crb-A.dts  |  38 +++
 arch/arm64/boot/dts/marvell/cn9130-crb-B.dts  |  46 ++++
 arch/arm64/boot/dts/marvell/cn9130-crb.dtsi   | 222 ++++++++++++++++++
 arch/arm64/boot/dts/marvell/cn9130-db-A.dts   |  22 ++
 arch/arm64/boot/dts/marvell/cn9130-db-B.dts   |  22 ++
 .../marvell/{cn9130-db.dts => cn9130-db.dtsi} |   7 +-
 arch/arm64/boot/dts/marvell/cn9131-db-A.dts   |  22 ++
 arch/arm64/boot/dts/marvell/cn9131-db-B.dts   |  22 ++
 .../marvell/{cn9131-db.dts => cn9131-db.dtsi} |   5 +-
 arch/arm64/boot/dts/marvell/cn9132-db-A.dts   |  22 ++
 arch/arm64/boot/dts/marvell/cn9132-db-B.dts   |  22 ++
 .../marvell/{cn9132-db.dts => cn9132-db.dtsi} |   5 +-
 14 files changed, 459 insertions(+), 19 deletions(-)
 create mode 100644 arch/arm64/boot/dts/marvell/cn9130-crb-A.dts
 create mode 100644 arch/arm64/boot/dts/marvell/cn9130-crb-B.dts
 create mode 100644 arch/arm64/boot/dts/marvell/cn9130-crb.dtsi
 create mode 100644 arch/arm64/boot/dts/marvell/cn9130-db-A.dts
 create mode 100644 arch/arm64/boot/dts/marvell/cn9130-db-B.dts
 rename arch/arm64/boot/dts/marvell/{cn9130-db.dts => cn9130-db.dtsi} (98%)
 create mode 100644 arch/arm64/boot/dts/marvell/cn9131-db-A.dts
 create mode 100644 arch/arm64/boot/dts/marvell/cn9131-db-B.dts
 rename arch/arm64/boot/dts/marvell/{cn9131-db.dts => cn9131-db.dtsi} (97%)
 create mode 100644 arch/arm64/boot/dts/marvell/cn9132-db-A.dts
 create mode 100644 arch/arm64/boot/dts/marvell/cn9132-db-B.dts
 rename arch/arm64/boot/dts/marvell/{cn9132-db.dts => cn9132-db.dtsi} (97%)
Signature · 7 lines
2.17.1


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
#1 lore raw

PATCH v2 1/4 Documentation/bindings: phy: update references to cp11x

From: Grzegorz Jaszczyk <[email protected]>

The cp11x references in dts has changed, reflect it in comphy documentation.

---
 Documentation/devicetree/bindings/phy/phy-mvebu-comphy.txt | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
Documentation/devicetree/bindings/phy/phy-mvebu-comphy.txt +6 -6
index 8c60e6985950..5ffd0f55d010 100644
@@ -42,22 +42,22 @@ Required properties (child nodes):
 
 Examples:
 
-	cpm_comphy: phy@120000 {
+	CP11X_LABEL(comphy): phy@120000 {
 		compatible = "marvell,comphy-cp110";
 		reg = <0x120000 0x6000>;
-		marvell,system-controller = <&cpm_syscon0>;
-		clocks = <&CP110_LABEL(clk) 1 5>, <&CP110_LABEL(clk) 1 6>,
-			 <&CP110_LABEL(clk) 1 18>;
+		marvell,system-controller = <&CP11X_LABEL(syscon0)>;
+		clocks = <&CP11X_LABEL(clk) 1 5>, <&CP11X_LABEL(clk) 1 6>,
+			 <&CP11X_LABEL(clk) 1 18>;
 		clock-names = "mg_clk", "mg_core_clk", "axi_clk";
 		#address-cells = <1>;
 		#size-cells = <0>;
 
-		cpm_comphy0: phy@0 {
+		CP11X_LABEL(comphy0): phy@0 {
 			reg = <0>;
 			#phy-cells = <1>;
 		};
 
-		cpm_comphy1: phy@1 {
+		CP11X_LABEL(comphy1): phy@1 {
 			reg = <1>;
 			#phy-cells = <1>;
 		};
Signature · 7 lines
2.17.1


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
#2 lore raw

PATCH v2 2/4 arch/arm64/boot/dts/marvell: fix NAND partitioning scheme

In reply to [email protected]

From: Konstantin Porotchkin <[email protected]>

Eliminate 1MB gap between Linux and filesystem partitions.

---
 arch/arm64/boot/dts/marvell/cn9130-db.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/marvell/cn9130-db.dts +1 -1
index ce49a70d88a0..d24294888400 100644
@@ -258,7 +258,7 @@
 			};
 			partition@200000 {
 				label = "Linux";
-				reg = <0x200000 0xd00000>;
+				reg = <0x200000 0xe00000>;
 			};
 			partition@1000000 {
 				label = "Filesystem";
Signature · 7 lines
2.17.1


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
maintainer Reviewed-by on v2 2/4
#3 lore raw

Re: [PATCH v2 2/4] arch/arm64/boot/dts/marvell: fix NAND partitioning scheme

Quoted 5 lines · On Thu, Dec 17, 2020 at 09:55:40AM +0200, [email protected] wrote:

From: Konstantin Porotchkin <[email protected]>

Eliminate 1MB gap between Linux and filesystem partitions.

Andrew

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

#4 lore raw

PATCH v2 3/4 arm64: dts: cn913x: add device trees for topology B boards

In reply to [email protected]

From: Konstantin Porotchkin <[email protected]>

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.

---
 arch/arm64/boot/dts/marvell/Makefile                          |  9 +++++---
 arch/arm64/boot/dts/marvell/cn9130-db-A.dts                   | 22 ++++++++++++++++++++
 arch/arm64/boot/dts/marvell/cn9130-db-B.dts                   | 22 ++++++++++++++++++++
 arch/arm64/boot/dts/marvell/{cn9130-db.dts => cn9130-db.dtsi} |  5 ++---
 arch/arm64/boot/dts/marvell/cn9131-db-A.dts                   | 22 ++++++++++++++++++++
 arch/arm64/boot/dts/marvell/cn9131-db-B.dts                   | 22 ++++++++++++++++++++
 arch/arm64/boot/dts/marvell/{cn9131-db.dts => cn9131-db.dtsi} |  5 ++---
 arch/arm64/boot/dts/marvell/cn9132-db-A.dts                   | 22 ++++++++++++++++++++
 arch/arm64/boot/dts/marvell/cn9132-db-B.dts                   | 22 ++++++++++++++++++++
 arch/arm64/boot/dts/marvell/{cn9132-db.dts => cn9132-db.dtsi} |  5 ++---
 10 files changed, 144 insertions(+), 12 deletions(-)
 create mode 100644 arch/arm64/boot/dts/marvell/cn9130-db-A.dts
 create mode 100644 arch/arm64/boot/dts/marvell/cn9130-db-B.dts
 rename arch/arm64/boot/dts/marvell/{cn9130-db.dts => cn9130-db.dtsi} (99%)
 create mode 100644 arch/arm64/boot/dts/marvell/cn9131-db-A.dts
 create mode 100644 arch/arm64/boot/dts/marvell/cn9131-db-B.dts
 rename arch/arm64/boot/dts/marvell/{cn9131-db.dts => cn9131-db.dtsi} (97%)
 create mode 100644 arch/arm64/boot/dts/marvell/cn9132-db-A.dts
 create mode 100644 arch/arm64/boot/dts/marvell/cn9132-db-B.dts
 rename arch/arm64/boot/dts/marvell/{cn9132-db.dts => cn9132-db.dtsi} (97%)
arch/arm64/boot/dts/marvell/Makefile +6 -3
index 3e5f2e7a040c..d9b924a63d89 100644
@@ -13,6 +13,9 @@ dtb-$(CONFIG_ARCH_MVEBU) += armada-8040-db.dtb
 dtb-$(CONFIG_ARCH_MVEBU) += armada-8040-mcbin.dtb
 dtb-$(CONFIG_ARCH_MVEBU) += armada-8040-mcbin-singleshot.dtb
 dtb-$(CONFIG_ARCH_MVEBU) += armada-8080-db.dtb
-dtb-$(CONFIG_ARCH_MVEBU) += cn9130-db.dtb
-dtb-$(CONFIG_ARCH_MVEBU) += cn9131-db.dtb
-dtb-$(CONFIG_ARCH_MVEBU) += cn9132-db.dtb
+dtb-$(CONFIG_ARCH_MVEBU) += cn9130-db-A.dtb
+dtb-$(CONFIG_ARCH_MVEBU) += cn9130-db-B.dtb
+dtb-$(CONFIG_ARCH_MVEBU) += cn9131-db-A.dtb
+dtb-$(CONFIG_ARCH_MVEBU) += cn9131-db-B.dtb
+dtb-$(CONFIG_ARCH_MVEBU) += cn9132-db-A.dtb
+dtb-$(CONFIG_ARCH_MVEBU) += cn9132-db-B.dtb
arch/arm64/boot/dts/marvell/cn9130-db-A.dts new file +22 -0
new file mode 100644
index 000000000000..adb3a67a20b1
@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (C) 2019 Marvell International Ltd.
+ *
+ * Device tree for the CN9130-DB board.
+ */
+
+#include "cn9131-db.dtsi"
+
+/ {
+	model = "Marvell Armada CN9130-DB setup A";
+};
+
+/* Setup A has SPI1 flash as a boot device, while setup B uses NAND flash.
+ * Since CP0 SPI1 and CP0 NAND are sharing some pins, they cannot be activated
+ * simultaneously. When SPI controller is enabled, NAND should be disabled.
+ */
+
+&cp0_spi1 {
+	status = "okay";
+};
+
arch/arm64/boot/dts/marvell/cn9130-db-B.dts new file +22 -0
new file mode 100644
index 000000000000..57e41cacd483
@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (C) 2020 Marvell International Ltd.
+ *
+ * Device tree for the CN9130-DB board (setup "B").
+ */
+
+#include "cn9130-db.dtsi"
+
+/ {
+	model = "Marvell Armada CN9130-DB setup B";
+};
+
+/* Setup B has NAND flash as a boot device, while regular setup uses SPI flash.
+ * Since CP0 SPI1 and CP0 NAND are sharing some pins, they cannot be activated
+ * simultaneously. When NAND controller is enabled, SPI1 should be disabled.
+ */
+
+&cp0_nand_controller {
+	status = "okay";
+};
+
arch/arm64/boot/dts/marvell/cn9130-db.dtsi renamed from arch/arm64/boot/dts/marvell/cn9130-db.dts +2 -3
similarity index 99%
rename from arch/arm64/boot/dts/marvell/cn9130-db.dts
rename to arch/arm64/boot/dts/marvell/cn9130-db.dtsi
index d24294888400..8de3a552b806 100644
@@ -10,8 +10,6 @@
 #include <dt-bindings/gpio/gpio.h>
 
 / {
-	model = "Marvell Armada CN9130-DB";
-
 	chosen {
 		stdout-path = "serial0:115200n8";
 	};
@@ -235,6 +233,7 @@
 
 /* U54 */
 &cp0_nand_controller {
+	status = "disabled";
 	pinctrl-names = "default";
 	pinctrl-0 = <&nand_pins &nand_rb>;
 
@@ -306,7 +305,7 @@
 
 /* U55 */
 &cp0_spi1 {
-	status = "okay";
+	status = "disabled";
 	pinctrl-names = "default";
 	pinctrl-0 = <&cp0_spi0_pins>;
 	reg = <0x700680 0x50>;
arch/arm64/boot/dts/marvell/cn9131-db-A.dts new file +22 -0
new file mode 100644
index 000000000000..a60fdee79bf8
@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (C) 2019 Marvell International Ltd.
+ *
+ * Device tree for the CN9131-DB board.
+ */
+
+#include "cn9131-db.dtsi"
+
+/ {
+	model = "Marvell Armada CN9131-DB setup A";
+};
+
+/* Setup A has SPI1 flash as a boot device, while setup B uses NAND flash.
+ * Since CP0 SPI1 and CP0 NAND are sharing some pins, they cannot be activated
+ * simultaneously. When SPI controller is enabled, NAND should be disabled.
+ */
+
+&cp0_spi1 {
+	status = "okay";
+};
+
arch/arm64/boot/dts/marvell/cn9131-db-B.dts new file +22 -0
new file mode 100644
index 000000000000..94e01192aed1
@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (C) 2020 Marvell International Ltd.
+ *
+ * Device tree for the CN9131-DB board (setup "B").
+ */
+
+#include "cn9131-db-A.dts"
+
+/ {
+	model = "Marvell Armada CN9131-DB setup B";
+};
+
+/* Setup B has NAND flash as a boot device, while regular setup uses SPI flash.
+ * Since CP0 SPI1 and CP0 NAND are sharing some pins, they cannot be activated
+ * simultaneously. When NAND controller is enabled, SPI1 should be disabled.
+ */
+
+&cp0_nand_controller {
+	status = "okay";
+};
+
arch/arm64/boot/dts/marvell/cn9131-db.dtsi renamed from arch/arm64/boot/dts/marvell/cn9131-db.dts +2 -3
similarity index 97%
rename from arch/arm64/boot/dts/marvell/cn9131-db.dts
rename to arch/arm64/boot/dts/marvell/cn9131-db.dtsi
index 3c975f98b2a3..82471a83ad6d 100644
@@ -1,14 +1,13 @@
 // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- * Copyright (C) 2019 Marvell International Ltd.
+ * Copyright (C) 2020 Marvell International Ltd.
  *
  * Device tree for the CN9131-DB board.
  */
 
-#include "cn9130-db.dts"
+#include "cn9130-db.dtsi"
 
 / {
-	model = "Marvell Armada CN9131-DB";
 	compatible = "marvell,cn9131", "marvell,cn9130",
 		     "marvell,armada-ap807-quad", "marvell,armada-ap807";
 
arch/arm64/boot/dts/marvell/cn9132-db-A.dts new file +22 -0
new file mode 100644
index 000000000000..1f2e6377afc3
@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (C) 2019 Marvell International Ltd.
+ *
+ * Device tree for the CN9132-DB board.
+ */
+
+#include "cn9132-db.dtsi"
+
+/ {
+	model = "Marvell Armada CN9132-DB setup A";
+};
+
+/* Setup A has SPI1 flash as a boot device, while setup B uses NAND flash.
+ * Since CP0 SPI1 and CP0 NAND are sharing some pins, they cannot be activated
+ * simultaneously. When SPI controller is enabled, NAND should be disabled.
+ */
+
+&cp0_spi1 {
+	status = "okay";
+};
+
arch/arm64/boot/dts/marvell/cn9132-db-B.dts new file +22 -0
new file mode 100644
index 000000000000..7137a6f22d0f
@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (C) 2019 Marvell International Ltd.
+ *
+ * Device tree for the CN9132-DB board.
+ */
+
+#include "cn9132-db.dtsi"
+
+/ {
+	model = "Marvell Armada CN9132-DB setup B";
+};
+
+/* Setup B has NAND flash as a boot device, while regular setup uses SPI flash.
+ * Since CP0 SPI1 and CP0 NAND are sharing some pins, they cannot be activated
+ * simultaneously. When NAND controller is enabled, SPI1 should be disabled.
+ */
+
+&cp0_nand_controller {
+	status = "okay";
+};
+
arch/arm64/boot/dts/marvell/cn9132-db.dtsi renamed from arch/arm64/boot/dts/marvell/cn9132-db.dts +2 -3
similarity index 97%
rename from arch/arm64/boot/dts/marvell/cn9132-db.dts
rename to arch/arm64/boot/dts/marvell/cn9132-db.dtsi
index 4ef0df3097ca..0c2d9f57318b 100644
@@ -1,14 +1,13 @@
 // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 /*
- * Copyright (C) 2019 Marvell International Ltd.
+ * Copyright (C) 2020 Marvell International Ltd.
  *
  * Device tree for the CN9132-DB board.
  */
 
-#include "cn9131-db.dts"
+#include "cn9131-db.dtsi"
 
 / {
-	model = "Marvell Armada CN9132-DB";
 	compatible = "marvell,cn9132", "marvell,cn9131", "marvell,cn9130",
 		     "marvell,armada-ap807-quad", "marvell,armada-ap807";
 
Signature · 7 lines
2.17.1


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
maintainer
#5 lore raw

Re: [PATCH v2 3/4] arm64: dts: cn913x: add device trees for topology B boards

Quoted 7 lines
arch/arm64/boot/dts/marvell/Makefile +0 -0
index 3e5f2e7a040c..d9b924a63d89 100644
@@ -13,6 +13,9 @@ dtb-$(CONFIG_ARCH_MVEBU) += armada-8040-db.dtb
 dtb-$(CONFIG_ARCH_MVEBU) += armada-8040-mcbin.dtb
 dtb-$(CONFIG_ARCH_MVEBU) += armada-8040-mcbin-singleshot.dtb

arch/arm64/boot/dts/marvell/Makefile dtb-$(CONFIG_ARCH_MVEBU) += armada-8040-db.dtb · line 21

Quoted 10 lines
arch/arm64/boot/dts/marvell/Makefile +6 -3
 dtb-$(CONFIG_ARCH_MVEBU) += armada-8080-db.dtb
-dtb-$(CONFIG_ARCH_MVEBU) += cn9130-db.dtb
-dtb-$(CONFIG_ARCH_MVEBU) += cn9131-db.dtb
-dtb-$(CONFIG_ARCH_MVEBU) += cn9132-db.dtb
+dtb-$(CONFIG_ARCH_MVEBU) += cn9130-db-A.dtb
+dtb-$(CONFIG_ARCH_MVEBU) += cn9130-db-B.dtb
+dtb-$(CONFIG_ARCH_MVEBU) += cn9131-db-A.dtb
+dtb-$(CONFIG_ARCH_MVEBU) += cn9131-db-B.dtb
+dtb-$(CONFIG_ARCH_MVEBU) += cn9132-db-A.dtb
+dtb-$(CONFIG_ARCH_MVEBU) += cn9132-db-B.dtb

Are the filenames consider ABI? I wonder if cn9130-db A should continue to be called cn9130-db.dtb? Are bootloaders and image installers going to break because the filename changed?

The rest of the changes look fine.

Andrew

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

#6 lore raw

RE: [EXT] Re: [PATCH v2 3/4] arm64: dts: cn913x: add device trees for topology B boards

Hello, Andrew,
Thank you for review!

Quoted 22 lines

-----Original Message-----
From: Andrew Lunn <[email protected]>
Sent: Thursday, December 17, 2020 17:41
To: Kostya Porotchkin <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; Nadav Haklai <[email protected]>; [email protected]; Stefan Chulski <[email protected]>; [email protected]; Ben Peled <[email protected]>; [email protected]
Subject: [EXT] Re: [PATCH v2 3/4] arm64: dts: cn913x: add device trees for topology B boards

External Email

----------------------------------------------------------------------

arch/arm64/boot/dts/marvell/Makefile dtb-$(CONFIG_ARCH_MVEBU) += armada-8040-

Quoted 6 lines
arch/arm64/boot/dts/marvell/Makefile +0 -0
index 3e5f2e7a040c..d9b924a63d89 100644
@@ -13,6 +13,9 @@ dtb-$(CONFIG_ARCH_MVEBU) += armada-8040-

db.dtb

Quoted 16 lines

arch/arm64/boot/dts/marvell/Makefile dtb-$(CONFIG_ARCH_MVEBU) += armada-8040-db.dtb · line 21

Quoted 12 lines
arch/arm64/boot/dts/marvell/Makefile +6 -3
 dtb-$(CONFIG_ARCH_MVEBU) += armada-8040-mcbin.dtb
 dtb-$(CONFIG_ARCH_MVEBU) += armada-8040-mcbin-singleshot.dtb
 dtb-$(CONFIG_ARCH_MVEBU) += armada-8080-db.dtb
-dtb-$(CONFIG_ARCH_MVEBU) += cn9130-db.dtb
-dtb-$(CONFIG_ARCH_MVEBU) += cn9131-db.dtb
-dtb-$(CONFIG_ARCH_MVEBU) += cn9132-db.dtb
+dtb-$(CONFIG_ARCH_MVEBU) += cn9130-db-A.dtb
+dtb-$(CONFIG_ARCH_MVEBU) += cn9130-db-B.dtb
+dtb-$(CONFIG_ARCH_MVEBU) += cn9131-db-A.dtb
+dtb-$(CONFIG_ARCH_MVEBU) += cn9131-db-B.dtb
+dtb-$(CONFIG_ARCH_MVEBU) += cn9132-db-A.dtb
+dtb-$(CONFIG_ARCH_MVEBU) += cn9132-db-B.dtb

Are the filenames consider ABI? I wonder if cn9130-db A should continue to be called cn9130-db.dtb? Are bootloaders and image installers going to break because the filename changed?

[KP] I wanted to
1) make the DTS naming match the current SDK code
2) avoid similarity between DTS and DTSI names
I do not expect wide usage of DB platforms at this time, I expect the CRB to be more popular due to its size and price. Do you think it may cause a problem?

Kosta

Quoted 4 lines

The rest of the changes look fine.

Andrew

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

#8 lore raw

RE: [EXT] Re: [PATCH v2 3/4] arm64: dts: cn913x: add device trees for topology B boards

Quoted 14 lines

-----Original Message-----
From: Andrew Lunn <[email protected]>
Sent: Sunday, December 20, 2020 18:35
To: Kostya Porotchkin <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; Nadav Haklai <[email protected]>; [email protected]; Stefan Chulski <[email protected]>; [email protected]; Ben Peled <[email protected]>; [email protected]
Subject: Re: [EXT] Re: [PATCH v2 3/4] arm64: dts: cn913x: add device trees for topology B boards

Quoted 3 lines
Quoted 1 line

1) make the DTS naming match the current SDK code

Where do i found the SDK?

[KP] Unfortunately the last Github published release is 2 years old.
The new SDK is available only after registration (and accepting the NDA terms) on marvell.com site. Kosta

Quoted 2 lines

Andrew

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

maintainer
#9 lore raw

Re: [EXT] Re: [PATCH v2 3/4] arm64: dts: cn913x: add device trees for topology B boards

Quoted 14 lines · Kostya Porotchkin
Quoted 14 lines

-----Original Message-----
From: Andrew Lunn <[email protected]>
Sent: Sunday, December 20, 2020 18:35
To: Kostya Porotchkin <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; Nadav Haklai <[email protected]>; [email protected]; Stefan Chulski <[email protected]>; [email protected]; Ben Peled <[email protected]>; [email protected]
Subject: Re: [EXT] Re: [PATCH v2 3/4] arm64: dts: cn913x: add device trees for topology B boards

Quoted 5 lines
Quoted 3 lines
Quoted 1 line

1) make the DTS naming match the current SDK code

Where do i found the SDK?

[KP] Unfortunately the last Github published release is 2 years old.
The new SDK is available only after registration (and accepting the NDA terms) on marvell.com site.

Which leads to the question, why should the mainline kernel be changed to be compatible with a closed source SDK?

What mainline should not do is break compatibility with mainline. Which is why i think the existing DTB file needs to keep its name, and B gets a new file name.

Andrew

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

#10 lore raw

RE: [EXT] Re: [PATCH v2 3/4] arm64: dts: cn913x: add device trees for topology B boards

Quoted 35 lines

-----Original Message-----
From: linux-arm-kernel <[email protected]> On Behalf Of Andrew Lunn
Sent: Monday, December 21, 2020 15:58
To: Kostya Porotchkin <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; Nadav Haklai <[email protected]>; [email protected]; Stefan Chulski <[email protected]>; [email protected]; Ben Peled <[email protected]>; [email protected]; [email protected]
Subject: Re: [EXT] Re: [PATCH v2 3/4] arm64: dts: cn913x: add device trees for topology B boards

Quoted 14 lines · Kostya Porotchkin
Quoted 14 lines

-----Original Message-----
From: Andrew Lunn <[email protected]>
Sent: Sunday, December 20, 2020 18:35
To: Kostya Porotchkin <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; Nadav Haklai <[email protected]>; [email protected]; Stefan Chulski <[email protected]>; [email protected]; Ben Peled <[email protected]>; [email protected]
Subject: Re: [EXT] Re: [PATCH v2 3/4] arm64: dts: cn913x: add device trees for topology B boards

Quoted 5 lines
Quoted 3 lines
Quoted 1 line

1) make the DTS naming match the current SDK code

Where do i found the SDK?

[KP] Unfortunately the last Github published release is 2 years old. The new SDK is available only after registration (and accepting the NDA

Quoted 8 lines

terms) on marvell.com site.

Which leads to the question, why should the mainline kernel be changed to be compatible with a closed source SDK?

What mainline should not do is break compatibility with mainline. Which is why i think the existing DTB file needs to keep its name, and B gets a new file name.

[KP] OK, I am issuing v3 with the required fix
Kosta

Quoted 12 lines

Andrew

_______________________________________________
linux-arm-kernel mailing list [email protected]
https://urldefense.proofpoint.com/v2/url?u=http-
3A__lists.infradead.org_mailman_listinfo_linux-2Darm- 2Dkernel&d=DwICAg&c=nKjWec2b6R0mOyPaz7xtfQ&r=- N9sN4p5NSr0JGQoQ_2UCOgAqajG99W1EbSOww0WU8o&m=BL9A0Gh- Ms3OYS-W9ZPlfwCDLSqls8VBMlXnWVVyt_A&s=f0fzA_9FLRapsAeWB5- afYMajDMq_tDuXtvXSVWgr-U&e=

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

#11 lore raw

PATCH v2 4/4 arm64: dts: add support for Marvell cn9130-crb platform

In reply to [email protected]

From: Konstantin Porotchkin <[email protected]>

The Marvell reference platform CN9130-CRB is a small form factor board in a metal case. The platform is based on CN9130 SoC with addition of 8 Gigabit ports SOHO Ethernet switch.
The reference platform features the following:
* Up to 4 CPU cores ARMv8 Cortex-A72 CPU
* CPU core operating speed of up to 2.2GHz
* DDR4 DIMM – 8GB 64bit+ECC @ 2400Mhz.
* 1x eMMC 8GB device
* 1x uSD card 4 bits port on CP
* 1x 128MB SPI NOR flash memory
* 1x USB 3.0 Host port (Type A)
* 1x SATA Gen3 via M.2
* 1x USB 3.0 via M.2
* 1x SIM card slot
* 1x 1G Ethernet port via RGMII
* 1x 10G switch port over SFP+ connector
* 8x 1G ports through 88E6393X switch via XFI
* 1x 2.5G/1G/100M/10M port via HS_SGMII
* 1x PCI Express (PCIe)x1 Gen 3.0
* 1x PCI Express (PCIe)x4 Gen 3.0 via NVMe M.2
* JTAG port

The plaform supports two HW configurations - "A" and "B" CN9130-CRB-A
* AP-MPP configuration: SDIO, UART
* CP0 Serdes configuration:
* Lane0-3: NVMe (PCIe x4)
* Lane4: XFI
* Lane5: HS_SGMII

2. CN9130-CRB-B
* AP-MPP configuration: SDIO, UART
* CP0-MPP configuration: RGMII, SDIO, I2C0, I2C1, SMI, XSMI
* CP0 Serdes configuration:
* Lane0: PCIe x1
* Lane1: USB3_0 x1
* Lane2: SATA x1
* Lane3: USB3_1 x1
* Lane4: XFI
* Lane5: HS_SGMII

---
 arch/arm64/boot/dts/marvell/Makefile         |   2 +
 arch/arm64/boot/dts/marvell/cn9130-crb-A.dts |  38 ++++
 arch/arm64/boot/dts/marvell/cn9130-crb-B.dts |  46 ++++
 arch/arm64/boot/dts/marvell/cn9130-crb.dtsi  | 222 ++++++++++++++++++++
 4 files changed, 308 insertions(+)
 create mode 100644 arch/arm64/boot/dts/marvell/cn9130-crb-A.dts
 create mode 100644 arch/arm64/boot/dts/marvell/cn9130-crb-B.dts
 create mode 100644 arch/arm64/boot/dts/marvell/cn9130-crb.dtsi
arch/arm64/boot/dts/marvell/Makefile +2 -0
index d9b924a63d89..04161e27272a 100644
@@ -19,3 +19,5 @@ dtb-$(CONFIG_ARCH_MVEBU) += cn9131-db-A.dtb
 dtb-$(CONFIG_ARCH_MVEBU) += cn9131-db-B.dtb
 dtb-$(CONFIG_ARCH_MVEBU) += cn9132-db-A.dtb
 dtb-$(CONFIG_ARCH_MVEBU) += cn9132-db-B.dtb
+dtb-$(CONFIG_ARCH_MVEBU) += cn9130-crb-A.dtb
+dtb-$(CONFIG_ARCH_MVEBU) += cn9130-crb-B.dtb
arch/arm64/boot/dts/marvell/cn9130-crb-A.dts new file +38 -0
new file mode 100644
index 000000000000..a7b6dfba8af5
@@ -0,0 +1,38 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2020 Marvell International Ltd.
+ */
+
+#include "cn9130-crb.dtsi"
+
+/ {
+	model = "Marvell Armada CN9130-CRB-A";
+};
+
+&cp0_pcie0 {
+	status = "okay";
+	num-lanes = <4>;
+	num-viewport = <8>;
+	/* Generic PHY, providing serdes lanes */
+	phys = <&cp0_comphy0 0
+		&cp0_comphy1 0
+		&cp0_comphy2 0
+		&cp0_comphy3 0>;
+	iommu-map =
+		<0x0   &smmu 0x480 0x20>,
+		<0x100 &smmu 0x4a0 0x20>,
+		<0x200 &smmu 0x4c0 0x20>;
+	iommu-map-mask = <0x031f>;
+};
+
+&cp0_usb3_0 {
+	status = "okay";
+	usb-phy = <&cp0_usb3_0_phy0>;
+	phy-names = "usb";
+};
+
+&cp0_usb3_1 {
+	status = "okay";
+	usb-phy = <&cp0_usb3_0_phy1>;
+	phy-names = "usb";
+};
arch/arm64/boot/dts/marvell/cn9130-crb-B.dts new file +46 -0

46 lines not on this page · raw message

arch/arm64/boot/dts/marvell/cn9130-crb.dtsi new file +222 -0

222 lines not on this page · raw message

Signature · 7 lines
2.17.1


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
maintainer Reviewed-by on v2 4/4
#12 lore raw

Re: [PATCH v2 4/4] arm64: dts: add support for Marvell cn9130-crb platform

Quoted 43 lines · On Thu, Dec 17, 2020 at 09:55:42AM +0200, [email protected] wrote:

From: Konstantin Porotchkin <[email protected]>

The Marvell reference platform CN9130-CRB is a small form factor board in a metal case. The platform is based on CN9130 SoC with addition of 8 Gigabit ports SOHO Ethernet switch.
The reference platform features the following:
* Up to 4 CPU cores ARMv8 Cortex-A72 CPU
* CPU core operating speed of up to 2.2GHz
* DDR4 DIMM – 8GB 64bit+ECC @ 2400Mhz.
* 1x eMMC 8GB device
* 1x uSD card 4 bits port on CP
* 1x 128MB SPI NOR flash memory
* 1x USB 3.0 Host port (Type A)
* 1x SATA Gen3 via M.2
* 1x USB 3.0 via M.2
* 1x SIM card slot
* 1x 1G Ethernet port via RGMII
* 1x 10G switch port over SFP+ connector
* 8x 1G ports through 88E6393X switch via XFI
* 1x 2.5G/1G/100M/10M port via HS_SGMII
* 1x PCI Express (PCIe)x1 Gen 3.0
* 1x PCI Express (PCIe)x4 Gen 3.0 via NVMe M.2
* JTAG port

The plaform supports two HW configurations - "A" and "B" CN9130-CRB-A
* AP-MPP configuration: SDIO, UART
* CP0 Serdes configuration:
* Lane0-3: NVMe (PCIe x4)
* Lane4: XFI
* Lane5: HS_SGMII

2. CN9130-CRB-B
* AP-MPP configuration: SDIO, UART
* CP0-MPP configuration: RGMII, SDIO, I2C0, I2C1, SMI, XSMI
* CP0 Serdes configuration:
* Lane0: PCIe x1
* Lane1: USB3_0 x1
* Lane2: SATA x1
* Lane3: USB3_1 x1
* Lane4: XFI
* Lane5: HS_SGMII

Quoted 1 line

Andrew

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel