Skip to content

Commit 9a5a531

Browse files
arndbarndb
committed
Merge tag 'aspeed-6.17-devicetree-1' of https://git.kernel.org/pub/scm/linux/kernel/git/bmc/linux into soc/dt
ASPEED devicetree updates for 6.17 Removed platforms: - IBM's Swift BMC New platforms: - Meta's Santabarbara Santabarbara is a compute node with an accelerator module - NVIDIA's GB200NVL BMC NVIDIA GB200 NVL72 connects 36 Grace CPUs and 72 Blackwell GPUs in an NVIDIA NVLink-connected, liquid-cooled, rack-scale design. Updated BMC platforms: - Bletchley (Meta): GPIO hog names, remove ethernet-phy node, USB PD negotiation - Catalina (Meta): Various sensors added, MCTP support for NIC management - Harma (Meta): Various sensors added - System1 (IBM): IPMB and various GPIO-related updates - Yosemite4 (Meta): GPIO names for UART mux select lines The System1 series includes a devicetree binding patch for IPMI IPMB devices. * tag 'aspeed-6.17-devicetree-1' of https://git.kernel.org/pub/scm/linux/kernel/git/bmc/linux: (34 commits) ARM: dts: aspeed: yosemite4: add gpio name for uart mux sel ARM: dts: aspeed: santabarbara: Add Meta Santabarbara BMC dt-bindings: arm: aspeed: add Meta Santabarbara board ARM: dts: aspeed: bletchley: enable USB PD negotiation ARM: dts: aspeed: lanyang: Fix 'lable' typo in LED nodes ARM: dts: aspeed: harma: add mmc health ARM: dts: aspeed: Harma: revise gpio bride pin for battery ARM: dts: aspeed: harma: add ADC128D818 for voltage monitoring ARM: dts: aspeed: harma: add fan board I/O expander ARM: dts: aspeed: harma: add E1.S power monitor ARM: dts: aspeed: catalina: Enable MCTP for frontend NIC management ARM: dts: aspeed: Add device tree for Nvidia's GB200NVL BMC dt-bindings: arm: aspeed: add Nvidia's GB200NVL BMC ARM: dts: aspeed: catalina: Enable MCTP support for NIC management ARM: dts: aspeed: catalina: Update CBC FRU EEPROM I2C bus and address ARM: dts: aspeed: catalina: Enable multi-master on additional I2C buses ARM: dts: aspeed: catalina: Remove INA238 and INA230 nodes ARM: dts: aspeed: catalina: Add second source HSC node support ARM: dts: aspeed: catalina: Add second source fan controller support ARM: dts: aspeed: catalina: Add fan controller support ... Link: https://lore.kernel.org/r/36d50489cac1fbae01ec699b742f6c6c459a01cb.camel@codeconstruct.com.au Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 31e91df + 1c15e35 commit 9a5a531

26 files changed

Lines changed: 2685 additions & 1222 deletions

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ properties:
8787
- facebook,greatlakes-bmc
8888
- facebook,harma-bmc
8989
- facebook,minerva-cmc
90+
- facebook,santabarbara-bmc
9091
- facebook,yosemite4-bmc
9192
- ibm,blueridge-bmc
9293
- ibm,everest-bmc
@@ -98,6 +99,7 @@ properties:
9899
- inventec,starscream-bmc
99100
- inventec,transformer-bmc
100101
- jabil,rbp-bmc
102+
- nvidia,gb200nvl-bmc
101103
- qcom,dc-scm-v1-bmc
102104
- quanta,s6q-bmc
103105
- ufispace,ncplite-bmc

‎Documentation/devicetree/bindings/ipmi/ipmb-dev.yaml‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/ipmi/ipmb-dev.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: The Intelligent Platform Management Bus(IPMB) Device
8+
9+
description: |
10+
The IPMB is an I2C bus which provides interconnection between a Baseboard
11+
Management Controller(BMC) and chassis electronics. The BMC sends IPMI
12+
requests to intelligent controllers like Satellite Management Controller(MC)
13+
devices via IPMB and the device sends responses back to the BMC.
14+
This device uses an I2C slave device to send and receive IPMB messages,
15+
either on a BMC or other MC. A miscellaneous device provices a user space
16+
program to communicate with the kernel and the backend device. Some IPMB
17+
devices only support the I2C protocol and not the SMB protocol.
18+
19+
IPMB communications protocol Specification V1.0
20+
https://www.intel.com/content/dam/www/public/us/en/documents/product-briefs/ipmp-spec-v1.0.pdf
21+
22+
maintainers:
23+
- Ninad Palsule <ninad@linux.ibm.com>
24+
25+
properties:
26+
compatible:
27+
enum:
28+
- ipmb-dev
29+
30+
reg:
31+
maxItems: 1
32+
33+
i2c-protocol:
34+
description:
35+
Use I2C block transfer instead of SMBUS block transfer.
36+
type: boolean
37+
38+
required:
39+
- compatible
40+
- reg
41+
42+
additionalProperties: false
43+
44+
examples:
45+
- |
46+
#include <dt-bindings/i2c/i2c.h>
47+
i2c {
48+
#address-cells = <1>;
49+
#size-cells = <0>;
50+
51+
ipmb-dev@10 {
52+
compatible = "ipmb-dev";
53+
reg = <(0x10 | I2C_OWN_SLAVE_ADDRESS)>;
54+
i2c-protocol;
55+
};
56+
};

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \
2727
aspeed-bmc-facebook-harma.dtb \
2828
aspeed-bmc-facebook-minerva.dtb \
2929
aspeed-bmc-facebook-minipack.dtb \
30+
aspeed-bmc-facebook-santabarbara.dtb \
3031
aspeed-bmc-facebook-tiogapass.dtb \
3132
aspeed-bmc-facebook-wedge40.dtb \
3233
aspeed-bmc-facebook-wedge100.dtb \
@@ -50,12 +51,12 @@ dtb-$(CONFIG_ARCH_ASPEED) += \
5051
aspeed-bmc-lenovo-hr630.dtb \
5152
aspeed-bmc-lenovo-hr855xg2.dtb \
5253
aspeed-bmc-microsoft-olympus.dtb \
54+
aspeed-bmc-nvidia-gb200nvl-bmc.dtb \
5355
aspeed-bmc-opp-lanyang.dtb \
5456
aspeed-bmc-opp-mowgli.dtb \
5557
aspeed-bmc-opp-nicole.dtb \
5658
aspeed-bmc-opp-palmetto.dtb \
5759
aspeed-bmc-opp-romulus.dtb \
58-
aspeed-bmc-opp-swift.dtb \
5960
aspeed-bmc-opp-tacoma.dtb \
6061
aspeed-bmc-opp-vesnin.dtb \
6162
aspeed-bmc-opp-witherspoon.dtb \

‎arch/arm/boot/dts/aspeed/aspeed-bmc-ampere-mtjade.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -825,7 +825,7 @@
825825
line-name = "ocp-aux-pwren";
826826
};
827827

828-
bmc-ready {
828+
bmc-ready-hog {
829829
gpio-hog;
830830
gpios = <ASPEED_GPIO(AC, 5) GPIO_ACTIVE_HIGH>;
831831
output-high;

‎arch/arm/boot/dts/aspeed/aspeed-bmc-arm-stardragon4800-rep2.dts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,13 +201,13 @@
201201
};
202202

203203
&gpio {
204-
pin_gpio_c7 {
204+
pin-gpio-c7-hog {
205205
gpio-hog;
206206
gpios = <ASPEED_GPIO(C, 7) GPIO_ACTIVE_HIGH>;
207207
output-low;
208208
line-name = "BIOS_SPI_MUX_S";
209209
};
210-
pin_gpio_d1 {
210+
pin-gpio-d1-hog {
211211
gpio-hog;
212212
gpios = <ASPEED_GPIO(D, 1) GPIO_ACTIVE_HIGH>;
213213
output-high;

‎arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-e3c246d4i.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@
182182
"CK_33M_BMC", "LFRAME", "SERIRQ", "S_PLTRST";
183183

184184
/* Assert BMC_READY so BIOS doesn't sit around waiting for it */
185-
bmc-ready {
185+
bmc-ready-hog {
186186
gpio-hog;
187187
gpios = <ASPEED_GPIO(J, 0) GPIO_ACTIVE_LOW>;
188188
output-high;

‎arch/arm/boot/dts/aspeed/aspeed-bmc-bytedance-g220a.dts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -915,14 +915,14 @@
915915
};
916916

917917
&gpio {
918-
pin_gpio_i3 {
918+
pin-gpio-i3-hog {
919919
gpio-hog;
920920
gpios = <ASPEED_GPIO(I, 3) GPIO_ACTIVE_HIGH>;
921921
output-low;
922922
line-name = "NCSI_BMC_R_SEL";
923923
};
924924

925-
pin_gpio_b6 {
925+
pin-gpio-b6-hog {
926926
gpio-hog;
927927
gpios = <ASPEED_GPIO(B, 6) GPIO_ACTIVE_HIGH>;
928928
output-low;

‎arch/arm/boot/dts/aspeed/aspeed-bmc-delta-ahe50dc.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@
395395
* back to one causes a power output glitch, so install a hog to keep
396396
* it at one as a failsafe to ensure nothing accidentally touches it.
397397
*/
398-
doom-guardrail {
398+
doom-guardrail-hog {
399399
gpio-hog;
400400
gpios = <ASPEED_GPIO(E, 0) GPIO_ACTIVE_LOW>;
401401
output-low;

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

Lines changed: 42 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,6 @@
5252
};
5353
};
5454

55-
switchphy: ethernet-phy@0 {
56-
// Fixed link
57-
};
58-
5955
front_gpio_leds {
6056
compatible = "gpio-leds";
6157
sys_log_id {
@@ -285,7 +281,6 @@
285281
&mac2 {
286282
status = "okay";
287283
phy-mode = "rgmii";
288-
phy-handle = <&switchphy>;
289284
pinctrl-names = "default";
290285
pinctrl-0 = <&pinctrl_rgmii3_default>;
291286

@@ -398,10 +393,13 @@
398393
connector {
399394
compatible = "usb-c-connector";
400395
label = "USB-C";
401-
power-role = "source";
402-
data-role = "host";
403-
pd-disable;
404-
typec-power-opmode = "default";
396+
pd-revision = /bits/ 8 <0x2 0x0 0x1 0x20>;
397+
power-role = "dual";
398+
try-power-role = "sink";
399+
data-role = "dual";
400+
source-pdos = <PDO_FIXED(5000, 3000, PDO_FIXED_USB_COMM)>;
401+
sink-pdos = <PDO_FIXED(5000, 3000, PDO_FIXED_USB_COMM)>;
402+
op-sink-microwatt = <10000000>;
405403
};
406404
};
407405

@@ -484,10 +482,13 @@
484482
connector {
485483
compatible = "usb-c-connector";
486484
label = "USB-C";
487-
power-role = "source";
488-
data-role = "host";
489-
pd-disable;
490-
typec-power-opmode = "default";
485+
pd-revision = /bits/ 8 <0x2 0x0 0x1 0x20>;
486+
power-role = "dual";
487+
try-power-role = "sink";
488+
data-role = "dual";
489+
source-pdos = <PDO_FIXED(5000, 3000, PDO_FIXED_USB_COMM)>;
490+
sink-pdos = <PDO_FIXED(5000, 3000, PDO_FIXED_USB_COMM)>;
491+
op-sink-microwatt = <10000000>;
491492
};
492493
};
493494

@@ -570,10 +571,13 @@
570571
connector {
571572
compatible = "usb-c-connector";
572573
label = "USB-C";
573-
power-role = "source";
574-
data-role = "host";
575-
pd-disable;
576-
typec-power-opmode = "default";
574+
pd-revision = /bits/ 8 <0x2 0x0 0x1 0x20>;
575+
power-role = "dual";
576+
try-power-role = "sink";
577+
data-role = "dual";
578+
source-pdos = <PDO_FIXED(5000, 3000, PDO_FIXED_USB_COMM)>;
579+
sink-pdos = <PDO_FIXED(5000, 3000, PDO_FIXED_USB_COMM)>;
580+
op-sink-microwatt = <10000000>;
577581
};
578582
};
579583

@@ -656,10 +660,13 @@
656660
connector {
657661
compatible = "usb-c-connector";
658662
label = "USB-C";
659-
power-role = "source";
660-
data-role = "host";
661-
pd-disable;
662-
typec-power-opmode = "default";
663+
pd-revision = /bits/ 8 <0x2 0x0 0x1 0x20>;
664+
power-role = "dual";
665+
try-power-role = "sink";
666+
data-role = "dual";
667+
source-pdos = <PDO_FIXED(5000, 3000, PDO_FIXED_USB_COMM)>;
668+
sink-pdos = <PDO_FIXED(5000, 3000, PDO_FIXED_USB_COMM)>;
669+
op-sink-microwatt = <10000000>;
663670
};
664671
};
665672

@@ -742,10 +749,13 @@
742749
connector {
743750
compatible = "usb-c-connector";
744751
label = "USB-C";
745-
power-role = "source";
746-
data-role = "host";
747-
pd-disable;
748-
typec-power-opmode = "default";
752+
pd-revision = /bits/ 8 <0x2 0x0 0x1 0x20>;
753+
power-role = "dual";
754+
try-power-role = "sink";
755+
data-role = "dual";
756+
source-pdos = <PDO_FIXED(5000, 3000, PDO_FIXED_USB_COMM)>;
757+
sink-pdos = <PDO_FIXED(5000, 3000, PDO_FIXED_USB_COMM)>;
758+
op-sink-microwatt = <10000000>;
749759
};
750760
};
751761

@@ -828,10 +838,13 @@
828838
connector {
829839
compatible = "usb-c-connector";
830840
label = "USB-C";
831-
power-role = "source";
832-
data-role = "host";
833-
pd-disable;
834-
typec-power-opmode = "default";
841+
pd-revision = /bits/ 8 <0x2 0x0 0x1 0x20>;
842+
power-role = "dual";
843+
try-power-role = "sink";
844+
data-role = "dual";
845+
source-pdos = <PDO_FIXED(5000, 3000, PDO_FIXED_USB_COMM)>;
846+
sink-pdos = <PDO_FIXED(5000, 3000, PDO_FIXED_USB_COMM)>;
847+
op-sink-microwatt = <10000000>;
835848
};
836849
};
837850

0 commit comments

Comments
 (0)