Skip to content

Commit d5f4e01

Browse files
arndbarndb
committed
Merge tag 'mvebu-dt64-6.20-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu into soc/dt
mvebu dt64 for 6.20 (part 1) Add support for Armada 7020 Express Type 7 CPU module board by Marvell, including: - COM Express CPU module and carrier board (Marvell DB-98CX85x0) - DDR4 memory, 1Gbit OOB Ethernet, 10G KR Ethernet, NAND/SPI flash, PCIe, SATA, USB, and UART interfaces Add SoC-specific compatibles for SafeXcel crypto engine on Armada 37xx and CP11x Fix regulator type from "regulator-gpio" to "regulator-fixed" where no GPIO control is present Add missing GPIO properties for "nxp,pca9536" on cn9131-cf-solidwan Fix and clean up pinctrl-names properties and typos Add missing "#phy-cells" to "usb-nop-xceiv" nodes MAINTAINERS: Add Falcon DB to the list of maintained Marvell Armada dts files * tag 'mvebu-dt64-6.20-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu: MAINTAINERS: Add Falcon DB arm64: dts: a7k: add COM Express boards arm64: dts: marvell: Add SoC specific compatibles to SafeXcel crypto arm64: dts: marvell: change regulator-gpio to regulator-fixed arm64: dts: marvell: cn9131-cf-solidwan: Add missing GPIO properties on "nxp,pca9536" arm64: dts: marvell: Fix stray and typo "pinctrl-names" properties arm64: dts: marvell: Add missing "#phy-cells" to "usb-nop-xceiv" Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 17102e7 + fcaf733 commit d5f4e01

20 files changed

Lines changed: 243 additions & 18 deletions

‎MAINTAINERS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2943,6 +2943,7 @@ S: Maintained
29432943
T: git git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git
29442944
F: Documentation/devicetree/bindings/arm/marvell/
29452945
F: arch/arm/boot/dts/marvell/armada*
2946+
F: arch/arm/boot/dts/marvell/db-falcon*
29462947
F: arch/arm/boot/dts/marvell/kirkwood*
29472948
F: arch/arm/configs/mvebu_*_defconfig
29482949
F: arch/arm/mach-mvebu/

‎arch/arm64/boot/dts/marvell/Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ dtb-$(CONFIG_ARCH_MVEBU) += armada-3720-espressobin-v7-emmc.dtb
1111
dtb-$(CONFIG_ARCH_MVEBU) += armada-3720-gl-mv1000.dtb
1212
dtb-$(CONFIG_ARCH_MVEBU) += armada-3720-turris-mox.dtb
1313
dtb-$(CONFIG_ARCH_MVEBU) += armada-3720-uDPU.dtb
14+
dtb-$(CONFIG_ARCH_MVEBU) += db-falcon-carrier-a7k.dtb
1415
dtb-$(CONFIG_ARCH_MVEBU) += armada-7040-db.dtb
1516
dtb-$(CONFIG_ARCH_MVEBU) += armada-7040-mochabin.dtb
1617
dtb-$(CONFIG_ARCH_MVEBU) += armada-8040-clearfog-gt-8k.dtb

‎arch/arm64/boot/dts/marvell/armada-3720-db.dts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141

4242
usb3_phy: usb3-phy {
4343
compatible = "usb-nop-xceiv";
44+
#phy-cells = <0>;
4445
vcc-supply = <&exp_usb3_vbus>;
4546
};
4647

‎arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@
3737

3838
usb3_phy: usb3-phy {
3939
compatible = "usb-nop-xceiv";
40+
#phy-cells = <0>;
4041
vcc-supply = <&reg_usb3_vbus>;
4142
};
4243

4344
gpio-leds {
44-
pinctrl-names = "default";
4545
compatible = "gpio-leds";
4646
/* No assigned functions to the LEDs by default */
4747
led1 {

‎arch/arm64/boot/dts/marvell/armada-3720-gl-mv1000.dts‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,11 @@
2626
};
2727

2828
vcc_sd_reg1: regulator {
29-
compatible = "regulator-gpio";
29+
compatible = "regulator-fixed";
3030
regulator-name = "vcc_sd1";
31-
regulator-min-microvolt = <1800000>;
31+
regulator-min-microvolt = <3300000>;
3232
regulator-max-microvolt = <3300000>;
3333
regulator-boot-on;
34-
35-
gpios-states = <0>;
36-
states = <1800000 0x1
37-
3300000 0x0>;
38-
enable-active-high;
3934
};
4035

4136
keys {

‎arch/arm64/boot/dts/marvell/armada-37xx.dtsi‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,8 @@
427427
};
428428

429429
crypto: crypto@90000 {
430-
compatible = "inside-secure,safexcel-eip97ies";
430+
compatible = "marvell,armada-3700-crypto",
431+
"inside-secure,safexcel-eip97ies";
431432
reg = <0x90000 0x20000>;
432433
interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>,
433434
<GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>,

‎arch/arm64/boot/dts/marvell/armada-7020-comexpress.dtsi‎

Lines changed: 161 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,161 @@
1+
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
2+
/*
3+
* Copyright (C) 2023 Marvell Technology Group Ltd.
4+
*
5+
* Device Tree file for Marvell Armada 7020 Com Express CPU module board.
6+
*/
7+
8+
#include "armada-7020.dtsi"
9+
10+
/ {
11+
model = "Marvell Armada-7020 COMEXPRESS board setup";
12+
compatible = "marvell,armada7020-cpu-module", "marvell,armada7020",
13+
"marvell,armada-ap806-dual", "marvell,armada-ap806";
14+
15+
memory@0 {
16+
device_type = "memory";
17+
reg = <0x0 0x0 0x2 0x00000000>;
18+
};
19+
20+
chosen {
21+
stdout-path = "serial0:115200n8";
22+
};
23+
24+
aliases {
25+
ethernet0 = &cp0_eth0;
26+
ethernet1 = &cp0_eth1;
27+
};
28+
};
29+
30+
&ap_clk {
31+
status = "okay";
32+
};
33+
34+
&gic {
35+
status = "okay";
36+
};
37+
38+
&i2c0 {
39+
status = "okay";
40+
clock-frequency = <100000>;
41+
};
42+
43+
&spi0 {
44+
status = "okay";
45+
};
46+
47+
&uart0 {
48+
status = "okay";
49+
};
50+
51+
&cp0_mdio {
52+
status = "okay";
53+
54+
phy0: ethernet-phy@10 {
55+
reg = <0x10>;
56+
};
57+
};
58+
59+
&cp0_ethernet {
60+
status = "okay";
61+
};
62+
63+
&cp0_eth0 {
64+
status = "okay";
65+
phy-mode = "10gbase-r";
66+
managed = "in-band-status";
67+
/* Generic PHY, providing serdes lanes */
68+
phys = <&cp0_comphy4 0>;
69+
};
70+
71+
&cp0_eth1 {
72+
status = "okay";
73+
phy = <&phy0>;
74+
phy-mode = "rgmii-id";
75+
};
76+
77+
&cp0_usb3_0 {
78+
status = "okay";
79+
};
80+
81+
&cp0_usb3_1 {
82+
status = "okay";
83+
};
84+
85+
&cp0_clk {
86+
status = "okay";
87+
};
88+
89+
&cp0_i2c0 {
90+
status = "okay";
91+
clock-frequency = <100000>;
92+
};
93+
94+
&cp0_nand_controller {
95+
status = "okay";
96+
97+
nand@0 {
98+
reg = <0>;
99+
label = "main-storage";
100+
nand-rb = <0>;
101+
nand-ecc-mode = "hw";
102+
nand-on-flash-bbt;
103+
nand-ecc-strength = <8>;
104+
nand-ecc-step-size = <512>;
105+
106+
partitions {
107+
compatible = "fixed-partitions";
108+
#address-cells = <1>;
109+
#size-cells = <1>;
110+
111+
partition@0 {
112+
label = "U-Boot";
113+
reg = <0 0x400000>;
114+
};
115+
partition@200000 {
116+
label = "Linux";
117+
reg = <0x400000 0x100000>;
118+
};
119+
partition@1000000 {
120+
label = "Filesystem";
121+
reg = <0x500000 0x1e00000>;
122+
};
123+
};
124+
};
125+
};
126+
127+
&cp0_pcie0 {
128+
status = "okay";
129+
num-lanes = <4>;
130+
num-viewport = <8>;
131+
132+
ranges = <0x81000000 0x0 0xfa000000 0x0 0xfa000000 0x0 0x00010000
133+
0x82000000 0x0 0x00000000 0x0 0xc0000000 0x0 0x30000000>;
134+
135+
/* Generic PHY, providing serdes lanes */
136+
phys = <&cp0_comphy0 0
137+
&cp0_comphy1 0
138+
&cp0_comphy2 0
139+
&cp0_comphy3 0>;
140+
};
141+
142+
&cp0_sata0 {
143+
/* CPM Lane 0 - U29 */
144+
status = "okay";
145+
146+
sata-port@1 {
147+
status = "okay";
148+
/* Generic PHY, providing serdes lanes */
149+
phys = <&cp0_comphy5 1>;
150+
};
151+
};
152+
153+
&cp0_sdhci0 {
154+
pinctrl-names = "default";
155+
pinctrl-0 = <&sdhci_pins>;
156+
status = "okay";
157+
bus-width = <4>;
158+
no-1-8-v;
159+
broken-cd;
160+
};
161+

‎arch/arm64/boot/dts/marvell/armada-70x0.dtsi‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,13 @@
4747
cp0_pinctrl: pinctrl {
4848
compatible = "marvell,armada-7k-pinctrl";
4949

50+
51+
sdhci_pins: sdhci-pins {
52+
marvell,pins = "mpp56", "mpp57", "mpp58",
53+
"mpp59", "mpp60", "mpp61", "mpp62";
54+
marvell,function = "sdio";
55+
};
56+
5057
nand_pins: nand-pins {
5158
marvell,pins =
5259
"mpp15", "mpp16", "mpp17", "mpp18",

‎arch/arm64/boot/dts/marvell/armada-8040-db.dts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151

5252
cp0_usb3_0_phy: cp0-usb3-0-phy {
5353
compatible = "usb-nop-xceiv";
54+
#phy-cells = <0>;
5455
vcc-supply = <&cp0_reg_usb3_0_vbus>;
5556
};
5657

@@ -65,6 +66,7 @@
6566

6667
cp1_usb3_0_phy: cp1-usb3-0-phy {
6768
compatible = "usb-nop-xceiv";
69+
#phy-cells = <0>;
6870
vcc-supply = <&cp1_reg_usb3_0_vbus>;
6971
};
7072
};

‎arch/arm64/boot/dts/marvell/armada-ap806-dual.dtsi‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
};
5555

5656
thermal-zones {
57-
/delete-node/ ap-thermal-cpu2;
58-
/delete-node/ ap-thermal-cpu3;
57+
/delete-node/ ap-cpu2-thermal;
58+
/delete-node/ ap-cpu3-thermal;
5959
};
6060
};

0 commit comments

Comments
 (0)