diff options
| author |   Joel Stanley <joel@jms.id.au> | 2018-04-19 13:50:03 +0930 |
|---|---|---|
| committer | Joel Stanley <joel@jms.id.au> | 2019-04-05 14:03:03 +1030 |
| commit | 5de3b03173f8054e2fd52420452dbc46568f3f2e (patch) | |
| tree | 9415abe99ca591db0ebfcbd305479afa28ca3330 | |
| parent | ARM: dts: aspeed-g5: Add resets and clocks to GFX node (diff) | |
| download | wireguard-linux-5de3b03173f8054e2fd52420452dbc46568f3f2e.tar.xz wireguard-linux-5de3b03173f8054e2fd52420452dbc46568f3f2e.zip | |
ARM: dts: aspeed: Enable the GFX IP
The GFX controller is the internal graphics device used by the SoC
(opposed to the one connected via the PCIe device and used by the host).
This configures it with a framebuffer region and adds it to the command
line so kernel boot messages appear on the display.
Enabled for Romulus, Witherspoon, and the ASPEED AST2500 EVB.
Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
Signed-off-by: Joel Stanley <joel@jms.id.au>
| -rw-r--r-- | arch/arm/boot/dts/aspeed-ast2500-evb.dts | 20 | ||||
| -rw-r--r-- | arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts | 8 | ||||
| -rw-r--r-- | arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 8 |
3 files changed, 35 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/aspeed-ast2500-evb.dts b/arch/arm/boot/dts/aspeed-ast2500-evb.dts index b80664826783..556ed469830c 100644 --- a/arch/arm/boot/dts/aspeed-ast2500-evb.dts +++ b/arch/arm/boot/dts/aspeed-ast2500-evb.dts @@ -13,12 +13,25 @@ chosen { stdout-path = &uart5; - bootargs = "console=ttyS4,115200 earlyprintk"; + bootargs = "console=tty0 console=ttyS4,115200 earlyprintk"; }; memory@80000000 { reg = <0x80000000 0x20000000>; }; + + reserved-memory { + #address-cells = <1>; + #size-cells = <1>; + ranges; + + gfx_memory: framebuffer { + size = <0x01000000>; + alignment = <0x01000000>; + compatible = "shared-dma-pool"; + reusable; + }; + }; }; &fmc { @@ -98,3 +111,8 @@ &uhci { status = "okay"; }; + +&gfx { + status = "okay"; + memory-region = <&gfx_memory>; +}; diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts b/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts index 76fe994f2ba4..418a1988b262 100644 --- a/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts +++ b/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts @@ -35,6 +35,13 @@ reg = <0x9ef00000 0x00100000>; no-map; }; + + gfx_memory: framebuffer { + size = <0x01000000>; + alignment = <0x01000000>; + compatible = "shared-dma-pool"; + reusable; + }; }; leds { @@ -238,6 +245,7 @@ &gfx { status = "okay"; + memory-region = <&gfx_memory>; }; &pinctrl { diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts index 63977adaf4ba..fc7e6432eb2c 100644 --- a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts +++ b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts @@ -26,6 +26,13 @@ no-map; reg = <0x98000000 0x04000000>; /* 64M */ }; + + gfx_memory: framebuffer { + size = <0x01000000>; + alignment = <0x01000000>; + compatible = "shared-dma-pool"; + reusable; + }; }; gpio-keys { @@ -565,6 +572,7 @@ &gfx { status = "okay"; + memory-region = <&gfx_memory>; }; &pinctrl { |