Skip to content

Commit 72e6889

Browse files
arndbarndb
committed
Merge tag 'aspeed-6.12-devicetree' of https://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc into soc/dt
ASPEED device tree updates for 6.12 - New machines * IBM P11 AST2600 BMC machines, named Blueridge and Fuji * Meta's Catalina AST2600 BMC - Updates to harma, minerva, mtmitchell, mtjade, system1, SPC621D8HM3 - Various changes to the dtsi to keep the YAML checker happy * tag 'aspeed-6.12-devicetree' of https://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc: (52 commits) ARM: dts: aspeed: catalina: Update io expander line names ARM: dts: aspeed: catalina: Add pdb cpld io expander ARM: dts: aspeed: harma: Remove pca9546 ARM: dts: aspeed: harma: Fix spi-gpio dtb_check warnings ARM: dts: aspeed: harma: Enable mctp controller ARM: dts: aspeed: harma: Add temperature device ARM: dts: aspeed: harma: Add fru device ARM: dts: aspeed: harma: Remove multi-host property ARM: dts: aspeed: harma: Add power monitor xdp710 ARM: dts: aspeed: harma: Add ina238 ARM: dts: aspeed: harma: Add sgpio name ARM: dts: aspeed: harma: Add VR devices ARM: dts: aspeed: harma: Revise hsc chip ARM: dts: aspeed-g6: Drop cells properties from ethernet nodes ARM: dts: aspeed-g6: Use generic 'ethernet' for ftgmac100 nodes ARM: dts: aspeed: Clean up AST2500 pinctrl properties ARM: dts: aspeed: Remove undocumented XDMA nodes ARM: dts: aspeed: Specify required properties for sram node ARM: dts: aspeed: Specify correct generic compatible for CVIC ARM: dts: aspeed: Fix coprocessor interrupt controller node name ... Link: https://lore.kernel.org/r/CACPK8XeGDUrbJ-OaxqQBR=aVVYyrKGnvT1ZKXO0vPHpsjQ_i9g@mail.gmail.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 611347b + b4c322c commit 72e6889

32 files changed

Lines changed: 8939 additions & 311 deletions

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,17 @@ properties:
7979
- aspeed,ast2600-evb-a1
8080
- asus,x4tf-bmc
8181
- facebook,bletchley-bmc
82+
- facebook,catalina-bmc
8283
- facebook,cloudripper-bmc
8384
- facebook,elbert-bmc
8485
- facebook,fuji-bmc
8586
- facebook,greatlakes-bmc
8687
- facebook,harma-bmc
8788
- facebook,minerva-cmc
8889
- facebook,yosemite4-bmc
90+
- ibm,blueridge-bmc
8991
- ibm,everest-bmc
92+
- ibm,fuji-bmc
9093
- ibm,rainier-bmc
9194
- ibm,system1-bmc
9295
- ibm,tacoma-bmc

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \
1717
aspeed-bmc-bytedance-g220a.dtb \
1818
aspeed-bmc-delta-ahe50dc.dtb \
1919
aspeed-bmc-facebook-bletchley.dtb \
20+
aspeed-bmc-facebook-catalina.dtb \
2021
aspeed-bmc-facebook-cmm.dtb \
2122
aspeed-bmc-facebook-elbert.dtb \
2223
aspeed-bmc-facebook-fuji.dtb \
@@ -32,8 +33,10 @@ dtb-$(CONFIG_ARCH_ASPEED) += \
3233
aspeed-bmc-facebook-yamp.dtb \
3334
aspeed-bmc-facebook-yosemitev2.dtb \
3435
aspeed-bmc-facebook-yosemite4.dtb \
36+
aspeed-bmc-ibm-blueridge.dtb \
3537
aspeed-bmc-ibm-bonnell.dtb \
3638
aspeed-bmc-ibm-everest.dtb \
39+
aspeed-bmc-ibm-fuji.dtb \
3740
aspeed-bmc-ibm-rainier.dtb \
3841
aspeed-bmc-ibm-rainier-1s4u.dtb \
3942
aspeed-bmc-ibm-rainier-4u.dtb \

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

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,11 @@
4949
*/
5050
i2c80 = &nvme_m2_0;
5151
i2c81 = &nvme_m2_1;
52+
53+
/*
54+
* i2c bus 82 assigned to OCP slot
55+
*/
56+
i2c82 = &ocpslot;
5257
};
5358

5459
chosen {
@@ -420,6 +425,17 @@
420425
reg = <0x70>;
421426
i2c-mux-idle-disconnect;
422427

428+
ocpslot: i2c@0 {
429+
#address-cells = <1>;
430+
#size-cells = <0>;
431+
reg = <0x0>;
432+
433+
ocpslot_temp: temperature-sensor@1f {
434+
compatible = "ti,tmp421";
435+
reg = <0x1f>;
436+
};
437+
};
438+
423439
nvmeslot_0_7: i2c@3 {
424440
#address-cells = <1>;
425441
#size-cells = <0>;
@@ -672,10 +688,6 @@
672688
memory-region = <&gfx_memory>;
673689
};
674690

675-
&pinctrl {
676-
aspeed,external-nodes = <&gfx &lhc>;
677-
};
678-
679691
&pwm_tacho {
680692
status = "okay";
681693
pinctrl-names = "default";

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

Lines changed: 154 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,32 @@
1515
serial7 = &uart8;
1616
serial8 = &uart9;
1717

18+
/*
19+
* I2C temperature alias port
20+
*/
21+
i2c20 = &i2c4_bus70_chn0;
22+
i2c21 = &i2c4_bus70_chn1;
23+
i2c22 = &i2c4_bus70_chn2;
24+
i2c23 = &i2c4_bus70_chn3;
25+
26+
/*
27+
* i2c bus 30-31 assigned to OCP slot 0-1
28+
*/
29+
i2c30 = &ocpslot_0;
30+
i2c31 = &ocpslot_1;
31+
32+
/*
33+
* i2c bus 32-33 assigned to Riser slot 0-1
34+
*/
35+
i2c32 = &i2c_riser0;
36+
i2c33 = &i2c_riser1;
37+
38+
/*
39+
* i2c bus 38-39 assigned to FRU on Riser slot 0-1
40+
*/
41+
i2c38 = &i2c_riser0_chn_0;
42+
i2c39 = &i2c_riser1_chn_0;
43+
1844
/*
1945
* I2C NVMe alias port
2046
*/
@@ -87,6 +113,37 @@
87113
};
88114
};
89115

116+
leds {
117+
compatible = "gpio-leds";
118+
/*
119+
* Use gpio-leds to configure GPIOW5 (bmc-ready) pin to be reseted when
120+
* watchdog timeout.
121+
*/
122+
led-bmc-ready {
123+
gpios = <&gpio0 ASPEED_GPIO(W, 5) (GPIO_ACTIVE_HIGH | GPIO_TRANSITORY)>;
124+
};
125+
126+
led-sw-heartbeat {
127+
gpios = <&gpio0 ASPEED_GPIO(N, 3) GPIO_ACTIVE_HIGH>;
128+
};
129+
130+
led-identify {
131+
gpios = <&gpio0 ASPEED_GPIO(S, 3) GPIO_ACTIVE_HIGH>;
132+
};
133+
134+
led-fault {
135+
gpios = <&gpio0 ASPEED_GPIO(P, 4) GPIO_ACTIVE_HIGH>;
136+
};
137+
138+
led-fan-fault {
139+
gpios = <&gpio_expander1 0 GPIO_ACTIVE_HIGH>;
140+
};
141+
142+
led-psu-fault {
143+
gpios = <&gpio_expander1 1 GPIO_ACTIVE_HIGH>;
144+
};
145+
};
146+
90147
voltage_mon_reg: voltage-mon-regulator {
91148
compatible = "regulator-fixed";
92149
regulator-name = "ltc2497_reg";
@@ -515,6 +572,80 @@
515572
#size-cells = <0>;
516573
reg = <0x70>;
517574
i2c-mux-idle-disconnect;
575+
576+
ocpslot_0: i2c@0 {
577+
#address-cells = <1>;
578+
#size-cells = <0>;
579+
reg = <0x0>;
580+
581+
ocpslot_0_temp: temperature-sensor@1f {
582+
compatible = "ti,tmp421";
583+
reg = <0x1f>;
584+
};
585+
};
586+
587+
ocpslot_1: i2c@1 {
588+
#address-cells = <1>;
589+
#size-cells = <0>;
590+
reg = <0x1>;
591+
592+
ocpslot_1_temp: temperature-sensor@1f {
593+
compatible = "ti,tmp421";
594+
reg = <0x1f>;
595+
};
596+
};
597+
598+
i2c_riser0: i2c@2 {
599+
#address-cells = <1>;
600+
#size-cells = <0>;
601+
reg = <0x2>;
602+
603+
i2c-mux@72 {
604+
compatible = "nxp,pca9546";
605+
#address-cells = <1>;
606+
#size-cells = <0>;
607+
reg = <0x72>;
608+
i2c-mux-idle-disconnect;
609+
610+
i2c_riser0_chn_0: i2c@0 {
611+
#address-cells = <1>;
612+
#size-cells = <0>;
613+
reg = <0x0>;
614+
615+
eeprom@50 {
616+
compatible = "atmel,24c02";
617+
reg = <0x50>;
618+
pagesize = <16>;
619+
};
620+
};
621+
};
622+
};
623+
624+
i2c_riser1: i2c@3 {
625+
#address-cells = <1>;
626+
#size-cells = <0>;
627+
reg = <0x3>;
628+
629+
i2c-mux@72 {
630+
compatible = "nxp,pca9546";
631+
#address-cells = <1>;
632+
#size-cells = <0>;
633+
reg = <0x72>;
634+
i2c-mux-idle-disconnect;
635+
636+
i2c_riser1_chn_0: i2c@0 {
637+
#address-cells = <1>;
638+
#size-cells = <0>;
639+
reg = <0x0>;
640+
641+
eeprom@50 {
642+
compatible = "atmel,24c02";
643+
reg = <0x50>;
644+
pagesize = <16>;
645+
};
646+
};
647+
};
648+
};
518649
};
519650
};
520651

@@ -790,6 +921,10 @@
790921
};
791922
};
792923

924+
&i2c10 {
925+
status = "okay";
926+
};
927+
793928
&i2c11 {
794929
status = "okay";
795930
ssif-bmc@10 {
@@ -812,6 +947,25 @@
812947
};
813948
};
814949

950+
&i2c15 {
951+
status = "okay";
952+
gpio_expander1: gpio-expander@22 {
953+
compatible = "nxp,pca9535";
954+
reg = <0x22>;
955+
gpio-controller;
956+
#gpio-cells = <2>;
957+
gpio-line-names =
958+
"fan-fault","psu-fault",
959+
"","",
960+
"","",
961+
"","",
962+
"","",
963+
"","",
964+
"","",
965+
"","";
966+
};
967+
};
968+
815969
&adc0 {
816970
status = "okay";
817971

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -200,10 +200,6 @@
200200
status = "okay";
201201
};
202202

203-
&pinctrl {
204-
aspeed,external-nodes = <&gfx &lhc>;
205-
};
206-
207203
&gpio {
208204
pin_gpio_c7 {
209205
gpio-hog;

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,11 +110,15 @@
110110
compatible = "st,24c128", "atmel,24c128";
111111
reg = <0x50>;
112112
pagesize = <16>;
113-
#address-cells = <1>;
114-
#size-cells = <1>;
115113

116-
eth0_macaddress: macaddress@3f80 {
117-
reg = <0x3f80 6>;
114+
nvmem-layout {
115+
compatible = "fixed-layout";
116+
#address-cells = <1>;
117+
#size-cells = <1>;
118+
119+
eth0_macaddress: macaddress@3f80 {
120+
reg = <0x3f80 6>;
121+
};
118122
};
119123
};
120124

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -254,10 +254,6 @@
254254
status = "okay";
255255
};
256256

257-
&pinctrl {
258-
aspeed,external-nodes = <&gfx &lhc>;
259-
};
260-
261257
&vhub {
262258
status = "okay";
263259
};

0 commit comments

Comments
 (0)