Skip to content

Commit aa32dec

Browse files
committed
Merge tag 'aspeed-6.10-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc into soc/dt-late
ASPEED device tree updates for 6.10 - New and removed machines: * IBM System1 AST2600 BMC, a x86 server * ASUS X4TF AST2600 BMC, a x86 server * ASRock SPC621D8HM3 AST2500 BMC, a Intel Xeon system * ASRock E3C256D4I AST2500 BMC, a Intel Xeon system * Add ASRock X570D4U's AST2500 BMC, an AMD Ryzen 5000 system * Facebook Harma's AST2600 BMC * Facebook Cloudripper is removed - Updates to machines merged this cycle, as well as bonnell, yosemite4, minerva and others * tag 'aspeed-6.10-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc: (52 commits) ARM: dts: aspeed: Add ASRock E3C256D4I BMC dt-bindings: arm: aspeed: document ASRock E3C256D4I dt-bindings: trivial-devices: add isil,isl69269 ARM: dts: aspeed: x4tf: Add dts for asus x4tf project dt-bindings: arm: aspeed: add ASUS X4TF board ARM: dts: aspeed: Remove Facebook Cloudripper dts ARM: dts: aspeed: drop unused ref_voltage ADC property ARM: dts: aspeed: harma: correct Mellanox multi-host property ARM: dts: aspeed: yosemitev2: correct Mellanox multi-host property ARM: dts: aspeed: yosemite4: correct Mellanox multi-host property ARM: dts: aspeed: greatlakes: correct Mellanox multi-host property ARM: dts: aspeed: Modify I2C bus configuration ARM: dts: aspeed: Disable unused ADC channels for Asrock X570D4U BMC ARM: dts: aspeed: Modify GPIO table for Asrock X570D4U BMC ARM: dts: aspeed: yosemite4: set bus13 frequency to 100k ARM: dts: Aspeed: Bonnell: Fix NVMe LED labels ARM: dts: aspeed: yosemite4: Enable ipmb device for OCP debug card ARM: dts: aspeed: ahe50dc: Update lm25066 regulator name ARM: dts: aspeed: Add vendor prefixes to lm25066 compat strings ARM: dts: aspeed: asrock: Use MAC address from FRU EEPROM ... Link: https://lore.kernel.org/r/CACPK8Xd2Qc9MQUJ-8GuRjmyU50oMHpmmHPHLqAh9W_1Gyqi2ug@mail.gmail.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 24ae5d2 + c44211a commit aa32dec

22 files changed

+4460
-829
lines changed

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

+6
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,10 @@ properties:
3535
- ampere,mtjade-bmc
3636
- aspeed,ast2500-evb
3737
- asrock,e3c246d4i-bmc
38+
- asrock,e3c256d4i-bmc
3839
- asrock,romed8hm3-bmc
40+
- asrock,spc621d8hm3-bmc
41+
- asrock,x570d4u-bmc
3942
- bytedance,g220a-bmc
4043
- facebook,cmm-bmc
4144
- facebook,minipack-bmc
@@ -74,15 +77,18 @@ properties:
7477
- ampere,mtmitchell-bmc
7578
- aspeed,ast2600-evb
7679
- aspeed,ast2600-evb-a1
80+
- asus,x4tf-bmc
7781
- facebook,bletchley-bmc
7882
- facebook,cloudripper-bmc
7983
- facebook,elbert-bmc
8084
- facebook,fuji-bmc
8185
- facebook,greatlakes-bmc
86+
- facebook,harma-bmc
8287
- facebook,minerva-cmc
8388
- facebook,yosemite4-bmc
8489
- ibm,everest-bmc
8590
- ibm,rainier-bmc
91+
- ibm,system1-bmc
8692
- ibm,tacoma-bmc
8793
- inventec,starscream-bmc
8894
- inventec,transformer-bmc

Documentation/devicetree/bindings/trivial-devices.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,8 @@ properties:
160160
- isil,isl29030
161161
# Intersil ISL68137 Digital Output Configurable PWM Controller
162162
- isil,isl68137
163+
# Intersil ISL69269 PMBus Voltage Regulator
164+
- isil,isl69269
163165
# Intersil ISL76682 Ambient Light Sensor
164166
- isil,isl76682
165167
# Linear Technology LTC2488

arch/arm/boot/dts/aspeed/Makefile

+7-2
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,21 @@ dtb-$(CONFIG_ARCH_ASPEED) += \
99
aspeed-bmc-ampere-mtmitchell.dtb \
1010
aspeed-bmc-arm-stardragon4800-rep2.dtb \
1111
aspeed-bmc-asrock-e3c246d4i.dtb \
12+
aspeed-bmc-asrock-e3c256d4i.dtb \
1213
aspeed-bmc-asrock-romed8hm3.dtb \
14+
aspeed-bmc-asrock-spc621d8hm3.dtb \
15+
aspeed-bmc-asrock-x570d4u.dtb \
16+
aspeed-bmc-asus-x4tf.dtb \
1317
aspeed-bmc-bytedance-g220a.dtb \
1418
aspeed-bmc-delta-ahe50dc.dtb \
1519
aspeed-bmc-facebook-bletchley.dtb \
16-
aspeed-bmc-facebook-cloudripper.dtb \
1720
aspeed-bmc-facebook-cmm.dtb \
1821
aspeed-bmc-facebook-elbert.dtb \
1922
aspeed-bmc-facebook-fuji.dtb \
2023
aspeed-bmc-facebook-galaxy100.dtb \
2124
aspeed-bmc-facebook-greatlakes.dtb \
22-
aspeed-bmc-facebook-minerva-cmc.dtb \
25+
aspeed-bmc-facebook-harma.dtb \
26+
aspeed-bmc-facebook-minerva.dtb \
2327
aspeed-bmc-facebook-minipack.dtb \
2428
aspeed-bmc-facebook-tiogapass.dtb \
2529
aspeed-bmc-facebook-wedge40.dtb \
@@ -33,6 +37,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \
3337
aspeed-bmc-ibm-rainier.dtb \
3438
aspeed-bmc-ibm-rainier-1s4u.dtb \
3539
aspeed-bmc-ibm-rainier-4u.dtb \
40+
aspeed-bmc-ibm-system1.dtb \
3641
aspeed-bmc-intel-s2600wf.dtb \
3742
aspeed-bmc-inspur-fp5280g2.dtb \
3843
aspeed-bmc-inspur-nf5280m6.dtb \

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

-1
Original file line numberDiff line numberDiff line change
@@ -813,7 +813,6 @@
813813
};
814814

815815
&adc0 {
816-
ref_voltage = <2500>;
817816
status = "okay";
818817

819818
pinctrl-names = "default";

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

+9
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,9 @@
8383

8484
pinctrl-names = "default";
8585
pinctrl-0 = <&pinctrl_rgmii1_default &pinctrl_mdio1_default>;
86+
87+
nvmem-cells = <&eth0_macaddress>;
88+
nvmem-cell-names = "mac-address";
8689
};
8790

8891
&i2c1 {
@@ -103,6 +106,12 @@
103106
compatible = "st,24c128", "atmel,24c128";
104107
reg = <0x57>;
105108
pagesize = <16>;
109+
#address-cells = <1>;
110+
#size-cells = <1>;
111+
112+
eth0_macaddress: macaddress@3f80 {
113+
reg = <0x3f80 6>;
114+
};
106115
};
107116
};
108117

0 commit comments

Comments
 (0)