diff options
| author | Joel Stanley <joel@jms.id.au> | 2018-04-19 13:50:03 +0930 |
|---|---|---|
| committer | Joel Stanley <joel@jms.id.au> | 2019-03-20 15:13:35 +1030 |
| commit | c30b443fb26c79b904dc9aef40f4f4e7051796af (patch) | |
| tree | 7cad73b8c4169f63acf91bd436f4432f253ae06b /arch/arm/boot | |
| parent | 34c16500c5754e2c9e41413432da6890e4201b61 (diff) | |
| download | blackbird-obmc-linux-c30b443fb26c79b904dc9aef40f4f4e7051796af.tar.gz blackbird-obmc-linux-c30b443fb26c79b904dc9aef40f4f4e7051796af.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.
OpenBMC-Staging-Count: 5
Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/aspeed-ast2500-evb.dts | 21 | ||||
| -rw-r--r-- | arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts | 12 | ||||
| -rw-r--r-- | arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 8 |
3 files changed, 40 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..4f832f4de483 100644 --- a/arch/arm/boot/dts/aspeed-ast2500-evb.dts +++ b/arch/arm/boot/dts/aspeed-ast2500-evb.dts @@ -13,12 +13,26 @@ chosen { stdout-path = &uart5; - bootargs = "console=ttyS4,115200 earlyprintk"; + bootargs = "console=tty0 console=ttyS4,115200 earlyprintk"; }; memory@80000000 { + device_type = "memory"; 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 +112,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 17617efd831f..48eb43b058e4 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 { @@ -300,3 +307,8 @@ &adc { status = "okay"; }; + +&gfx { + status = "okay"; + memory-region = <&gfx_memory>; +}; diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts index a4ddaff52899..5dbe15a58d56 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 { @@ -621,6 +628,7 @@ &gfx { status = "okay"; + memory-region = <&gfx_memory>; }; &pinctrl { |
