diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2024-09-11 08:41:15 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2024-09-11 08:41:18 +0000 |
| commit | 72e68896a787abd444df693ba1302ab14c2db4fd (patch) | |
| tree | 6bbfb31050783e6122f20c2c6cf846e5df8807d1 /arch/arm/boot/dts/aspeed/aspeed-bmc-opp-swift.dts | |
| parent | 611347bb0e92ece675edf5b04fab062d89db9ced (diff) | |
| parent | b4c322c2783aedd652183bcec6d545ad45eba6d9 (diff) | |
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>
Diffstat (limited to 'arch/arm/boot/dts/aspeed/aspeed-bmc-opp-swift.dts')
| -rw-r--r-- | arch/arm/boot/dts/aspeed/aspeed-bmc-opp-swift.dts | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-swift.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-swift.dts index bbf864f84d37..a0e8c97e944a 100644 --- a/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-swift.dts +++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-opp-swift.dts @@ -938,10 +938,6 @@ memory-region = <&gfx_memory>; }; -&pinctrl { - aspeed,external-nodes = <&gfx &lhc>; -}; - &wdt1 { aspeed,reset-type = "none"; aspeed,external-signal; |