Skip to content

Commit 1b03616

Browse files
committed
Merge tag 'soc-dt-late-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull more SoC devicetree updates from Arnd Bergmann: "This is a follow-up to an earlier pull request for device tree changes, as three platform maintainers sent their contents too late to be included in the main set, but had not caused any further problems since then: - The Amlogic platform now containts support for two new SoC types, the A4 and A5 chips for audio applications. Both come with a reference board, and one more dts file gets addded for the combination of the MNT Reform Laptop with the BPI-CM4 CPU module - The ASpeed platform adds support for six addititional server platforms that use ast2500 or ast2600 as their BMC, while another one gets removed - The RISC-V platforms from Microchip, Starfive and and T-HEAD get additional features for existing hardware, plus the addition of the Milk-V Mars based on the StarFive VisionFive v2 board" * tag 'soc-dt-late-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (76 commits) riscv: dts: microchip: add pac1934 power-monitor to icicle riscv: dts: thead: Fix node ordering in TH1520 device tree 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 ...
2 parents 30aec6e + 01a7f9e commit 1b03616

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+6178
-1542
lines changed

Documentation/devicetree/bindings/arm/amlogic.yaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,7 @@ properties:
157157
items:
158158
- enum:
159159
- bananapi,bpi-cm4io
160+
- mntre,reform2-cm4
160161
- const: bananapi,bpi-cm4
161162
- const: amlogic,a311d
162163
- const: amlogic,g12b
@@ -201,6 +202,18 @@ properties:
201202
- amlogic,ad402
202203
- const: amlogic,a1
203204

205+
- description: Boards with the Amlogic A4 A113L2 SoC
206+
items:
207+
- enum:
208+
- amlogic,ba400
209+
- const: amlogic,a4
210+
211+
- description: Boards with the Amlogic A5 A113X2 SoC
212+
items:
213+
- enum:
214+
- amlogic,av400
215+
- const: amlogic,a5
216+
204217
- description: Boards with the Amlogic C3 C302X/C308L SoC
205218
items:
206219
- enum:

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

Lines changed: 6 additions & 0 deletions
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/riscv/starfive.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ properties:
2626

2727
- items:
2828
- enum:
29+
- milkv,mars
2930
- starfive,visionfive-2-v1.2a
3031
- starfive,visionfive-2-v1.3b
3132
- const: starfive,jh7110

Documentation/devicetree/bindings/serial/amlogic,meson-uart.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,9 @@ properties:
5454
- const: amlogic,meson-gx-uart
5555
- description: UART controller on S4 compatible SoCs
5656
items:
57-
- const: amlogic,t7-uart
57+
- enum:
58+
- amlogic,a4-uart
59+
- amlogic,t7-uart
5860
- const: amlogic,meson-s4-uart
5961

6062
reg:

Documentation/devicetree/bindings/trivial-devices.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,8 @@ properties:
164164
- isil,isl29030
165165
# Intersil ISL68137 Digital Output Configurable PWM Controller
166166
- isil,isl68137
167+
# Intersil ISL69269 PMBus Voltage Regulator
168+
- isil,isl69269
167169
# Intersil ISL76682 Ambient Light Sensor
168170
- isil,isl76682
169171
# Linear Technology LTC2488

arch/arm/boot/dts/aspeed/Makefile

Lines changed: 7 additions & 2 deletions
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

Lines changed: 0 additions & 1 deletion
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

Lines changed: 9 additions & 0 deletions
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)