Skip to content

Commit 462eeb9

Browse files
committed
Merge tag 'mvebu-dt64-6.11-1' of https://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu into soc/dt
mvebu dt64 for 6.11 (part 1) armada-3720: align GPIO keys and LED node namee with bindings Add description for solidrun cn9130 som and clearfog boards * tag 'mvebu-dt64-6.11-1' of https://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu: arm64: dts: add description for solidrun cn9132 cex7 module and clearfog board arm64: dts: add description for solidrun cn9131 solidwan board arm64: dts: add description for solidrun cn9130 som and clearfog boards dt-bindings: arm64: marvell: add solidrun cn9132 CEX-7 evaluation board dt-bindings: arm64: marvell: add solidrun cn9130 som based boards arm64: dts: armada-3720: align LED node name with bindings arm64: dts: armada-3720: align GPIO keys node name with bindings Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents f01b326 + e9ff907 commit 462eeb9

File tree

10 files changed

+2958
-4
lines changed

10 files changed

+2958
-4
lines changed

Documentation/devicetree/bindings/arm/marvell/armada-7k-8k.yaml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,4 +82,22 @@ properties:
8282
- const: marvell,armada-ap807-quad
8383
- const: marvell,armada-ap807
8484

85+
- description:
86+
SolidRun CN9130 SoM based single-board computers
87+
items:
88+
- enum:
89+
- solidrun,cn9130-clearfog-base
90+
- solidrun,cn9130-clearfog-pro
91+
- solidrun,cn9131-solidwan
92+
- const: solidrun,cn9130-sr-som
93+
- const: marvell,cn9130
94+
95+
- description:
96+
SolidRun CN9132 COM-Express Type 7 based single-board computers
97+
items:
98+
- enum:
99+
- solidrun,cn9132-clearfog
100+
- const: solidrun,cn9132-sr-cex7
101+
- const: marvell,cn9130
102+
85103
additionalProperties: true

arch/arm64/boot/dts/marvell/Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,7 @@ dtb-$(CONFIG_ARCH_MVEBU) += cn9130-crb-A.dtb
2828
dtb-$(CONFIG_ARCH_MVEBU) += cn9130-crb-B.dtb
2929
dtb-$(CONFIG_ARCH_MVEBU) += ac5x-rd-carrier-cn9131.dtb
3030
dtb-$(CONFIG_ARCH_MVEBU) += ac5-98dx35xx-rd.dtb
31+
dtb-$(CONFIG_ARCH_MVEBU) += cn9130-cf-base.dtb
32+
dtb-$(CONFIG_ARCH_MVEBU) += cn9130-cf-pro.dtb
33+
dtb-$(CONFIG_ARCH_MVEBU) += cn9131-cf-solidwan.dtb
34+
dtb-$(CONFIG_ARCH_MVEBU) += cn9132-clearfog.dtb

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
keys {
4242
compatible = "gpio-keys";
4343

44-
reset {
44+
button-reset {
4545
label = "reset";
4646
linux,code = <KEY_RESTART>;
4747
gpios = <&gpionb 14 GPIO_ACTIVE_LOW>;
@@ -57,17 +57,17 @@
5757
leds {
5858
compatible = "gpio-leds";
5959

60-
vpn {
60+
led-vpn {
6161
label = "green:vpn";
6262
gpios = <&gpionb 11 GPIO_ACTIVE_LOW>;
6363
};
6464

65-
wan {
65+
led-wan {
6666
label = "green:wan";
6767
gpios = <&gpionb 12 GPIO_ACTIVE_LOW>;
6868
};
6969

70-
led_power: power {
70+
led_power: led-power {
7171
label = "green:power";
7272
gpios = <&gpionb 13 GPIO_ACTIVE_LOW>;
7373
default-state = "on";
Lines changed: 178 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,178 @@
1+
// SPDX-License-Identifier: GPL-2.0+
2+
/*
3+
* Copyright (C) 2024 Josua Mayer <[email protected]>
4+
*
5+
* DTS for SolidRun CN9130 Clearfog Base.
6+
*
7+
*/
8+
9+
/dts-v1/;
10+
11+
#include <dt-bindings/input/input.h>
12+
#include <dt-bindings/leds/common.h>
13+
14+
#include "cn9130.dtsi"
15+
#include "cn9130-sr-som.dtsi"
16+
#include "cn9130-cf.dtsi"
17+
18+
/ {
19+
model = "SolidRun CN9130 Clearfog Base";
20+
compatible = "solidrun,cn9130-clearfog-base",
21+
"solidrun,cn9130-sr-som", "marvell,cn9130";
22+
23+
gpio-keys {
24+
compatible = "gpio-keys";
25+
pinctrl-0 = <&rear_button_pins>;
26+
pinctrl-names = "default";
27+
28+
button-0 {
29+
/* The rear SW3 button */
30+
label = "Rear Button";
31+
gpios = <&cp0_gpio1 31 GPIO_ACTIVE_LOW>;
32+
linux,can-disable;
33+
linux,code = <BTN_0>;
34+
};
35+
};
36+
37+
rfkill-m2-gnss {
38+
compatible = "rfkill-gpio";
39+
label = "m.2 GNSS";
40+
radio-type = "gps";
41+
/* rfkill-gpio inverts internally */
42+
shutdown-gpios = <&expander0 9 GPIO_ACTIVE_HIGH>;
43+
};
44+
45+
/* M.2 is B-keyed, so w-disable is for WWAN */
46+
rfkill-m2-wwan {
47+
compatible = "rfkill-gpio";
48+
label = "m.2 WWAN";
49+
radio-type = "wwan";
50+
/* rfkill-gpio inverts internally */
51+
shutdown-gpios = <&expander0 8 GPIO_ACTIVE_HIGH>;
52+
};
53+
};
54+
55+
/* SRDS #3 - SGMII 1GE */
56+
&cp0_eth1 {
57+
phy = <&phy1>;
58+
phys = <&cp0_comphy3 1>;
59+
phy-mode = "sgmii";
60+
status = "okay";
61+
};
62+
63+
&cp0_eth2_phy {
64+
/*
65+
* Configure LEDs default behaviour:
66+
* - LED[0]: link/activity: On/blink (green)
67+
* - LED[1]: link is 100/1000Mbps: On (yellow)
68+
* - LED[2]: high impedance (floating)
69+
*/
70+
marvell,reg-init = <3 16 0xf000 0x0a61>;
71+
72+
leds {
73+
#address-cells = <1>;
74+
#size-cells = <0>;
75+
76+
led@0 {
77+
reg = <0>;
78+
color = <LED_COLOR_ID_GREEN>;
79+
function = LED_FUNCTION_WAN;
80+
default-state = "keep";
81+
};
82+
83+
led@1 {
84+
reg = <1>;
85+
color = <LED_COLOR_ID_YELLOW>;
86+
function = LED_FUNCTION_WAN;
87+
default-state = "keep";
88+
};
89+
};
90+
};
91+
92+
&cp0_gpio1 {
93+
sim-select-hog {
94+
gpio-hog;
95+
gpios = <27 GPIO_ACTIVE_HIGH>;
96+
output-high;
97+
line-name = "sim-select";
98+
};
99+
};
100+
101+
&cp0_mdio {
102+
phy1: ethernet-phy@1 {
103+
reg = <1>;
104+
/*
105+
* Configure LEDs default behaviour:
106+
* - LED[0]: link/activity: On/blink (green)
107+
* - LED[1]: link is 100/1000Mbps: On (yellow)
108+
* - LED[2]: high impedance (floating)
109+
*
110+
* Configure LEDs electrical polarity
111+
* - on-state: low
112+
* - off-state: high (not hi-z, to avoid residual glow)
113+
*/
114+
marvell,reg-init = <3 16 0xf000 0x0a61>,
115+
<3 17 0x003f 0x000a>;
116+
117+
leds {
118+
#address-cells = <1>;
119+
#size-cells = <0>;
120+
121+
led@0 {
122+
reg = <0>;
123+
color = <LED_COLOR_ID_GREEN>;
124+
function = LED_FUNCTION_LAN;
125+
default-state = "keep";
126+
};
127+
128+
led@1 {
129+
reg = <1>;
130+
color = <LED_COLOR_ID_YELLOW>;
131+
function = LED_FUNCTION_LAN;
132+
default-state = "keep";
133+
};
134+
};
135+
};
136+
};
137+
138+
&cp0_pinctrl {
139+
pinctrl-0 = <&sim_select_pins>;
140+
pintrl-names = "default";
141+
142+
rear_button_pins: cp0-rear-button-pins {
143+
marvell,pins = "mpp31";
144+
marvell,function = "gpio";
145+
};
146+
147+
sim_select_pins: cp0-sim-select-pins {
148+
marvell,pins = "mpp27";
149+
marvell,function = "gpio";
150+
};
151+
};
152+
153+
/*
154+
* SRDS #4 - USB 3.0 host on M.2 connector
155+
* USB-2.0 Host on Type-A connector
156+
*/
157+
&cp0_usb3_1 {
158+
phys = <&cp0_comphy4 1>, <&cp0_utmi1>;
159+
phy-names = "comphy", "utmi";
160+
dr_mode = "host";
161+
status = "okay";
162+
};
163+
164+
&expander0 {
165+
m2-full-card-power-off-hog {
166+
gpio-hog;
167+
gpios = <2 GPIO_ACTIVE_LOW>;
168+
output-low;
169+
line-name = "m2-full-card-power-off";
170+
};
171+
172+
m2-reset-hog {
173+
gpio-hog;
174+
gpios = <10 GPIO_ACTIVE_LOW>;
175+
output-low;
176+
line-name = "m2-reset";
177+
};
178+
};

0 commit comments

Comments
 (0)