diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2024-05-07 12:32:27 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2024-05-07 12:32:27 +0300 |
| commit | aa32dec674bbfd756ff8d5e1e58cf993f1f2050b (patch) | |
| tree | 59f04aacbfb005aa4be12c1258a817028d167d48 /arch/arm/boot/dts/aspeed/aspeed-g6.dtsi | |
| parent | 24ae5d2489b304bb6e36f61a32a44a4b135120eb (diff) | |
| parent | c44211af1aa9c6b93178a3993e18a7ebffab7488 (diff) | |
| download | linux-aa32dec674bbfd756ff8d5e1e58cf993f1f2050b.tar.xz | |
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>
Diffstat (limited to 'arch/arm/boot/dts/aspeed/aspeed-g6.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/aspeed/aspeed-g6.dtsi | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi b/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi index 29f94696d8b1..7fb421153596 100644 --- a/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi +++ b/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi @@ -867,22 +867,26 @@ }; fsim0: fsi@1e79b000 { + #interrupt-cells = <1>; compatible = "aspeed,ast2600-fsi-master", "fsi-master"; reg = <0x1e79b000 0x94>; interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_fsi1_default>; clocks = <&syscon ASPEED_CLK_GATE_FSICLK>; + interrupt-controller; status = "disabled"; }; fsim1: fsi@1e79b100 { + #interrupt-cells = <1>; compatible = "aspeed,ast2600-fsi-master", "fsi-master"; reg = <0x1e79b100 0x94>; interrupts = <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_fsi2_default>; clocks = <&syscon ASPEED_CLK_GATE_FSICLK>; + interrupt-controller; status = "disabled"; }; |