DTS updates for Marvell Armada CN913x platforms
Subsystems (3)
v3 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
v3:
- do not rename setup A DTS firls for DB variants
- fix a couple of wrong include names
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 | 5 + 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-B.dts | 22 + arch/arm64/boot/dts/marvell/cn9130-db.dts | 393 +---------------- arch/arm64/boot/dts/marvell/cn9130-db.dtsi | 402 ++++++++++++++++++ arch/arm64/boot/dts/marvell/cn9131-db-B.dts | 22 + arch/arm64/boot/dts/marvell/cn9131-db.dts | 192 +-------- arch/arm64/boot/dts/marvell/cn9131-db.dtsi | 201 +++++++++ arch/arm64/boot/dts/marvell/cn9132-db-B.dts | 22 + arch/arm64/boot/dts/marvell/cn9132-db.dts | 211 +-------- arch/arm64/boot/dts/marvell/cn9132-db.dtsi | 220 ++++++++++ 14 files changed, 1224 insertions(+), 784 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-B.dts create mode 100644 arch/arm64/boot/dts/marvell/cn9130-db.dtsi create mode 100644 arch/arm64/boot/dts/marvell/cn9131-db-B.dts create mode 100644 arch/arm64/boot/dts/marvell/cn9131-db.dtsi create mode 100644 arch/arm64/boot/dts/marvell/cn9132-db-B.dts create mode 100644 arch/arm64/boot/dts/marvell/cn9132-db.dtsi
Signature · 7 lines
2.17.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v3 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
@@ -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
PATCH v3 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
@@ -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
PATCH v3 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 | 3 + arch/arm64/boot/dts/marvell/cn9130-db-B.dts | 22 ++ arch/arm64/boot/dts/marvell/cn9130-db.dts | 393 +------------------ arch/arm64/boot/dts/marvell/cn9130-db.dtsi | 402 ++++++++++++++++++++ arch/arm64/boot/dts/marvell/cn9131-db-B.dts | 22 ++ arch/arm64/boot/dts/marvell/cn9131-db.dts | 192 +--------- arch/arm64/boot/dts/marvell/cn9131-db.dtsi | 201 ++++++++++ arch/arm64/boot/dts/marvell/cn9132-db-B.dts | 22 ++ arch/arm64/boot/dts/marvell/cn9132-db.dts | 211 +--------- arch/arm64/boot/dts/marvell/cn9132-db.dtsi | 220 +++++++++++ 10 files changed, 910 insertions(+), 778 deletions(-) create mode 100644 arch/arm64/boot/dts/marvell/cn9130-db-B.dts create mode 100644 arch/arm64/boot/dts/marvell/cn9130-db.dtsi create mode 100644 arch/arm64/boot/dts/marvell/cn9131-db-B.dts create mode 100644 arch/arm64/boot/dts/marvell/cn9131-db.dtsi create mode 100644 arch/arm64/boot/dts/marvell/cn9132-db-B.dts create mode 100644 arch/arm64/boot/dts/marvell/cn9132-db.dtsi
arch/arm64/boot/dts/marvell/Makefile +3 -0
@@ -16,5 +16,8 @@ dtb-$(CONFIG_ARCH_MVEBU) += armada-8040-mcbin-singleshot.dtb dtb-$(CONFIG_ARCH_MVEBU) += armada-8040-puzzle-m801.dtb dtb-$(CONFIG_ARCH_MVEBU) += armada-8080-db.dtb dtb-$(CONFIG_ARCH_MVEBU) += cn9130-db.dtb +dtb-$(CONFIG_ARCH_MVEBU) += cn9130-db-B.dtb dtb-$(CONFIG_ARCH_MVEBU) += cn9131-db.dtb +dtb-$(CONFIG_ARCH_MVEBU) += cn9131-db-B.dtb dtb-$(CONFIG_ARCH_MVEBU) += cn9132-db.dtb +dtb-$(CONFIG_ARCH_MVEBU) += cn9132-db-B.dtb
arch/arm64/boot/dts/marvell/cn9130-db-B.dts new file +22 -0
@@ -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.dts +6 -387
405 lines not on this page · raw message
arch/arm64/boot/dts/marvell/cn9130-db.dtsi new file +402 -0
402 lines not on this page · raw message
arch/arm64/boot/dts/marvell/cn9131-db-B.dts new file +22 -0
@@ -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.dtsi" + +/ { + 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.dts +6 -186
204 lines not on this page · raw message
arch/arm64/boot/dts/marvell/cn9131-db.dtsi new file +201 -0
201 lines not on this page · raw message
arch/arm64/boot/dts/marvell/cn9132-db-B.dts new file +22 -0
@@ -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.dts +6 -205
223 lines not on this page · raw message
arch/arm64/boot/dts/marvell/cn9132-db.dtsi new file +220 -0
220 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
Andrew Lunn
maintainerRe: [PATCH v3 3/4] arm64: dts: cn913x: add device trees for topology B boards
arch/arm64/boot/dts/marvell/cn9130-db.dts line 104
Quoted 13 lines
arch/arm64/boot/dts/marvell/cn9130-db.dts +0
-13- cp0_sfp_eth0: sfp-eth@0 { - compatible = "sff,sfp"; - i2c-bus = <&cp0_sfpp0_i2c>; - los-gpio = <&cp0_module_expander1 11 GPIO_ACTIVE_HIGH>; - mod-def0-gpio = <&cp0_module_expander1 10 GPIO_ACTIVE_LOW>; - tx-disable-gpio = <&cp0_module_expander1 9 GPIO_ACTIVE_HIGH>; - tx-fault-gpio = <&cp0_module_expander1 8 GPIO_ACTIVE_HIGH>; - /* - * SFP cages are unconnected on early PCBs because of an the I2C - * lanes not being connected. Prevent the port for being - * unusable by disabling the SFP node. - */ - status = "disabled";
Does the B also have the broken SFP cage?
Is there a newer revision which fixes the PCB?
Andrew
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
RE: [EXT] Re: [PATCH v3 3/4] arm64: dts: cn913x: add device trees for topology B boards
Quoted 17 lines
External Email
----------------------------------------------------------------------
arch/arm64/boot/dts/marvell/cn9130-db.dts
Quoted 4 lines
arch/arm64/boot/dts/marvell/cn9130-db.dts +0
-4- cp0_sfp_eth0: sfp-eth@0 { - compatible = "sff,sfp"; - i2c-bus = <&cp0_sfpp0_i2c>; - los-gpio = <&cp0_module_expander1 11
GPIO_ACTIVE_HIGH>;Review
Quoted 1 line
(quoted diff) +0
-1- mod-def0-gpio = <&cp0_module_expander1 10
GPIO_ACTIVE_LOW>;Review
Quoted 1 line
(quoted diff) +0
-1- tx-disable-gpio = <&cp0_module_expander1 9
GPIO_ACTIVE_HIGH>;Review
Quoted 1 line
(quoted diff) +0
-1- tx-fault-gpio = <&cp0_module_expander1 8
GPIO_ACTIVE_HIGH>;Review
Quoted 2 lines
(quoted diff) +0
-2- /* - * SFP cages are unconnected on early PCBs because of anthe I2C
Quoted 6 lines
arch/arm64/boot/dts/marvell/cn9130-db.dts line 104
Quoted 4 lines
arch/arm64/boot/dts/marvell/cn9130-db.dts +0
-4- * lanes not being connected. Prevent the port for being - * unusable by disabling the SFP node. - */ - status = "disabled";Does the B also have the broken SFP cage?
A and B topologies use same board. So B also has broken SFP cage.
Quoted 1 line
Is there a newer revision which fixes the PCB?
We don't have newer revision for DB boards.
Regards.
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [EXT] Re: [PATCH v3 3/4] arm64: dts: cn913x: add device trees for topology B boards
pon., 21 gru 2020 o 18:42 Stefan Chulski <[email protected]> napisał(a):
Quoted 23 lines
Quoted 23 lines
External Email
----------------------------------------------------------------------
arch/arm64/boot/dts/marvell/cn9130-db.dts
Quoted 4 lines
arch/arm64/boot/dts/marvell/cn9130-db.dts +0
-4- cp0_sfp_eth0: sfp-eth@0 { - compatible = "sff,sfp"; - i2c-bus = <&cp0_sfpp0_i2c>; - los-gpio = <&cp0_module_expander1 11
GPIO_ACTIVE_HIGH>;Quoted 1 line
- mod-def0-gpio = <
&cp0_module_expander110
GPIO_ACTIVE_LOW>;Quoted 1 line
- tx-disable-gpio = <
&cp0_module_expander19
GPIO_ACTIVE_HIGH>;Quoted 1 line
- tx-fault-gpio = <
&cp0_module_expander18
GPIO_ACTIVE_HIGH>;Review
Quoted 2 lines
(quoted diff) +0
-2- /* - * SFP cages are unconnected on early PCBs because of anthe I2C
Quoted 4 lines
arch/arm64/boot/dts/marvell/cn9130-db.dts +0
-4- * lanes not being connected. Prevent the port for being - * unusable by disabling the SFP node. - */ - status = "disabled";
Quoted 8 lines
Quoted 1 line
Does the B also have the broken SFP cage?
A and B topologies use same board. So B also has broken SFP cage.
Quoted 1 line
Is there a newer revision which fixes the PCB?
We don't have newer revision for DB boards.
Question - in such case can we use just 10G interfaces with the link-IRQ instead (now the ports are disabled)? This is what I did in edk2 dtb/ACPI and it works just fine for me.
Best regards,
Marcin
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
RE: [EXT] Re: [PATCH v3 3/4] arm64: dts: cn913x: add device trees for topology B boards
Quoted 28 lines
Quoted 28 lines
Quoted 18 lines
External Email
--------------------------------------------------------------------
--arch/arm64/boot/dts/marvell/cn9130-db.dts
Quoted 4 lines
arch/arm64/boot/dts/marvell/cn9130-db.dts +0
-4- cp0_sfp_eth0: sfp-eth@0 { - compatible = "sff,sfp"; - i2c-bus = <&cp0_sfpp0_i2c>; - los-gpio = <&cp0_module_expander1 11
GPIO_ACTIVE_HIGH>;Quoted 1 line
- mod-def0-gpio = <
&cp0_module_expander110
GPIO_ACTIVE_LOW>;Quoted 1 line
- tx-disable-gpio = <
&cp0_module_expander19
GPIO_ACTIVE_HIGH>;Quoted 1 line
- tx-fault-gpio = <
&cp0_module_expander18
GPIO_ACTIVE_HIGH>;Review
Quoted 2 lines
(quoted diff) +0
-2- /* - * SFP cages are unconnected on early PCBs because of anQuoted 7 lines
the I2C
arch/arm64/boot/dts/marvell/cn9130-db.dts line 104
Quoted 4 lines
arch/arm64/boot/dts/marvell/cn9130-db.dts +0
-4- * lanes not being connected. Prevent the port for being - * unusable by disabling the SFP node. - */ - status = "disabled";Does the B also have the broken SFP cage?
A and B topologies use same board. So B also has broken SFP cage.
Quoted 8 lines
Quoted 4 lines
Quoted 1 line
Is there a newer revision which fixes the PCB?
We don't have newer revision for DB boards.
Question - in such case can we use just 10G interfaces with the link-IRQ instead (now the ports are disabled)? This is what I did in edk2 dtb/ACPI and it works just fine for me.
Yes, we can use link-IRQ.
I would test 10G on DB board with latest mainline code and if it work properly we can enable port in device-tree.
Regatgds.
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v3 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
@@ -21,3 +21,5 @@ dtb-$(CONFIG_ARCH_MVEBU) += cn9131-db.dtb dtb-$(CONFIG_ARCH_MVEBU) += cn9131-db-B.dtb dtb-$(CONFIG_ARCH_MVEBU) += cn9132-db.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
@@ -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