diff options
author | Arnd Bergmann <arnd@arndb.de> | 2022-05-30 10:59:41 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2022-05-30 10:59:42 +0200 |
commit | 725523dd3634f960c504ed3b64b00687734f8c3d (patch) | |
tree | f896d61260ed546d6b25b84ff6af5198efdc9137 /arch/arm/boot/dts/aspeed-g6.dtsi | |
parent | 8a1e75c53c7a514dbd4f3c61ceb6f6d7d11dfd6d (diff) | |
parent | 8dc7aa0a7246ad0f718d91d09b4d48460508627b (diff) |
Merge tag 'aspeed-5.19-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc into arm/late
ASPEED device tree updates for 5.19
- New machine:
* Nuvia's DC-SCM BMC
- Enable AST2600 GFX, the BMC-driven graphics device
- Add a bunch of devices for the AST2600 EVB
- Updates to the AST2600 Bletchley machine
- Backwards compatible changes to support the new spi-mem based SPI NOR
driver
* tag 'aspeed-5.19-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc:
ARM: dts: aspeed: ast2600-evb: Enable GFX device
ARM: dts: aspeed: Add GFX node to AST2600
ARM: dts: aspeed: ast2600-evb: Enable virtual hub
ARM: dts: aspeed: ast2600-evb: Enable video engine
ARM: dts: aspeed: everest, rainier: Add power-ffs-sync-history GPIO
ARM: dts: aspeed: Add Nuvia DC-SCM BMC
ARM: dts: aspeed: bletchley: add sample averaging for ADM1278
ARM: dts: aspeed: bletchley: add eeprom node on each sled
ARM: dts: aspeed: bletchley: add pca9536 node on each sled
ARM: dts: aspeed: bletchley: update gpio0 line names
ARM: dts: aspeed: bletchley: Enable mdio0 bus
ARM: dts: aspeed: bletchley: switch spi2 driver to aspeed-smc
ARM: dts: aspeed: bletchley: enable ehci0 device node
ARM: dts: aspeed: Add USB2.0 device controller node
ARM: dts: aspeed-g4: Set spi-max-frequency for all flashes
ARM: dts: aspeed: Enable Dual SPI RX transfers
ARM: dts: aspeed: Adjust "reg" property of FMC/SPI controllers
ARM: dts: aspeed: ast2600-evb: Enable RX delay for MAC0/MAC1
Link: https://lore.kernel.org/r/CACPK8XfUmFxU8Y6C+aZ2+=dT7=fCfs2=2_aYqyRjoXCoeQaUWQ@mail.gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts/aspeed-g6.dtsi')
-rw-r--r-- | arch/arm/boot/dts/aspeed-g6.dtsi | 38 |
1 files changed, 32 insertions, 6 deletions
diff --git a/arch/arm/boot/dts/aspeed-g6.dtsi b/arch/arm/boot/dts/aspeed-g6.dtsi index 3c1011678ce6..6660564855ff 100644 --- a/arch/arm/boot/dts/aspeed-g6.dtsi +++ b/arch/arm/boot/dts/aspeed-g6.dtsi @@ -95,8 +95,7 @@ }; fmc: spi@1e620000 { - reg = < 0x1e620000 0xc4 - 0x20000000 0x10000000 >; + reg = <0x1e620000 0xc4>, <0x20000000 0x10000000>; #address-cells = <1>; #size-cells = <0>; compatible = "aspeed,ast2600-fmc"; @@ -107,25 +106,27 @@ reg = < 0 >; compatible = "jedec,spi-nor"; spi-max-frequency = <50000000>; + spi-rx-bus-width = <2>; status = "disabled"; }; flash@1 { reg = < 1 >; compatible = "jedec,spi-nor"; spi-max-frequency = <50000000>; + spi-rx-bus-width = <2>; status = "disabled"; }; flash@2 { reg = < 2 >; compatible = "jedec,spi-nor"; spi-max-frequency = <50000000>; + spi-rx-bus-width = <2>; status = "disabled"; }; }; spi1: spi@1e630000 { - reg = < 0x1e630000 0xc4 - 0x30000000 0x10000000 >; + reg = <0x1e630000 0xc4>, <0x30000000 0x10000000>; #address-cells = <1>; #size-cells = <0>; compatible = "aspeed,ast2600-spi"; @@ -135,19 +136,20 @@ reg = < 0 >; compatible = "jedec,spi-nor"; spi-max-frequency = <50000000>; + spi-rx-bus-width = <2>; status = "disabled"; }; flash@1 { reg = < 1 >; compatible = "jedec,spi-nor"; spi-max-frequency = <50000000>; + spi-rx-bus-width = <2>; status = "disabled"; }; }; spi2: spi@1e631000 { - reg = < 0x1e631000 0xc4 - 0x50000000 0x10000000 >; + reg = <0x1e631000 0xc4>, <0x50000000 0x10000000>; #address-cells = <1>; #size-cells = <0>; compatible = "aspeed,ast2600-spi"; @@ -157,18 +159,21 @@ reg = < 0 >; compatible = "jedec,spi-nor"; spi-max-frequency = <50000000>; + spi-rx-bus-width = <2>; status = "disabled"; }; flash@1 { reg = < 1 >; compatible = "jedec,spi-nor"; spi-max-frequency = <50000000>; + spi-rx-bus-width = <2>; status = "disabled"; }; flash@2 { reg = < 2 >; compatible = "jedec,spi-nor"; spi-max-frequency = <50000000>; + spi-rx-bus-width = <2>; status = "disabled"; }; }; @@ -302,6 +307,16 @@ status = "disabled"; }; + udc: usb@1e6a2000 { + compatible = "aspeed,ast2600-udc"; + reg = <0x1e6a2000 0x300>; + interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&syscon ASPEED_CLK_GATE_USBPORT2CLK>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usb2bd_default>; + status = "disabled"; + }; + apb { compatible = "simple-bus"; #address-cells = <1>; @@ -355,6 +370,17 @@ quality = <100>; }; + gfx: display@1e6e6000 { + compatible = "aspeed,ast2600-gfx", "syscon"; + reg = <0x1e6e6000 0x1000>; + reg-io-width = <4>; + clocks = <&syscon ASPEED_CLK_GATE_D1CLK>; + resets = <&syscon ASPEED_RESET_GRAPHICS>; + syscon = <&syscon>; + status = "disabled"; + interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>; + }; + xdma: xdma@1e6e7000 { compatible = "aspeed,ast2600-xdma"; reg = <0x1e6e7000 0x100>; |