Skip to content

Commit bc6fe9f

Browse files
arndbarndb
committed
Merge tag 'aspeed-6.20-devicetree-0' of https://git.kernel.org/pub/scm/linux/kernel/git/bmc/linux into soc/dt
First batch of ASPEED Arm devicetree changes for 6.20 New platforms: - NVIDIA MSX4 BMC The NVIDIA MSX4 HPM (host platform module) is a reference board for managing up to 8 PCIe connected NVIDIA GPUs via ConnectX-8 (CX8) SuperNICs. The BMC manages all GPUs and CX8s for both telemetry and firmware update via MCTP over USB. The host CPUs are dual socket Intel Granite Rapids processors. For more detail on this architecture: https://developer.nvidia.com/blog/nvidia-connectx-8-supernics-advance-ai-platform-architecture-with-pcie-gen6-connectivity/ Updated platforms: - ast2600-evb (ASPEED): Various tidy-ups to address binding warnings - bletchley (Meta): Watchdog fix, tidy-ups to address binding warnings - clemente (Meta): HDD LED fix, GPIO line names, EEPROMs - harma (Meta): fanboard presence GPIO - santabarbara (Meta): IPMB, GPIO line names, additional IO expander * tag 'aspeed-6.20-devicetree-0' of https://git.kernel.org/pub/scm/linux/kernel/git/bmc/linux: ARM: dts: aspeed: bletchley: Fix ADC vref property names ARM: dts: aspeed: bletchley: Remove unused i2c13 property ARM: dts: aspeed: bletchley: Remove unused pca9539 properties ARM: dts: aspeed: bletchley: Fix SPI GPIO property names ARM: dts: aspeed: bletchley: Use generic node names ARM: dts: aspeed: g6: Drop clocks property from arm,armv7-timer ARM: dts: aspeed: ast2600-evb: Tidy up A0 work-around for UART5 ARM: dts: aspeed: g6: Drop unspecified aspeed,ast2600-udma node ARM: dts: aspeed: Drop syscon compatible from EDAC in g6 dtsi ARM: dts: aspeed: Use specified wp-inverted property for AST2600 EVB ARM: dts: aspeed: Remove sdhci-drive-type property from AST2600 EVB ARM: dts: aspeed: Add NVIDIA MSX4 HPM dt-bindings: arm: aspeed: Add NVIDIA MSX4 board ARM: dts: aspeed: clemente: move hdd_led to its own gpio-leds group ARM: dts: aspeed: clemente: add gpio line name to io expander ARM: dts: aspeed: santabarbara: Enable ipmb device for OCP debug card ARM: dts: aspeed: santabarbara: Add swb IO expander and gpio line names ARM: dts: aspeed: clemente: Add EEPROMs for boot and data drive FRUs ARM: dts: aspeed: harma: add fanboard presence sgpio ARM: dts: aspeed: bletchley: remove WDTRST1 assertion from wdt1 Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 12e491d + 459a5aa commit bc6fe9f

9 files changed

Lines changed: 374 additions & 79 deletions

File tree

‎Documentation/devicetree/bindings/arm/aspeed/aspeed.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ properties:
107107
- inventec,transformer-bmc
108108
- jabil,rbp-bmc
109109
- nvidia,gb200nvl-bmc
110+
- nvidia,msx4-bmc
110111
- qcom,dc-scm-v1-bmc
111112
- quanta,s6q-bmc
112113
- ufispace,ncplite-bmc

‎arch/arm/boot/dts/aspeed/Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \
5858
aspeed-bmc-lenovo-hr855xg2.dtb \
5959
aspeed-bmc-microsoft-olympus.dtb \
6060
aspeed-bmc-nvidia-gb200nvl-bmc.dtb \
61+
aspeed-bmc-nvidia-msx4-bmc.dtb \
6162
aspeed-bmc-opp-lanyang.dtb \
6263
aspeed-bmc-opp-mowgli.dtb \
6364
aspeed-bmc-opp-nicole.dtb \

‎arch/arm/boot/dts/aspeed/aspeed-ast2600-evb.dts‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,7 @@
205205
&uart5 {
206206
// Workaround for A0
207207
compatible = "snps,dw-apb-uart";
208+
/delete-property/ no-loopback-test;
208209
};
209210

210211
&i2c0 {
@@ -314,9 +315,8 @@
314315
status = "okay";
315316
bus-width = <4>;
316317
max-frequency = <100000000>;
317-
sdhci-drive-type = /bits/ 8 <3>;
318318
sdhci-caps-mask = <0x7 0x0>;
319-
sdhci,wp-inverted;
319+
wp-inverted;
320320
vmmc-supply = <&vcc_sdhci0>;
321321
vqmmc-supply = <&vccq_sdhci0>;
322322
clk-phase-sd-hs = <7>, <200>;
@@ -326,9 +326,8 @@
326326
status = "okay";
327327
bus-width = <4>;
328328
max-frequency = <100000000>;
329-
sdhci-drive-type = /bits/ 8 <3>;
330329
sdhci-caps-mask = <0x7 0x0>;
331-
sdhci,wp-inverted;
330+
wp-inverted;
332331
vmmc-supply = <&vcc_sdhci1>;
333332
vqmmc-supply = <&vccq_sdhci1>;
334333
clk-phase-sd-hs = <7>, <200>;

‎arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-bletchley.dts‎

Lines changed: 54 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@
3434
<&adc1 4>, <&adc1 5>, <&adc1 6>, <&adc1 7>;
3535
};
3636

37-
spi1_gpio: spi1-gpio {
37+
spi1_gpio: spi {
3838
compatible = "spi-gpio";
3939
#address-cells = <1>;
4040
#size-cells = <0>;
4141

42-
gpio-sck = <&gpio0 ASPEED_GPIO(Z, 3) GPIO_ACTIVE_HIGH>;
43-
gpio-mosi = <&gpio0 ASPEED_GPIO(Z, 4) GPIO_ACTIVE_HIGH>;
44-
gpio-miso = <&gpio0 ASPEED_GPIO(Z, 5) GPIO_ACTIVE_HIGH>;
42+
sck-gpios = <&gpio0 ASPEED_GPIO(Z, 3) GPIO_ACTIVE_HIGH>;
43+
mosi-gpios = <&gpio0 ASPEED_GPIO(Z, 4) GPIO_ACTIVE_HIGH>;
44+
miso-gpios = <&gpio0 ASPEED_GPIO(Z, 5) GPIO_ACTIVE_HIGH>;
4545
num-chipselects = <1>;
4646
cs-gpios = <&gpio0 ASPEED_GPIO(Z, 0) GPIO_ACTIVE_LOW>;
4747

@@ -54,50 +54,59 @@
5454

5555
front_gpio_leds {
5656
compatible = "gpio-leds";
57-
sys_log_id {
57+
led-0 {
58+
label = "sys_log_id";
5859
default-state = "off";
5960
gpios = <&front_leds 0 GPIO_ACTIVE_LOW>;
6061
};
6162
};
6263

6364
fan_gpio_leds {
6465
compatible = "gpio-leds";
65-
fan0_blue {
66+
led-0 {
67+
label = "fan0_blue";
6668
retain-state-shutdown;
6769
default-state = "on";
6870
gpios = <&fan_leds 8 GPIO_ACTIVE_HIGH>;
6971
};
70-
fan1_blue {
72+
led-1 {
73+
label = "fan1_blue";
7174
retain-state-shutdown;
7275
default-state = "on";
7376
gpios = <&fan_leds 9 GPIO_ACTIVE_HIGH>;
7477
};
75-
fan2_blue {
78+
led-2 {
79+
label = "fan2_blue";
7680
retain-state-shutdown;
7781
default-state = "on";
7882
gpios = <&fan_leds 10 GPIO_ACTIVE_HIGH>;
7983
};
80-
fan3_blue {
84+
led-3 {
85+
label = "fan3_blue";
8186
retain-state-shutdown;
8287
default-state = "on";
8388
gpios = <&fan_leds 11 GPIO_ACTIVE_HIGH>;
8489
};
85-
fan0_amber {
90+
led-4 {
91+
label = "fan0_amber";
8692
retain-state-shutdown;
8793
default-state = "off";
8894
gpios = <&fan_leds 12 GPIO_ACTIVE_HIGH>;
8995
};
90-
fan1_amber {
96+
led-5 {
97+
label = "fan1_amber";
9198
retain-state-shutdown;
9299
default-state = "off";
93100
gpios = <&fan_leds 13 GPIO_ACTIVE_HIGH>;
94101
};
95-
fan2_amber {
102+
led-6 {
103+
label = "fan2_amber";
96104
retain-state-shutdown;
97105
default-state = "off";
98106
gpios = <&fan_leds 14 GPIO_ACTIVE_HIGH>;
99107
};
100-
fan3_amber {
108+
led-7 {
109+
label = "fan3_amber";
101110
retain-state-shutdown;
102111
default-state = "off";
103112
gpios = <&fan_leds 15 GPIO_ACTIVE_HIGH>;
@@ -106,12 +115,14 @@
106115

107116
sled1_gpio_leds {
108117
compatible = "gpio-leds";
109-
sled1_amber {
118+
led-0 {
119+
label = "sled1_amber";
110120
retain-state-shutdown;
111121
default-state = "keep";
112122
gpios = <&sled1_leds 0 GPIO_ACTIVE_LOW>;
113123
};
114-
sled1_blue {
124+
led-1 {
125+
label = "sled1_blue";
115126
retain-state-shutdown;
116127
default-state = "keep";
117128
gpios = <&sled1_leds 1 GPIO_ACTIVE_LOW>;
@@ -120,12 +131,14 @@
120131

121132
sled2_gpio_leds {
122133
compatible = "gpio-leds";
123-
sled2_amber {
134+
led-0 {
135+
label = "sled2_amber";
124136
retain-state-shutdown;
125137
default-state = "keep";
126138
gpios = <&sled2_leds 0 GPIO_ACTIVE_LOW>;
127139
};
128-
sled2_blue {
140+
led-1 {
141+
label = "sled2_blue";
129142
retain-state-shutdown;
130143
default-state = "keep";
131144
gpios = <&sled2_leds 1 GPIO_ACTIVE_LOW>;
@@ -134,12 +147,14 @@
134147

135148
sled3_gpio_leds {
136149
compatible = "gpio-leds";
137-
sled3_amber {
150+
led-0 {
151+
label = "sled3_amber";
138152
retain-state-shutdown;
139153
default-state = "keep";
140154
gpios = <&sled3_leds 0 GPIO_ACTIVE_LOW>;
141155
};
142-
sled3_blue {
156+
led-1 {
157+
label = "sled3_blue";
143158
retain-state-shutdown;
144159
default-state = "keep";
145160
gpios = <&sled3_leds 1 GPIO_ACTIVE_LOW>;
@@ -148,12 +163,14 @@
148163

149164
sled4_gpio_leds {
150165
compatible = "gpio-leds";
151-
sled4_amber {
166+
led-0 {
167+
label = "sled4_amber";
152168
retain-state-shutdown;
153169
default-state = "keep";
154170
gpios = <&sled4_leds 0 GPIO_ACTIVE_LOW>;
155171
};
156-
sled4_blue {
172+
led-1 {
173+
label = "sled4_blue";
157174
retain-state-shutdown;
158175
default-state = "keep";
159176
gpios = <&sled4_leds 1 GPIO_ACTIVE_LOW>;
@@ -162,12 +179,14 @@
162179

163180
sled5_gpio_leds {
164181
compatible = "gpio-leds";
165-
sled5_amber {
182+
led-0 {
183+
label = "sled5_amber";
166184
retain-state-shutdown;
167185
default-state = "keep";
168186
gpios = <&sled5_leds 0 GPIO_ACTIVE_LOW>;
169187
};
170-
sled5_blue {
188+
led-1 {
189+
label = "sled5_blue";
171190
retain-state-shutdown;
172191
default-state = "keep";
173192
gpios = <&sled5_leds 1 GPIO_ACTIVE_LOW>;
@@ -176,12 +195,14 @@
176195

177196
sled6_gpio_leds {
178197
compatible = "gpio-leds";
179-
sled6_amber {
198+
led-0 {
199+
label = "sled6_amber";
180200
retain-state-shutdown;
181201
default-state = "keep";
182202
gpios = <&sled6_leds 0 GPIO_ACTIVE_LOW>;
183203
};
184-
sled6_blue {
204+
led-1 {
205+
label = "sled6_blue";
185206
retain-state-shutdown;
186207
default-state = "keep";
187208
gpios = <&sled6_leds 1 GPIO_ACTIVE_LOW>;
@@ -191,32 +212,32 @@
191212
gpio-keys {
192213
compatible = "gpio-keys";
193214

194-
presence-sled1 {
215+
presence-sled1-switch {
195216
label = "presence-sled1";
196217
gpios = <&gpio0 ASPEED_GPIO(H, 2) GPIO_ACTIVE_LOW>;
197218
linux,code = <ASPEED_GPIO(H, 2)>;
198219
};
199-
presence-sled2 {
220+
presence-sled2-switch {
200221
label = "presence-sled2";
201222
gpios = <&gpio0 ASPEED_GPIO(H, 3) GPIO_ACTIVE_LOW>;
202223
linux,code = <ASPEED_GPIO(H, 3)>;
203224
};
204-
presence-sled3 {
225+
presence-sled3-switch {
205226
label = "presence-sled3";
206227
gpios = <&gpio0 ASPEED_GPIO(H, 4) GPIO_ACTIVE_LOW>;
207228
linux,code = <ASPEED_GPIO(H, 4)>;
208229
};
209-
presence-sled4 {
230+
presence-sled4-switch {
210231
label = "presence-sled4";
211232
gpios = <&gpio0 ASPEED_GPIO(H, 5) GPIO_ACTIVE_LOW>;
212233
linux,code = <ASPEED_GPIO(H, 5)>;
213234
};
214-
presence-sled5 {
235+
presence-sled5-switch {
215236
label = "presence-sled5";
216237
gpios = <&gpio0 ASPEED_GPIO(H, 6) GPIO_ACTIVE_LOW>;
217238
linux,code = <ASPEED_GPIO(H, 6)>;
218239
};
219-
presence-sled6 {
240+
presence-sled6-switch {
220241
label = "presence-sled6";
221242
gpios = <&gpio0 ASPEED_GPIO(H, 7) GPIO_ACTIVE_LOW>;
222243
linux,code = <ASPEED_GPIO(H, 7)>;
@@ -352,8 +373,6 @@
352373
sled1_ioexp: pca9539@76 {
353374
compatible = "nxp,pca9539";
354375
reg = <0x76>;
355-
#address-cells = <1>;
356-
#size-cells = <0>;
357376
gpio-controller;
358377
#gpio-cells = <2>;
359378

@@ -441,8 +460,6 @@
441460
sled2_ioexp: pca9539@76 {
442461
compatible = "nxp,pca9539";
443462
reg = <0x76>;
444-
#address-cells = <1>;
445-
#size-cells = <0>;
446463
gpio-controller;
447464
#gpio-cells = <2>;
448465

@@ -530,8 +547,6 @@
530547
sled3_ioexp: pca9539@76 {
531548
compatible = "nxp,pca9539";
532549
reg = <0x76>;
533-
#address-cells = <1>;
534-
#size-cells = <0>;
535550
gpio-controller;
536551
#gpio-cells = <2>;
537552

@@ -619,8 +634,6 @@
619634
sled4_ioexp: pca9539@76 {
620635
compatible = "nxp,pca9539";
621636
reg = <0x76>;
622-
#address-cells = <1>;
623-
#size-cells = <0>;
624637
gpio-controller;
625638
#gpio-cells = <2>;
626639

@@ -708,8 +721,6 @@
708721
sled5_ioexp: pca9539@76 {
709722
compatible = "nxp,pca9539";
710723
reg = <0x76>;
711-
#address-cells = <1>;
712-
#size-cells = <0>;
713724
gpio-controller;
714725
#gpio-cells = <2>;
715726

@@ -797,8 +808,6 @@
797808
sled6_ioexp: pca9539@76 {
798809
compatible = "nxp,pca9539";
799810
reg = <0x76>;
800-
#address-cells = <1>;
801-
#size-cells = <0>;
802811
gpio-controller;
803812
#gpio-cells = <2>;
804813

@@ -953,7 +962,6 @@
953962

954963
&i2c13 {
955964
multi-master;
956-
aspeed,hw-timeout-ms = <1000>;
957965
status = "okay";
958966

959967
//USB Debug Connector
@@ -1024,7 +1032,7 @@
10241032
};
10251033

10261034
&adc0 {
1027-
vref = <1800>;
1035+
aspeed,int-vref-microvolt = <2500000>;
10281036
status = "okay";
10291037

10301038
pinctrl-names = "default";
@@ -1035,7 +1043,7 @@
10351043
};
10361044

10371045
&adc1 {
1038-
vref = <2500>;
1046+
aspeed,int-vref-microvolt = <2500000>;
10391047
status = "okay";
10401048

10411049
pinctrl-names = "default";
@@ -1080,11 +1088,5 @@
10801088

10811089
&wdt1 {
10821090
status = "okay";
1083-
pinctrl-names = "default";
1084-
pinctrl-0 = <&pinctrl_wdtrst1_default>;
10851091
aspeed,reset-type = "soc";
1086-
aspeed,external-signal;
1087-
aspeed,ext-push-pull;
1088-
aspeed,ext-active-high;
1089-
aspeed,ext-pulse-duration = <256>;
10901092
};

0 commit comments

Comments
 (0)